aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/SecurityRequestFilter.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-02-27 10:31:22 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-02-27 10:31:22 +1300
commit002443ba33bbf9883d54505119c5361897d30f66 (patch)
treecf891c36c21cda9a20fbae616ab0269c888b6cd1 /src/org/traccar/api/SecurityRequestFilter.java
parent53fa46d769168f4f97745412e3ff241843d0851b (diff)
downloadtrackermap-server-002443ba33bbf9883d54505119c5361897d30f66.tar.gz
trackermap-server-002443ba33bbf9883d54505119c5361897d30f66.tar.bz2
trackermap-server-002443ba33bbf9883d54505119c5361897d30f66.zip
Merge changes from RS-CORS-Origin
Diffstat (limited to 'src/org/traccar/api/SecurityRequestFilter.java')
-rw-r--r--src/org/traccar/api/SecurityRequestFilter.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java
index 20186b0cb..d4fb15059 100644
--- a/src/org/traccar/api/SecurityRequestFilter.java
+++ b/src/org/traccar/api/SecurityRequestFilter.java
@@ -55,6 +55,11 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
@Override
public void filter(ContainerRequestContext requestContext) {
+
+ if (requestContext.getMethod() == "OPTIONS") {
+ throw new WebApplicationException(Response.status(Response.Status.OK).entity("").build());
+ }
+
SecurityContext securityContext = null;
String authHeader = requestContext.getHeaderString(AUTHORIZATION_HEADER);