Revert "Bug 2515 - Jersey to support JAX-RS 2.0"

This reverts commit b1c7e09. Change-Id: I4f1be95f9cab2f25a8309c305f8991a0faaccea2 Signed-off-by: Ryan Goulding <[email protected]>
huangqingxin · Oct 29, 2015 · aec82e9 · aec82e9
1 parent b1c7e09
commit aec82e9
Show file tree

Hide file tree

Showing 19 changed files with 179 additions and 203 deletions.
diff --git a/README.md b/README.md
@@ -50,15 +50,15 @@ Add the AAA `TokeAuthFilter` filter to your REST resource (RESTconf example):
 
     <servlet>
         <servlet-name>JAXRSRestconf</servlet-name>
-        <servlet-class>org.glassfish.jersey.core.spi.container.servlet.ServletContainer</servlet-class>
+        <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.opendaylight.controller.sal.rest.impl.RestconfApplication</param-value>
         </init-param>
         
         <!-- Token Auth Filter -->
         <init-param>
-            <param-name>org.glassfish.jersey.core.spi.container.ContainerRequestFilters</param-name>
+            <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
             <param-value>
                 org.opendaylight.aaa.sts.TokenAuthFilter
             </param-value>

diff --git a/aaa-authn-basic/pom.xml b/aaa-authn-basic/pom.xml
@@ -27,14 +27,10 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
+            <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-common</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/aaa-authn-basic/src/main/java/org/opendaylight/aaa/basic/HttpBasicAuth.java b/aaa-authn-basic/src/main/java/org/opendaylight/aaa/basic/HttpBasicAuth.java
@@ -11,7 +11,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.glassfish.jersey.internal.util.Base64;
 import org.opendaylight.aaa.AuthenticationBuilder;
 import org.opendaylight.aaa.PasswordCredentialBuilder;
 import org.opendaylight.aaa.api.Authentication;
@@ -23,6 +22,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.sun.jersey.core.util.Base64;
+
 /**
  * An HTTP Basic authenticator.  Note that this is provided as a Hydrogen
  * backward compatible authenticator, but usage of this authenticator or
@@ -76,8 +77,8 @@ private static String extractAuthHeader(final Map<String, List<String>> headers)
     }
 
     private static String [] extractCredentialArray(final String authHeader) {
-        return new String(Base64.decode(authHeader
-                .substring(BASIC_PREFIX.length()).getBytes())).split(AUTH_SEP);
+        return new String(Base64.base64Decode(authHeader
+                .substring(BASIC_PREFIX.length()))).split(AUTH_SEP);
     }
 
     private static boolean verifyCredentialArray(final String [] creds) {

diff --git a/aaa-authn-basic/src/test/java/org/opendaylight/aaa/basic/HttpBasicAuthTest.java b/aaa-authn-basic/src/test/java/org/opendaylight/aaa/basic/HttpBasicAuthTest.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.glassfish.jersey.internal.util.Base64;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.aaa.ClaimBuilder;
@@ -28,6 +27,8 @@
 import org.opendaylight.aaa.api.Claim;
 import org.opendaylight.aaa.api.CredentialAuth;
 
+import com.sun.jersey.core.util.Base64;
+
 public class HttpBasicAuthTest {
     private static final String USERNAME = "admin";
     private static final String PASSWORD = "admin";

diff --git a/aaa-authn-federation/pom.xml b/aaa-authn-federation/pom.xml
@@ -10,6 +10,7 @@
     </parent>
 
     <artifactId>aaa-authn-federation</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -26,13 +27,13 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
+            <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -62,8 +63,8 @@
         </dependency>
         <!-- Testing Dependencies -->
         <dependency>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <groupId>com.sun.jersey.jersey-test-framework</groupId>
+            <artifactId>jersey-test-framework-grizzly2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -96,6 +97,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Import-Package>*,com.sun.jersey.spi.container.servlet</Import-Package>
                         <Web-ContextPath>/oauth2/federation</Web-ContextPath>
                         <Web-Connectors>federationConn</Web-Connectors>
                         <Bundle-Activator>org.opendaylight.aaa.federation.Activator</Bundle-Activator>

diff --git a/aaa-authn-keystone/pom.xml b/aaa-authn-keystone/pom.xml
@@ -27,13 +27,13 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
+            <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -73,8 +73,8 @@
         </dependency>
         <!-- Testing Dependencies -->
         <dependency>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <groupId>com.sun.jersey.jersey-test-framework</groupId>
+            <artifactId>jersey-test-framework-grizzly2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/aaa-authn-sssd/pom.xml b/aaa-authn-sssd/pom.xml
@@ -34,13 +34,13 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
+      <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -55,8 +55,8 @@
     </dependency>    
     <!-- Testing Dependencies -->
     <dependency>
-      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-      <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+      <artifactId>jersey-test-framework-grizzly2</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/aaa-authn-sts/pom.xml b/aaa-authn-sts/pom.xml
@@ -27,13 +27,13 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
+            <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -63,8 +63,8 @@
         </dependency>
         <!-- Testing Dependencies -->     
         <dependency>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <groupId>com.sun.jersey.jersey-test-framework</groupId>
+            <artifactId>jersey-test-framework-grizzly2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -97,6 +97,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Import-Package>*,com.sun.jersey.spi.container.servlet</Import-Package>
                         <Web-ContextPath>/oauth2</Web-ContextPath>
                         <Bundle-Activator>org.opendaylight.aaa.sts.Activator</Bundle-Activator>
                         <manifestLocation>${project.basedir}/META-INF</manifestLocation>

diff --git a/aaa-authn-sts/src/main/java/org/opendaylight/aaa/sts/TokenAuthFilter.java b/aaa-authn-sts/src/main/java/org/opendaylight/aaa/sts/TokenAuthFilter.java
@@ -8,14 +8,11 @@
 
 package org.opendaylight.aaa.sts;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -29,11 +26,14 @@
 import org.opendaylight.aaa.api.AuthenticationException;
 import org.opendaylight.aaa.api.TokenAuth;
 
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
+
 /**
  * A token-based authentication filter for resource providers.
  *
  * @author liemmn
- * @see javax.ws.rs.ContainerRequestFilter
+ *
  */
 public class TokenAuthFilter implements ContainerRequestFilter {
 
@@ -44,6 +44,55 @@ public class TokenAuthFilter implements ContainerRequestFilter {
     @Context
     private HttpServletRequest httpRequest;
 
+    @Override
+    public ContainerRequest filter(ContainerRequest request) {
+
+        // Do the CORS check first
+       if(checkCORSOptionRequest(request)) {
+           return request;
+       }
+
+        // Are we up yet?
+        if (ServiceLocator.getInstance().getAuthenticationService() == null) {
+            throw new WebApplicationException(
+                  Response.status(Status.SERVICE_UNAVAILABLE)
+                  .type(MediaType.APPLICATION_JSON)
+                  .entity("{\"error\":\"Authentication service unavailable\"}")
+                  .build());
+        }
+
+        // Are we doing authentication or not?
+        if (ServiceLocator.getInstance().getAuthenticationService().isAuthEnabled()) {
+            Map<String, List<String>> headers = request.getRequestHeaders();
+
+            // Go through and invoke other TokenAuth first...
+            List<TokenAuth> tokenAuthCollection =
+                    ServiceLocator.getInstance().getTokenAuthCollection();
+            for (TokenAuth ta : tokenAuthCollection) {
+                try {
+                    Authentication auth = ta.validate(headers);
+                    if (auth != null) {
+                        ServiceLocator.getInstance().getAuthenticationService().set(auth);
+                        return request;
+                    }
+                } catch (AuthenticationException ae) {
+                    throw unauthorized();
+                }
+            }
+
+            // OK, last chance to validate token...
+            try {
+                OAuthAccessResourceRequest or = new OAuthAccessResourceRequest(
+                        httpRequest, ParameterStyle.HEADER);
+                validate(or.getAccessToken());
+            } catch (OAuthSystemException | OAuthProblemException e) {
+                throw unauthorized();
+            }
+        }
+
+        return request;
+    }
+
     /**
      * CORS access control : when browser sends cross-origin request, it first sends the OPTIONS method
      * with a list of access control request headers, which has a list of custom headers and access control method
@@ -52,10 +101,16 @@ public class TokenAuthFilter implements ContainerRequestFilter {
      * We should not do any authorization against such request.
      * for more details : https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
      */
-    private boolean checkCORSOptionRequest(ContainerRequestContext request) {
+
+    private boolean checkCORSOptionRequest(ContainerRequest request) {
         if(OPTIONS.equals(request.getMethod())) {
-            String headerString = request.getHeaderString(ACCESS_CONTROL_REQUEST_HEADERS);
-            return headerString.toLowerCase().contains(AUTHORIZATION);
+            List<String> headerList = request.getRequestHeader(ACCESS_CONTROL_REQUEST_HEADERS);
+            if(headerList != null && !headerList.isEmpty()) {
+                String header = headerList.get(0);
+                if (header != null && header.toLowerCase().contains(AUTHORIZATION)) {
+                    return true;
+                }
+            }
         }
         return false;
     }
@@ -90,48 +145,4 @@ public UnauthorizedException() {
             super(response);
         }
     }
-
-    @Override
-    public void filter(ContainerRequestContext request) throws IOException {
-        // Do the CORS check first
-        if(checkCORSOptionRequest(request)) {
-            return;
-        }
-        // Are we up yet?
-        if (ServiceLocator.getInstance().getAuthenticationService() == null) {
-            throw new WebApplicationException(
-                    Response.status(Status.SERVICE_UNAVAILABLE)
-                            .type(MediaType.APPLICATION_JSON)
-                            .entity("{\"error\":\"Authentication service unavailable\"}")
-                            .build());
-        }
-
-        // Are we doing authentication or not?
-        if (ServiceLocator.getInstance().getAuthenticationService().isAuthEnabled()) {
-            Map<String, List<String>> headers = request.getHeaders();
-            // Go through and invoke other TokenAuth first...
-            for (TokenAuth ta : ServiceLocator.getInstance().getTokenAuthCollection()) {
-	        try {
-	            Authentication auth = ta.validate(headers);
-	            if (auth != null) {
-	                ServiceLocator.getInstance().getAuthenticationService().set(auth);
-	                return;
-	            }
-                } catch (AuthenticationException ae) {
-	            request.abortWith(Response.status(Response.Status.UNAUTHORIZED).entity("User cannot access the resource.").build());
-	        }
-            }
-
-            // OK, last chance to validate token...
-            try {
-	        OAuthAccessResourceRequest or = new OAuthAccessResourceRequest(
-                    httpRequest, ParameterStyle.HEADER);
-                validate(or.getAccessToken());
-                return;
-            } catch (OAuthSystemException | OAuthProblemException e) {
-                request.abortWith(Response.status(Response.Status.UNAUTHORIZED).entity("User cannot access the resource.").build());
-            }
-            request.abortWith(Response.status(Response.Status.UNAUTHORIZED).entity("User cannot access the resource.").build());
-   	}
-    }
 }