From 2490884fd74e20b69e5913533be77fc057731a47 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Date: Thu, 5 Nov 2015 22:03:00 -0200 Subject: Add support to authorization basic http header in alternative to cookie and java session. Modification to allow traccar api stateless. --- src/org/traccar/helper/Authorization.java | 45 +++++++++++++++++++++++++++++++ src/org/traccar/web/BaseServlet.java | 14 +++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 src/org/traccar/helper/Authorization.java (limited to 'src/org') diff --git a/src/org/traccar/helper/Authorization.java b/src/org/traccar/helper/Authorization.java new file mode 100644 index 000000000..992254d04 --- /dev/null +++ b/src/org/traccar/helper/Authorization.java @@ -0,0 +1,45 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.helper; + +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + +public final class Authorization { + + private Authorization() { + } + + public static final String HEADER = "Authorization"; + public static final String SCHEME = "Basic"; + public static final String REGEX = SCHEME + " "; + public static final String REPLACEMENT = ""; + public static final String TOKENIZER = ":"; + public static final String USERNAME = "username"; + public static final String PASSWORD = "password"; + + public static Map parse(String authorization) { + Map authMap = new HashMap<>(); + final String encodedUsernameAndPassword = authorization.replaceFirst(REGEX, REPLACEMENT); + String usernameAndPassword = new String(Base64.getDecoder().decode(encodedUsernameAndPassword)); + final StringTokenizer tokenizer = new StringTokenizer(usernameAndPassword, TOKENIZER); + authMap.put(USERNAME, tokenizer.nextToken()); + authMap.put(PASSWORD, tokenizer.nextToken()); + return authMap; + } +} diff --git a/src/org/traccar/web/BaseServlet.java b/src/org/traccar/web/BaseServlet.java index cfdff40d3..a77ad0908 100644 --- a/src/org/traccar/web/BaseServlet.java +++ b/src/org/traccar/web/BaseServlet.java @@ -20,6 +20,7 @@ import org.traccar.helper.Log; import java.io.IOException; import java.io.Writer; import java.security.AccessControlException; +import java.util.Map; import javax.json.Json; import javax.json.JsonObjectBuilder; import javax.json.JsonStructure; @@ -27,6 +28,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.traccar.Context; +import org.traccar.helper.Authorization; +import org.traccar.model.User; public abstract class BaseServlet extends HttpServlet { @@ -57,7 +61,15 @@ public abstract class BaseServlet extends HttpServlet { protected abstract boolean handle( String command, HttpServletRequest req, HttpServletResponse resp) throws Exception; - public long getUserId(HttpServletRequest req) { + public long getUserId(HttpServletRequest req) throws Exception { + String authorization = req.getHeader(Authorization.HEADER); + if (authorization != null && !authorization.isEmpty()) { + Map authMap = Authorization.parse(authorization); + User user = Context.getDataManager().login(authMap.get(Authorization.USERNAME), authMap.get(Authorization.PASSWORD)); + if (user != null) { + return user.getId(); + } + } Long userId = (Long) req.getSession().getAttribute(USER_KEY); if (userId == null) { throw new AccessControlException("User not logged in"); -- cgit v1.2.3 From 6214776d2ff4c10de27add89d5de0be8999da146 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Date: Thu, 5 Nov 2015 22:39:00 -0200 Subject: Change class Base64 to support current java --- src/org/traccar/helper/Authorization.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/helper/Authorization.java b/src/org/traccar/helper/Authorization.java index 992254d04..0dc27fe5d 100644 --- a/src/org/traccar/helper/Authorization.java +++ b/src/org/traccar/helper/Authorization.java @@ -15,10 +15,13 @@ */ package org.traccar.helper; -import java.util.Base64; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; +import org.jboss.netty.handler.codec.base64.Base64; +import org.jboss.netty.util.CharsetUtil; public final class Authorization { @@ -36,7 +39,8 @@ public final class Authorization { public static Map parse(String authorization) { Map authMap = new HashMap<>(); final String encodedUsernameAndPassword = authorization.replaceFirst(REGEX, REPLACEMENT); - String usernameAndPassword = new String(Base64.getDecoder().decode(encodedUsernameAndPassword)); + ChannelBuffer buffer = ChannelBuffers.copiedBuffer(encodedUsernameAndPassword,CharsetUtil.UTF_8); + String usernameAndPassword = Base64.decode(buffer).toString(CharsetUtil.UTF_8); final StringTokenizer tokenizer = new StringTokenizer(usernameAndPassword, TOKENIZER); authMap.put(USERNAME, tokenizer.nextToken()); authMap.put(PASSWORD, tokenizer.nextToken()); -- cgit v1.2.3 From d7d53864f610211a1591d056ccf8e7295438e4a6 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Date: Fri, 6 Nov 2015 01:06:59 -0200 Subject: Fix checkstyle --- src/org/traccar/helper/Authorization.java | 6 +++--- src/org/traccar/web/BaseServlet.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/helper/Authorization.java b/src/org/traccar/helper/Authorization.java index 0dc27fe5d..fc34687cd 100644 --- a/src/org/traccar/helper/Authorization.java +++ b/src/org/traccar/helper/Authorization.java @@ -24,10 +24,10 @@ import org.jboss.netty.handler.codec.base64.Base64; import org.jboss.netty.util.CharsetUtil; public final class Authorization { - + private Authorization() { } - + public static final String HEADER = "Authorization"; public static final String SCHEME = "Basic"; public static final String REGEX = SCHEME + " "; @@ -39,7 +39,7 @@ public final class Authorization { public static Map parse(String authorization) { Map authMap = new HashMap<>(); final String encodedUsernameAndPassword = authorization.replaceFirst(REGEX, REPLACEMENT); - ChannelBuffer buffer = ChannelBuffers.copiedBuffer(encodedUsernameAndPassword,CharsetUtil.UTF_8); + ChannelBuffer buffer = ChannelBuffers.copiedBuffer(encodedUsernameAndPassword, CharsetUtil.UTF_8); String usernameAndPassword = Base64.decode(buffer).toString(CharsetUtil.UTF_8); final StringTokenizer tokenizer = new StringTokenizer(usernameAndPassword, TOKENIZER); authMap.put(USERNAME, tokenizer.nextToken()); diff --git a/src/org/traccar/web/BaseServlet.java b/src/org/traccar/web/BaseServlet.java index a77ad0908..039e3a1f4 100644 --- a/src/org/traccar/web/BaseServlet.java +++ b/src/org/traccar/web/BaseServlet.java @@ -65,7 +65,9 @@ public abstract class BaseServlet extends HttpServlet { String authorization = req.getHeader(Authorization.HEADER); if (authorization != null && !authorization.isEmpty()) { Map authMap = Authorization.parse(authorization); - User user = Context.getDataManager().login(authMap.get(Authorization.USERNAME), authMap.get(Authorization.PASSWORD)); + String username = authMap.get(Authorization.USERNAME); + String password = authMap.get(Authorization.PASSWORD); + User user = Context.getDataManager().login(username, password); if (user != null) { return user.getId(); } -- cgit v1.2.3