From 1992f21b3963e87fc59c8fdca126f5a4eaf88b1e Mon Sep 17 00:00:00 2001 From: Thapasvini Date: Tue, 17 Nov 2026 21:58:12 -0600 Subject: [PATCH] Fix configurable content type charset handling. This change addresses issue #1729 --- .../AwsProxyHttpServletRequestReader.java | 4 ++- .../proxy/model/ContainerConfig.java | 19 +++++++++++++ .../AwsProxyHttpServletRequestReaderTest.java | 28 ++++++++++++++++--- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReader.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReader.java index ec56285f7..34e44222e 100644 --- a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReader.java +++ b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReader.java @@ -49,7 +49,9 @@ public HttpServletRequest readRequest(AwsProxyRequest request, SecurityContext s } request.setPath(stripBasePath(request.getPath(), config)); - if (request.getMultiValueHeaders() != null && request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE) != null) { + if (config.isAppendDefaultContentCharset() + && request.getMultiValueHeaders() != null + && request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE) != null) { String contentType = request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE); // put single as we always expect to have one and only one content type in a request. request.getMultiValueHeaders().putSingle(HttpHeaders.CONTENT_TYPE, getContentTypeWithCharset(contentType, config)); diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ContainerConfig.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ContainerConfig.java index 941109b75..7e2e17e88 100644 --- a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ContainerConfig.java +++ b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ContainerConfig.java @@ -55,6 +55,7 @@ public static ContainerConfig defaultConfig() { private boolean stripBasePath; private String uriEncoding; private String defaultContentCharset; + private boolean appendDefaultContentCharset = true; private boolean consolidateSetCookieHeaders; private boolean useStageAsServletContext; private List validFilePaths; @@ -290,6 +291,24 @@ public void setDefaultContentCharset(String defaultContentCharset) { this.defaultContentCharset = defaultContentCharset; } + /** + * Returns whether the default charset is appended to a request's Content-Type header when + * the header does not already specify a charset. This is enabled by default. + * @return whether the default charset is appended to the Content-Type header + */ + public boolean isAppendDefaultContentCharset() { + return appendDefaultContentCharset; + } + + /** + * Sets whether the default charset is appended to a request's Content-Type header when + * the header does not already specify a charset. The default is true. + * @param appendDefaultContentCharset whether to append the default charset + */ + public void setAppendDefaultContentCharset(boolean appendDefaultContentCharset) { + this.appendDefaultContentCharset = appendDefaultContentCharset; + } + /** * Returns the maximum amount of time (in milliseconds) set for the initialization time. See documentation on the * {@link #setInitializationTimeout(int)} for additional details. diff --git a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReaderTest.java b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReaderTest.java index f92c37168..55b5e0844 100644 --- a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReaderTest.java +++ b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReaderTest.java @@ -3,14 +3,12 @@ import com.amazonaws.serverless.exceptions.InvalidRequestEventException; import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler; +import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder; import com.amazonaws.serverless.proxy.model.AwsProxyRequest; import com.amazonaws.serverless.proxy.model.ContainerConfig; -import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder; -import org.junit.jupiter.api.Test; - import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.SecurityContext; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; @@ -84,6 +82,28 @@ void readRequest_contentCharset_setsDefaultCharsetWhenNotSpecified() { } } + @Test + void readRequest_contentCharset_doesNotAppendDefaultCharsetWhenDisabled() { + String requestContentType = "application/json"; + AwsProxyRequest request = new AwsProxyRequestBuilder(ENCODED_REQUEST_PATH, "GET") + .header(HttpHeaders.CONTENT_TYPE, requestContentType) + .build(); + + ContainerConfig config = ContainerConfig.defaultConfig(); + config.setAppendDefaultContentCharset(false); + + try { + HttpServletRequest servletRequest = reader.readRequest(request, null, null, config); + assertNotNull(servletRequest); + assertEquals(requestContentType, servletRequest.getHeader(HttpHeaders.CONTENT_TYPE)); + assertEquals(requestContentType, request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE)); + assertNull(servletRequest.getCharacterEncoding()); + } catch (InvalidRequestEventException e) { + e.printStackTrace(); + fail("Could not read request"); + } + } + @Test void readRequest_contentCharset_appendsCharsetToComplextContentType() { String contentType = "multipart/form-data; boundary=something";