Query parameter values not URL decoded when using a RequestStreamHandler implementation #1089
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -584,7 +584,7 @@ private void addPart(Map<String, List<Part>> params, String fieldName, Part newP | |
|
|
||
| protected String[] getQueryParamValues(MultiValuedTreeMap<String, String> qs, String key, boolean isCaseSensitive) { | ||
| List<String> value = getQueryParamValuesAsList(qs, key, isCaseSensitive); | ||
| if (value == null) { | ||
| return null; | ||
| } | ||
| return value.toArray(new String[0]); | ||
|
|
@@ -607,39 +607,57 @@ protected List<String> getQueryParamValuesAsList(MultiValuedTreeMap<String, Stri | |
| } | ||
|
|
||
| protected Map<String, String[]> generateParameterMap(MultiValuedTreeMap<String, String> qs, ContainerConfig config) { | ||
| return generateParameterMap(qs, config, false); | ||
| } | ||
|
|
||
| protected Map<String, String[]> generateParameterMap(MultiValuedTreeMap<String, String> qs, ContainerConfig config, boolean decodeQueryParams) { | ||
| Map<String, String[]> output; | ||
|
|
||
| Map<String, List<String>> formEncodedParams = getFormUrlEncodedParametersMap(); | ||
|
|
||
| if (qs == null) { | ||
| // Just transform the List<String> values to String[] | ||
| return formEncodedParams.entrySet().stream() | ||
| .collect(Collectors.toMap(Map.Entry::getKey, (e) -> e.getValue().toArray(new String[0]))); | ||
| } | ||
|
|
||
| // decode all keys and values in map | ||
| final MultiValuedTreeMap<String, String> decodedQs = new MultiValuedTreeMap<String, String>(); | ||
| if (decodeQueryParams) { | ||
| for (Map.Entry<String, List<String>> entry : qs.entrySet()) { | ||
| String k = decodeValueIfEncoded(entry.getKey()); | ||
| List<String> v = getQueryParamValuesAsList(qs, entry.getKey(), false).stream() | ||
| .map(AwsHttpServletRequest::decodeValueIfEncoded) | ||
| .collect(Collectors.toList()); | ||
| // addAll in case map has 2 keys that are identical once decoded | ||
| decodedQs.addAll(k, v); | ||
| } | ||
| } else { | ||
| decodedQs.putAll(qs); | ||
| } | ||
|
|
||
| Map<String, List<String>> queryStringParams; | ||
| if (config.isQueryStringCaseSensitive()) { | ||
| queryStringParams = decodedQs; | ||
| } else { | ||
| // If it's case insensitive, we check the entire map on every parameter | ||
| queryStringParams = decodedQs.entrySet().stream().collect( | ||
|
||
| Collectors.toMap( | ||
| Map.Entry::getKey, | ||
| e -> getQueryParamValuesAsList(decodedQs, e.getKey(), false) | ||
| )); | ||
| } | ||
|
|
||
| // Merge formEncodedParams and queryStringParams Maps | ||
| output = Stream.of(formEncodedParams, queryStringParams).flatMap(m -> m.entrySet().stream()) | ||
| .collect( | ||
| Collectors.toMap( | ||
| Map.Entry::getKey, | ||
| e -> e.getValue().toArray(new String[0]), | ||
| // If a parameter is in both Maps, we merge the list of values (and ultimately transform to String[]) | ||
| (formParam, queryParam) -> Stream.of(formParam, queryParam).flatMap(Stream::of).toArray(String[]::new) | ||
| )); | ||
|
|
||
| return output; | ||
| } | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a fairly minor thing, but all this new code has a mix of spaces and tabs (first indentation is 4 spaces, then only tabs). Even though the project has some files with a mix of both, the vast majority of files are using spaces only. So try to keep this one with spaces only too. (The tests added are also using tabs, and hopefully you can change them to spaces)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😱 ... fixed, everything is spaces now