diff options
author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:24:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-16 13:24:17 +0100 |
commit | 25a36fe2fb8045e455de5e936c286c4db8b40563 (patch) | |
tree | 074a212284fdc3e8779ca55f8694f8e92c24e8a7 /src/org/traccar/api/SecurityRequestFilter.java | |
parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
download | traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/api/SecurityRequestFilter.java')
-rw-r--r-- | src/org/traccar/api/SecurityRequestFilter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java index 7024bdbc9..aace9f705 100644 --- a/src/org/traccar/api/SecurityRequestFilter.java +++ b/src/org/traccar/api/SecurityRequestFilter.java @@ -17,6 +17,7 @@ package org.traccar.api; import org.traccar.Context; import org.traccar.api.resource.SessionResource; +import org.traccar.helper.DataConverter; import org.traccar.helper.Log; import org.traccar.model.User; @@ -28,7 +29,6 @@ import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ResourceInfo; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; -import javax.xml.bind.DatatypeConverter; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.sql.SQLException; @@ -43,7 +43,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter { public static String[] decodeBasicAuth(String auth) { auth = auth.replaceFirst("[B|b]asic ", ""); - byte[] decodedBytes = DatatypeConverter.parseBase64Binary(auth); + byte[] decodedBytes = DataConverter.parseBase64(auth); if (decodedBytes != null && decodedBytes.length > 0) { return new String(decodedBytes, StandardCharsets.US_ASCII).split(":", 2); } |