Merge pull request #1 from mattcorey/request-path

Implement getRequestUrl, clean up getServerName, getPort, getContextPath

Author: mattcorey

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

@@ -155,20 +155,4 @@ public boolean isBase64Encoded() {
     public void setBase64Encoded(boolean base64Encoded) {
         isBase64Encoded = base64Encoded;
     }
-
-    @Override
-    public String toString() {
-        return "AwsProxyRequest{" +
-                "body='" + body + '\'' +
-                ", resource='" + resource + '\'' +
-                ", requestContext=" + requestContext +
-                ", queryStringParameters=" + queryStringParameters +
-                ", headers=" + headers +
-                ", pathParameters=" + pathParameters +
-                ", httpMethod='" + httpMethod + '\'' +
-                ", stageVariables=" + stageVariables +
-                ", path='" + path + '\'' +
-                ", isBase64Encoded=" + isBase64Encoded +
-                '}';
-    }
 }

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

@@ -224,7 +224,7 @@ public String getPathTranslated() {
 
     @Override
     public String getContextPath() {
-        return "/";
+        return request.getRequestContext().getStage();
     }
 
 
@@ -268,10 +268,15 @@ public String getRequestURI() {
     @Override
     public StringBuffer getRequestURL() {
         String url = "";
-        url += getHeaderCaseInsensitive(HttpHeaders.HOST);
+        url += getServerName();
+        url += "/";
+        url += getContextPath();
         url += "/";
         url += request.getPath();
-        return new StringBuffer(url);
+
+        url = url.replaceAll("/+", "/");
+
+        return new StringBuffer(getScheme() + "://" + url);
     }
 
 
@@ -608,13 +613,18 @@ public String getScheme() {
 
     @Override
     public String getServerName() {
-        return "lambda.amazonaws.com";
+        String name = getHeaderCaseInsensitive(HttpHeaders.HOST);
+
+        if (name == null || name.length() == 0) {
+            name = "lambda.amazonaws.com";
+        }
+        return name;
     }
 
 
     @Override
     public int getServerPort() {
-        return 0;
+        return getLocalPort();
     }
 
 
@@ -720,7 +730,14 @@ public String getLocalAddr() {
 
     @Override
     public int getLocalPort() {
-        return 0;
+        int port = 0;
+
+        if ("https".equals(getScheme())) {
+            port = 443;
+        } else if ("http".equals(getScheme())) {
+            port = 80;
+        }
+        return port;
     }
 
 

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

@@ -53,6 +53,7 @@ public AwsProxyRequestBuilder(String path, String httpMethod) {
         this.request.setPath(path);
         this.request.setQueryStringParameters(new HashMap<>());
         this.request.setRequestContext(new ApiGatewayRequestContext());
+        this.request.getRequestContext().setStage("test");
         ApiGatewayRequestIdentity identity = new ApiGatewayRequestIdentity();
         identity.setSourceIp("127.0.0.1");
         this.request.getRequestContext().setIdentity(identity);
@@ -68,9 +69,6 @@ public AwsProxyRequestBuilder method(String httpMethod) {
         return this;
     }
 
-//    public AwsProxyRequestBuilder schemeAndHost(String scheme) {
-//        this.request.getRequestContext().
-//    }
 
     public AwsProxyRequestBuilder path(String path) {
         this.request.setPath(path);
@@ -171,6 +169,28 @@ public AwsProxyRequestBuilder cookie(String name, String value) {
         return this;
     }
 
+    public AwsProxyRequestBuilder scheme(String scheme) {
+        if (request.getHeaders() == null) {
+            request.setHeaders(new HashMap<>());
+        }
+
+        request.getHeaders().put("CloudFront-Forwarded-Proto", scheme);
+        return this;
+    }
+
+    public AwsProxyRequestBuilder serverName(String serverName) {
+        if (request.getHeaders() == null) {
+            request.setHeaders(new HashMap<>());
+        }
+
+        request.getHeaders().put("Host", serverName);
+        return this;
+    }
+
+    public AwsProxyRequestBuilder stage(String stage) {
+        this.request.getRequestContext().setStage(stage);
+        return this;
+    }
 
     public AwsProxyRequest build() {
         return this.request;

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java

@@ -200,13 +200,16 @@ public void request_requestURI() {
 
     @Test
     public void request_requestURL() {
-        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/request-URL", "GET")
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/request-Url", "GET")
+                .scheme("https")
+                .serverName("api.myserver.com")
+                .stage("prod")
                 .build();
 
         AwsProxyResponse output = handler.proxy(request, lambdaContext);
         assertEquals(200, output.getStatusCode());
 
-//        validateSingleValueModel(output, "/echo/request-URI");
+        validateSingleValueModel(output, "https://api.myserver.com/prod/echo/request-Url");
     }
 
     private void validateMapResponseModel(AwsProxyResponse output) {

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/EchoResource.java

@@ -92,7 +92,7 @@ public SingleValueModel echoRequestURI(HttpServletRequest request) {
         return valueModel;
     }
 
-    @RequestMapping(path = "/request-URL", method = RequestMethod.GET)
+    @RequestMapping(path = "/request-Url", method = RequestMethod.GET)
     public SingleValueModel echoRequestURL(HttpServletRequest request) {
         SingleValueModel valueModel = new SingleValueModel();
         valueModel.setValue(request.getRequestURL().toString());