Basic validation on proxy request object. If the object does not contain an HTTP method and a request context we throw an . This addresses #237 by making the error more explicit.

Author: sapessi

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

@@ -26,6 +26,7 @@
  * object and uses it to initialize a <code>AwsProxyHttpServletRequest</code> object.
  */
 public class AwsProxyHttpServletRequestReader extends RequestReader<AwsProxyRequest, AwsProxyHttpServletRequest> {
+    static final String INVALID_REQUEST_ERROR = "The incoming event is not a valid request from Amazon API Gateway or an Application Load Balancer";
 
     //-------------------------------------------------------------
     // Methods - Implementation
@@ -34,6 +35,11 @@ public class AwsProxyHttpServletRequestReader extends RequestReader<AwsProxyRequ
     @Override
     public AwsProxyHttpServletRequest readRequest(AwsProxyRequest request, SecurityContext securityContext, Context lambdaContext, ContainerConfig config)
             throws InvalidRequestEventException {
+        // Expect the HTTP method and context to be populated. If they are not, we are handling an
+        // unsupported event type.
+        if (request.getHttpMethod() == null || request.getHttpMethod().equals("") || request.getRequestContext() == null) {
+            throw new InvalidRequestEventException(INVALID_REQUEST_ERROR);
+        }
 
         request.setPath(stripBasePath(request.getPath(), config));
         if (request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE) != null) {

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReaderTest.java

@@ -34,7 +34,7 @@ public void readRequest_reflection_returnType() throws NoSuchMethodException {
 
     @Test
     public void readRequest_validAwsProxy_populatedRequest() {
-        AwsProxyRequest request = new AwsProxyRequestBuilder().header(TEST_HEADER_KEY, TEST_HEADER_VALUE).build();
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/path", "GET").header(TEST_HEADER_KEY, TEST_HEADER_VALUE).build();
         try {
             HttpServletRequest servletRequest = reader.readRequest(request, null, null, ContainerConfig.defaultConfig());
             assertNotNull(servletRequest.getHeader(TEST_HEADER_KEY));
@@ -109,4 +109,41 @@ public void readRequest_contentCharset_appendsCharsetToComplextContentType() {
             fail("Could not read request");
         }
     }
+
+    @Test
+    public void readRequest_validEventEmptyPath_expectExcepion() {
+        try {
+            AwsProxyRequest req = new AwsProxyRequestBuilder(null, "GET").build();
+            AwsProxyHttpServletRequest servletReq = reader.readRequest(req, null, null, ContainerConfig.defaultConfig());
+            assertNotNull(servletReq);
+        } catch (InvalidRequestEventException e) {
+            fail("Could not read a request with a null path");
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void readRequest_invalidEventEmptyMethod_expectExcepion() {
+        try {
+            AwsProxyRequest req = new AwsProxyRequestBuilder("/path", null).build();
+            reader.readRequest(req, null, null, ContainerConfig.defaultConfig());
+            fail("Expected InvalidRequestEventException");
+        } catch (InvalidRequestEventException e) {
+            assertEquals(AwsProxyHttpServletRequestReader.INVALID_REQUEST_ERROR, e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void readRequest_invalidEventEmptyContext_expectExcepion() {
+        try {
+            AwsProxyRequest req = new AwsProxyRequestBuilder("/path", "GET").build();
+            req.setRequestContext(null);
+            reader.readRequest(req, null, null, ContainerConfig.defaultConfig());
+            fail("Expected InvalidRequestEventException");
+        } catch (InvalidRequestEventException e) {
+            assertEquals(AwsProxyHttpServletRequestReader.INVALID_REQUEST_ERROR, e.getMessage());
+            e.printStackTrace();
+        }
+    }
 }