Fix for Jersey routing issue #200. Added unit tests and fixed the base path stripping method in main container handler. Changed log path format to include the encoded path with the full context

Author: sapessi

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/LambdaContainerHandler.java

@@ -135,8 +135,13 @@ public static ObjectMapper getObjectMapper() {
      * @param basePath The base path to be stripped from the request
      */
     public void stripBasePath(String basePath) {
-        config.setStripBasePath(true);
-        config.setServiceBasePath(basePath);
+        if (basePath == null || "".equals(basePath)) {
+            config.setStripBasePath(false);
+            config.setServiceBasePath(null);
+        } else {
+            config.setStripBasePath(true);
+            config.setServiceBasePath(basePath);
+        }
     }
 
     /**

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/ApacheCombinedServletLogFormatter.java

@@ -108,7 +108,7 @@ public String format(ContainerRequestType servletRequest, ContainerResponseType
         logLineBuilder.append("\"");
         logLineBuilder.append(servletRequest.getMethod().toUpperCase(Locale.ENGLISH));
         logLineBuilder.append(" ");
-        logLineBuilder.append(servletRequest.getPathInfo());
+        logLineBuilder.append(servletRequest.getRequestURI());
         logLineBuilder.append(" ");
         logLineBuilder.append(servletRequest.getProtocol());
         logLineBuilder.append("\" ");

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java

@@ -203,7 +203,7 @@ public String getMethod() {
 
     @Override
     public String getPathInfo() {
-        String pathInfo = cleanUri(request.getPath()); //getServletPath().replace(getContextPath(), "");
+        String pathInfo = cleanUri(request.getPath());
         return decodeRequestPath(pathInfo, LambdaContainerHandler.getContainerConfig());
     }
 

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ContainerConfig.java

@@ -19,7 +19,7 @@ public static ContainerConfig defaultConfig() {
         ContainerConfig configuration = new ContainerConfig();
         configuration.setStripBasePath(false);
         configuration.setUriEncoding(DEFAULT_URI_ENCODING);
-        configuration.setConsolidateSetCookieHeaders(true);
+        configuration.setConsolidateSetCookieHeaders(false);
         configuration.setUseStageAsServletContext(false);
         configuration.setValidFilePaths(DEFAULT_FILE_PATHS);
         configuration.setQueryStringCaseSensitive(false);

aws-serverless-java-container-jersey/pom.xml

@@ -84,6 +84,15 @@
 
     <build>
         <plugins>
+            <!-- fork JVM before each spring test to make sure we have a clean context -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <forkMode>always</forkMode>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/JerseyHandlerFilter.java

@@ -1,6 +1,7 @@
 package com.amazonaws.serverless.proxy.jersey;
 
 
+import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
 import com.amazonaws.serverless.proxy.jersey.suppliers.AwsProxyServletRequestSupplier;
 
@@ -34,6 +35,7 @@
 import java.util.concurrent.CountDownLatch;
 
 import static com.amazonaws.serverless.proxy.RequestReader.API_GATEWAY_CONTEXT_PROPERTY;
+import static com.amazonaws.serverless.proxy.RequestReader.API_GATEWAY_EVENT_PROPERTY;
 import static com.amazonaws.serverless.proxy.RequestReader.API_GATEWAY_STAGE_VARS_PROPERTY;
 import static com.amazonaws.serverless.proxy.RequestReader.JAX_SECURITY_CONTEXT_PROPERTY;
 import static com.amazonaws.serverless.proxy.RequestReader.LAMBDA_CONTEXT_PROPERTY;
@@ -125,7 +127,16 @@ private ContainerRequest servletRequestToContainerRequest(ServletRequest request
             baseUri = getBaseUri(request, "/");
         }
 
-        UriBuilder uriBuilder = UriBuilder.fromUri(baseUri).path(servletRequest.getPathInfo());
+        String requestFullPath = servletRequest.getRequestURI();
+        if (LambdaContainerHandler.getContainerConfig().getServiceBasePath() != null && LambdaContainerHandler.getContainerConfig().isStripBasePath()) {
+            if (requestFullPath.startsWith(LambdaContainerHandler.getContainerConfig().getServiceBasePath())) {
+                requestFullPath = requestFullPath.replaceFirst(LambdaContainerHandler.getContainerConfig().getServiceBasePath(), "");
+                if (!requestFullPath.startsWith("/")) {
+                    requestFullPath = "/" + requestFullPath;
+                }
+            }
+        }
+        UriBuilder uriBuilder = UriBuilder.fromUri(baseUri).path(requestFullPath);
         uriBuilder.replaceQuery(servletRequest.getQueryString());
 
         PropertiesDelegate apiGatewayProperties = new MapPropertiesDelegate();
@@ -136,7 +147,7 @@ private ContainerRequest servletRequestToContainerRequest(ServletRequest request
 
         ContainerRequest requestContext = new ContainerRequest(
                 null, // jersey uses "/" by default
-                uriBuilder.build(), //requestUri,
+                uriBuilder.build(),
                 servletRequest.getMethod().toUpperCase(Locale.ENGLISH),
                 (SecurityContext)servletRequest.getAttribute(JAX_SECURITY_CONTEXT_PROPERTY),
                 apiGatewayProperties);

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/EchoJerseyResource.java

@@ -27,13 +27,10 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Providers;
 
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
 
 
 /**
@@ -206,4 +203,13 @@ public Response emptyStream(@PathParam("paramId") String paramId, @PathParam("pa
     public Response throwException() {
         throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
     }
+
+    @Path("/encoded-path/{resource}") @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Response encodedPathParam(@Encoded @PathParam("resource") String resource) {
+        SingleValueModel sv = new SingleValueModel();
+        sv.setValue(resource);
+        return Response.ok(sv).build();
+    }
 }

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyParamEncodingTest.java

@@ -141,6 +141,27 @@ public void queryParam_encoding_expectFullyEncodedUrl() {
         System.out.println("body:" + resp.getBody());
     }
 
+    @Test
+    public void pathParam_encoded_routesToCorrectPath() {
+        String encodedParam = "http%3A%2F%2Fhelloresource.com";
+        String path = "/echo/encoded-path/" + encodedParam;
+        AwsProxyRequest request = new AwsProxyRequestBuilder(path, "GET").build();
+        AwsProxyResponse resp = handler.proxy(request, lambdaContext);
+        assertNotNull(resp);
+        assertEquals(resp.getStatusCode(), 200);
+        validateSingleValueModel(resp, encodedParam);
+    }
+
+    @Test
+    public void pathParam_encoded_returns404() {
+        String encodedParam = "http://helloresource.com";
+        String path = "/echo/encoded-path/" + encodedParam;
+        AwsProxyRequest request = new AwsProxyRequestBuilder(path, "GET").build();
+        AwsProxyResponse resp = handler.proxy(request, lambdaContext);
+        assertNotNull(resp);
+        assertEquals(resp.getStatusCode(), 404);
+    }
+
     @Test
     @Ignore
     public void queryParam_listOfString_expectCorrectLength() {