aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-12-01 16:28:14 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-12-01 16:28:14 +1300
commitf748f065a01fa984a41ca679ca05bcff97769b25 (patch)
tree88f75bea9ff0143e100002e8788d850783db8499 /src/org
parent1742c5a6e9e5cf6d6f2d22278fa5d6600e4b7988 (diff)
downloadtraccar-server-f748f065a01fa984a41ca679ca05bcff97769b25.tar.gz
traccar-server-f748f065a01fa984a41ca679ca05bcff97769b25.tar.bz2
traccar-server-f748f065a01fa984a41ca679ca05bcff97769b25.zip
Add session resource for authentication
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/api/SecurityRequestFilter.java12
-rw-r--r--src/org/traccar/api/resource/SessionResource.java73
-rw-r--r--src/org/traccar/model/User.java2
-rw-r--r--src/org/traccar/web/WebServer.java5
4 files changed, 90 insertions, 2 deletions
diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java
index 63295a8b7..e6c02bfc4 100644
--- a/src/org/traccar/api/SecurityRequestFilter.java
+++ b/src/org/traccar/api/SecurityRequestFilter.java
@@ -16,10 +16,12 @@
package org.traccar.api;
import org.traccar.Context;
+import org.traccar.api.resource.SessionResource;
import org.traccar.model.User;
import java.nio.charset.Charset;
import java.sql.SQLException;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -41,8 +43,18 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
return null;
}
+ @javax.ws.rs.core.Context
+ private HttpServletRequest req;
+
@Override
public void filter(ContainerRequestContext requestContext) {
+ if (requestContext.getUriInfo().getPath().equals("session")) {
+ return;
+ }
+
+ long userId = (Long) req.getSession().getAttribute(SessionResource.USER_ID_KEY);
+ // TODO use session
+
try {
String[] auth = decodeBasicAuth(requestContext.getHeaderString(AUTHORIZATION_HEADER));
User user = Context.getDataManager().login(auth[0], auth[1]);
diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java
new file mode 100644
index 000000000..fc0741f8c
--- /dev/null
+++ b/src/org/traccar/api/resource/SessionResource.java
@@ -0,0 +1,73 @@
+/*
+ * 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.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.sql.SQLException;
+
+@Path("session")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+public class SessionResource extends BaseResource {
+
+ public static final String USER_ID_KEY = "userId";
+
+ @javax.ws.rs.core.Context
+ private HttpServletRequest req;
+
+ @GET
+ public User get() {
+ try {
+ Long userId = (Long) req.getSession().getAttribute(USER_ID_KEY);
+ if (userId != null) {
+ return Context.getDataManager().getUser(userId);
+ } else {
+ throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND).build());
+ }
+ } catch (SQLException e) {
+ throw new WebApplicationException(e);
+ }
+ }
+
+ @POST
+ public User add(@FormParam("email") String email, @FormParam("password") String password) {
+ try {
+ User user = Context.getDataManager().login(email, password);
+ if (user != null) {
+ req.getSession().setAttribute(USER_ID_KEY, user.getId());
+ return user;
+ } else {
+ throw new WebApplicationException(Response.status(Response.Status.UNAUTHORIZED).build());
+ }
+ } catch (SQLException e) {
+ throw new WebApplicationException(e);
+ }
+ }
+
+}
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 8ac9e9d32..31e54752a 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -162,6 +162,7 @@ public class User implements Factory {
private String hashedPassword;
+ @com.fasterxml.jackson.annotation.JsonIgnore
@JsonIgnore
public String getHashedPassword() {
return hashedPassword;
@@ -173,6 +174,7 @@ public class User implements Factory {
private String salt;
+ @com.fasterxml.jackson.annotation.JsonIgnore
@JsonIgnore
public String getSalt() {
return salt;
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 317e4db46..f139b1c7a 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -30,6 +30,7 @@ import org.traccar.Config;
import org.traccar.api.CorsResponseFilter;
import org.traccar.api.SecurityRequestFilter;
import org.traccar.api.resource.DeviceResource;
+import org.traccar.api.resource.SessionResource;
import org.traccar.api.resource.UserResource;
import org.traccar.helper.Log;
@@ -136,8 +137,8 @@ public class WebServer {
ResourceConfig resourceConfig = new ResourceConfig();
resourceConfig.register(SecurityRequestFilter.class);
resourceConfig.register(CorsResponseFilter.class);
- resourceConfig.registerClasses(DeviceResource.class, UserResource.class);
- ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
+ resourceConfig.registerClasses(SessionResource.class, DeviceResource.class, UserResource.class);
+ ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
ServletHolder servletHolder = new ServletHolder(new ServletContainer(resourceConfig));
servletHandler.addServlet(servletHolder, "/rest/*");
handlers.addHandler(servletHandler);