Skip to content

Commit

Permalink
Add support to authorization basic http header in alternative to cook…
Browse files Browse the repository at this point in the history
…ie and java session.

Modification to allow traccar api stateless.
  • Loading branch information
guterresrafael committed Nov 6, 2015
1 parent b14974f commit 2490884
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 1 deletion.
45 changes: 45 additions & 0 deletions src/org/traccar/helper/Authorization.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright 2015 Anton Tananaev ([email protected])
*
* 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<String, String> parse(String authorization) {
Map<String, String> 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;
}
}
14 changes: 13 additions & 1 deletion src/org/traccar/web/BaseServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@
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;
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 {

Expand Down Expand Up @@ -57,7 +61,15 @@ protected final void service(
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<String, String> 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");
Expand Down

0 comments on commit 2490884

Please sign in to comment.