Added full request URI to Jersey's ContainerRequest object, including scheme, host, and path; excluding the stage

Author: sapessi

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

@@ -45,6 +45,11 @@ public abstract class RequestReader<RequestType, ContainerRequestType> {
      */
     public static final String API_GATEWAY_STAGE_VARS_PROPERTY = "com.amazonaws.apigateway.stage.variables";
 
+    /**
+     * The key to store the entire API Gateway event
+     */
+    public static final String API_GATEWAY_EVENT_PROPERTY = "com.amazonaws.apigateway.request";
+
     /**
      * The key for the <strong>AWS Lambda context</strong> property in the PropertiesDelegate object
      */
@@ -56,6 +61,7 @@ public abstract class RequestReader<RequestType, ContainerRequestType> {
     public static final String JAX_SECURITY_CONTEXT_PROPERTY = "com.amazonaws.serverless.jaxrs.securityContext";
 
 
+
     //-------------------------------------------------------------
     // Methods - Abstract
     //-------------------------------------------------------------

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

@@ -37,6 +37,7 @@ public AwsProxyHttpServletRequest readRequest(AwsProxyRequest request, SecurityC
         AwsProxyHttpServletRequest servletRequest = new AwsProxyHttpServletRequest(request, lambdaContext, securityContext, config);
         servletRequest.setAttribute(API_GATEWAY_CONTEXT_PROPERTY, request.getRequestContext());
         servletRequest.setAttribute(API_GATEWAY_STAGE_VARS_PROPERTY, request.getStageVariables());
+        servletRequest.setAttribute(API_GATEWAY_EVENT_PROPERTY, request);
         servletRequest.setAttribute(LAMBDA_CONTEXT_PROPERTY, lambdaContext);
         servletRequest.setAttribute(JAX_SECURITY_CONTEXT_PROPERTY, securityContext);
 

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

@@ -4,6 +4,7 @@
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequest;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
 import com.amazonaws.serverless.proxy.jersey.suppliers.AwsProxyServletRequestSupplier;
+import com.amazonaws.serverless.proxy.model.ApiGatewayRequestContext;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.glassfish.jersey.internal.MapPropertiesDelegate;
@@ -53,7 +54,7 @@ public class JerseyHandlerFilter implements Filter, Container {
     private ApplicationHandler jersey;
     private Application app;
     private Logger log = LoggerFactory.getLogger(JerseyHandlerFilter.class);
-    private URI basePathUri;
+    private URI baseUri;
 
 
     /**
@@ -66,7 +67,6 @@ public class JerseyHandlerFilter implements Filter, Container {
 
         jersey = new ApplicationHandler(app);
         jersey.onStartup(this);
-        basePathUri = URI.create("/");
         Timer.stop("JERSEY_FILTER_CONSTRUCTOR");
     }
 
@@ -123,7 +123,11 @@ private ContainerRequest servletRequestToContainerRequest(ServletRequest request
         Timer.start("JERSEY_SERVLET_REQUEST_TO_CONTAINER");
         HttpServletRequest servletRequest = (HttpServletRequest)request;
 
-        UriBuilder uriBuilder = UriBuilder.fromPath(servletRequest.getPathInfo());
+        if (baseUri == null) {
+            baseUri = getBaseUri(request, "/");
+        }
+
+        UriBuilder uriBuilder = UriBuilder.fromUri(baseUri).path(servletRequest.getPathInfo());
         uriBuilder.replaceQuery(AwsProxyHttpServletRequest.decodeValueIfEncoded(servletRequest.getQueryString()));
 
         PropertiesDelegate apiGatewayProperties = new MapPropertiesDelegate();
@@ -133,7 +137,7 @@ private ContainerRequest servletRequestToContainerRequest(ServletRequest request
         apiGatewayProperties.setProperty(JERSEY_SERVLET_REQUEST_PROPERTY, servletRequest);
 
         ContainerRequest requestContext = new ContainerRequest(
-                basePathUri,
+                null, // jersey uses "/" by default
                 uriBuilder.build(),
                 servletRequest.getMethod().toUpperCase(Locale.ENGLISH),
                 (SecurityContext)servletRequest.getAttribute(JAX_SECURITY_CONTEXT_PROPERTY),
@@ -161,6 +165,25 @@ private ContainerRequest servletRequestToContainerRequest(ServletRequest request
         return requestContext;
     }
 
+    private URI getBaseUri(ServletRequest request, String basePath) {
+        ApiGatewayRequestContext apiGatewayCtx = (ApiGatewayRequestContext) request.getAttribute(API_GATEWAY_CONTEXT_PROPERTY);
+        String region = System.getenv("AWS_REGION");
+        if (region == null) {
+            // this is not a critical failure, we just put a static region in the URI
+            region = "us-east-1";
+        }
+        StringBuilder uriBuilder = new StringBuilder();
+        uriBuilder.append("https://") // we assume it's always https
+                  .append(apiGatewayCtx.getApiId())
+                  .append(".execute-api.")
+                  .append(region)
+                  .append(".amazonaws.com")
+                  .append("/");
+
+
+        return UriBuilder.fromUri(uriBuilder.toString()).build();
+    }
+
     //-------------------------------------------------------------
     // Implementation - Container
     //-------------------------------------------------------------

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

@@ -97,6 +97,15 @@ public MapResponseModel echoQueryString(@Context UriInfo context) {
         return queryStrings;
     }
 
+    @Path("/scheme") @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public SingleValueModel echoRequestScheme(@Context UriInfo context) {
+        SingleValueModel model = new SingleValueModel();
+        System.out.println("RequestUri: " + context.getRequestUri().toString());
+        model.setValue(context.getRequestUri().getScheme());
+        return model;
+    }
+
     @Path("/authorizer-principal") @GET
     @Produces(MediaType.APPLICATION_JSON)
     public SingleValueModel echoAuthorizerPrincipal(@Context ContainerRequestContext context) {

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

@@ -151,6 +151,20 @@ public void queryString_encoded_echo() {
         validateMapResponseModel(output, QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE);
     }
 
+    @Test
+    public void requestScheme_valid_expectHttps() {
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/scheme", "GET")
+                                          .json()
+                                          .queryString(QUERY_STRING_KEY, QUERY_STRING_ENCODED_VALUE)
+                                          .build();
+
+        AwsProxyResponse output = handler.proxy(request, lambdaContext);
+        assertEquals(200, output.getStatusCode());
+        assertEquals("application/json", output.getHeaders().get("Content-Type"));
+
+        validateSingleValueModel(output, "https");
+    }
+
     @Test
     public void authorizer_securityContext_customPrincipalSuccess() {
         AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/authorizer-principal", "GET")