Skip to content

Form param handling fixes #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 10, 2022
Merged

Form param handling fixes #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c890e3
Empty form params should not be omitted (#340)
deki Jan 3, 2022
cab5817
use assertTrue for boolean checks
deki Jan 3, 2022
0288c48
form param names must be included in getParameterNames() (#340)
deki Jan 3, 2022
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
6 changes: 4 additions & 2 deletions .../src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
10 changes: 7 additions & 3 deletions ...main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down Expand Up @@ -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()));
}


Expand Down
23 changes: 22 additions & 1 deletion ...a/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestFormTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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());
}
}