Fixed query string encoding issue with jersey reported in #140.

Author: sapessi

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

@@ -299,23 +299,7 @@ protected String generateQueryString(Map<String, String> parameters) {
         }
 
         queryString =  parameters.keySet().stream()
-                .map(key -> {
-                    String newKey = key;
-                    String newValue = parameters.get(key);
-                    try {
-                        if (!URLEncoder.encode(newKey, StandardCharsets.UTF_8.name()).equals(newKey)) {
-                            newKey = URLEncoder.encode(key, StandardCharsets.UTF_8.name());
-                        }
-
-                        if (!URLEncoder.encode(newValue, StandardCharsets.UTF_8.name()).equals(newValue)) {
-                            newValue = URLEncoder.encode(newValue, StandardCharsets.UTF_8.name());
-                        }
-                    } catch (UnsupportedEncodingException e) {
-                        log.error(SecurityUtils.crlf("Could not URLEncode: " + newKey), e);
-
-                    }
-                    return newKey + "=" + newValue;
-                })
+                .map(key -> key + "=" + parameters.get(key))
                 .collect(Collectors.joining("&"));
         return queryString;
     }

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

@@ -128,7 +128,7 @@ private ContainerRequest servletRequestToContainerRequest(ServletRequest request
         }
 
         UriBuilder uriBuilder = UriBuilder.fromUri(baseUri).path(servletRequest.getPathInfo());
-        uriBuilder.replaceQuery(AwsProxyHttpServletRequest.decodeValueIfEncoded(servletRequest.getQueryString()));
+        uriBuilder.replaceQuery(servletRequest.getQueryString());
 
         PropertiesDelegate apiGatewayProperties = new MapPropertiesDelegate();
         apiGatewayProperties.setProperty(API_GATEWAY_CONTEXT_PROPERTY, servletRequest.getAttribute(API_GATEWAY_CONTEXT_PROPERTY));

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

@@ -44,6 +44,22 @@ public class EchoJerseyResource {
     @Context
     SecurityContext securityCtx;
 
+    @Path("/decoded-param") @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public SingleValueModel echoDecodedParam(@QueryParam("param") String param) {
+        SingleValueModel model = new SingleValueModel();
+        model.setValue(param);
+        return model;
+    }
+
+    @Path("/encoded-param") @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public SingleValueModel echoEncodedParam(@QueryParam("param") @Encoded String param) {
+        SingleValueModel model = new SingleValueModel();
+        model.setValue(param);
+        return model;
+    }
+
     @Path("/headers") @GET
     @Produces(MediaType.APPLICATION_JSON)
     public MapResponseModel echoHeaders(@Context ContainerRequestContext context) {

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

@@ -32,6 +32,9 @@
 import javax.ws.rs.core.Response;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.UUID;
 
 import static org.junit.Assert.*;
@@ -305,6 +308,34 @@ public void securityContext_injectPrincipal_expectPrincipalName() {
         validateSingleValueModel(resp, USER_PRINCIPAL);
     }
 
+    @Test
+    public void queryParam_encoding_expectUnencodedParam() {
+        String paramValue = "p%2Fz%2B3";
+        String decodedParam = "";
+        try {
+            decodedParam = URLDecoder.decode(paramValue, "UTF-8");
+            System.out.println(decodedParam);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            fail("Could not decode parameter");
+        }
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/decoded-param", "GET").queryString("param", paramValue).build();
+
+        AwsProxyResponse resp = handler.proxy(request, lambdaContext);
+        assertEquals(200, resp.getStatusCode());
+        validateSingleValueModel(resp, decodedParam);
+    }
+
+    @Test
+    public void queryParam_encoding_expectEncodedParam() {
+        String paramValue = "p%2Fz%2B3";
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/encoded-param", "GET").queryString("param", paramValue).build();
+
+        AwsProxyResponse resp = handler.proxy(request, lambdaContext);
+        assertEquals(200, resp.getStatusCode());
+        validateSingleValueModel(resp, paramValue);
+    }
+
     private void validateMapResponseModel(AwsProxyResponse output) {
         validateMapResponseModel(output, CUSTOM_HEADER_KEY, CUSTOM_HEADER_VALUE);
     }

samples/springboot/pet-store/sam.yaml

@@ -6,7 +6,7 @@ Globals:
   Api:
     # API Gateway regional endpoints
     EndpointConfiguration: REGIONAL
-    
+
 Resources:
   PetStoreFunction:
     Type: AWS::Serverless::Function