Merge pull request #446 from deki/340-emptyFormParams

Form param handling fixes

Author: Dennis Kieselhorst

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

@@ -496,14 +496,16 @@ protected Map<String, List<String>> getFormUrlEncodedParametersMap() {
         urlEncodedFormParameters = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         for (String parameter : rawBodyContent.split(FORM_DATA_SEPARATOR)) {
             String[] parameterKeyValue = parameter.split(HEADER_KEY_VALUE_SEPARATOR);
-            if (parameterKeyValue.length < 2) {
+            if (parameterKeyValue.length < 1) {
                 continue;
             }
             List<String> values = new ArrayList<>();
             if (urlEncodedFormParameters.containsKey(parameterKeyValue[0])) {
                 values = urlEncodedFormParameters.get(parameterKeyValue[0]);
             }
-            values.add(decodeValueIfEncoded(parameterKeyValue[1]));
+            if (parameterKeyValue.length > 1) {
+                values.add(decodeValueIfEncoded(parameterKeyValue[1]));
+            }
             urlEncodedFormParameters.put(decodeValueIfEncoded(parameterKeyValue[0]), values);
         }
         Timer.stop("SERVLET_REQUEST_GET_FORM_PARAMS");

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

@@ -45,6 +45,9 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -360,11 +363,12 @@ public String getParameter(String s) {
 
     @Override
     public Enumeration<String> getParameterNames() {
+        Set<String> formParameterNames = getFormUrlEncodedParametersMap().keySet();
         if (request.getMultiValueQueryStringParameters() == null) {
-            return Collections.emptyEnumeration();
+            return Collections.enumeration(formParameterNames);
         }
-
-        return Collections.enumeration(request.getMultiValueQueryStringParameters().keySet());
+        return Collections.enumeration(Stream.concat(formParameterNames.stream(),
+                request.getMultiValueQueryStringParameters().keySet().stream()).collect(Collectors.toSet()));
     }
 
 

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

@@ -18,11 +18,13 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
@@ -121,6 +123,25 @@ public void postForm_getParamsBase64Encoded_expectAllParams() {
         Map<String, String[]> params = request.getParameterMap();
         assertNotNull(params);
         assertEquals(2, params.size());
-        assertEquals(true, params.containsKey(PART_KEY_1));
+        assertTrue(params.containsKey(PART_KEY_1));
+        assertEquals(2, Collections.list(request.getParameterNames()).size());
+    }
+
+    /**
+     * issue #340
+     */
+    @Test
+    public void postForm_emptyParamPresent() {
+        AwsProxyRequest proxyRequest = new AwsProxyRequestBuilder("/form", "POST")
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED).build();
+        String body = PART_KEY_1 + "=" + "&" + PART_KEY_2 + "=" + PART_VALUE_2;
+        proxyRequest.setBody(body);
+
+        HttpServletRequest request = new AwsProxyHttpServletRequest(proxyRequest, null, null);
+        Map<String, String[]> params = request.getParameterMap();
+        assertNotNull(params);
+        assertEquals(2, params.size());
+        assertTrue(params.containsKey(PART_KEY_1));
+        assertEquals(2, Collections.list(request.getParameterNames()).size());
     }
 }