Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> validFilePaths;
Expand Down Expand Up @@ -290,6 +291,24 @@ public void setDefaultContentCharset(String defaultContentCharset) {
this.defaultContentCharset = defaultContentCharset;
}

/**
* Returns whether the default charset is appended to a request's <code>Content-Type</code> 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 <code>Content-Type</code> header when
* the header does not already specify a charset. The default is <code>true</code>.
* @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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down Expand Up @@ -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";
Expand Down