SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2019-01-07 10:22:51 -05:00
parent 4f316bd4b4 67f472771e
commit 7c6be558f9
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
View File

@@ -19,8 +19,11 @@ package org.springframework.cloud.netflix.zuul.util;
import static java.util.Arrays.stream;
import static java.util.Collections.emptyMap;
import static org.springframework.util.StringUtils.isEmpty;
import static org.springframework.util.StringUtils.tokenizeToStringArray;
import static org.springframework.util.StringUtils.uriDecode;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -36,7 +39,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.util.UriComponentsBuilder;
@@ -78,12 +80,16 @@ public class RequestContentDataExtractor {
.collect(Collectors.toList());
List<String> listOfOnlyQueryParams = queryParamsGroupedByName.get(key);
if (listOfOnlyQueryParams != null
&& !listOfOnlyQueryParams.containsAll(listOfAllParams)) {
listOfAllParams.removeAll(listOfOnlyQueryParams);
for (String value : listOfAllParams) {
builder.add(key,
new HttpEntity<>(value, newHttpHeaders(request, key)));
if(listOfOnlyQueryParams != null) {
listOfOnlyQueryParams = listOfOnlyQueryParams.stream()
.map(param -> uriDecode(param, Charset.defaultCharset()))
.collect(Collectors.toList());
if (!listOfOnlyQueryParams.containsAll(listOfAllParams)) {
listOfAllParams.removeAll(listOfOnlyQueryParams);
for (String value : listOfAllParams) {
builder.add(key,
new HttpEntity<>(value, newHttpHeaders(request, key)));
}
}
}
@@ -127,7 +133,7 @@ public class RequestContentDataExtractor {
String query = request.getQueryString();
if (query != null) {
for (String value : StringUtils.tokenizeToStringArray(query, "&")) {
for (String value : tokenizeToStringArray(query, "&")) {
if (value.contains("=")) {
value = value.substring(0, value.indexOf("="));
}

23
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractorTest.java
View File

@@ -74,6 +74,29 @@ public class RequestContentDataExtractorTest {
assertThat(result.get("uid"), hasItem(hasProperty("headers", notNullValue())));
}
@Test
public void methodExtractShouldReturnNotDuplicatedValuesFromRequestWhenEncoded()
throws Exception {
// when
when(request.getMultiFileMap()).thenReturn(new LinkedMultiValueMap<>());
when(request.getQueryString()).thenReturn("uid=hello%20world");
Map<String, String[]> expectedParameterMap = new HashMap<String, String[]>() {
{
put("uid", new String[] { "hello world" });
}
};
when(request.getParameterMap()).thenReturn(expectedParameterMap);
// action
MultiValueMap<String, Object> result = RequestContentDataExtractor
.extract(request);
// then
assertThat(result, notNullValue());
assertThat(result.size(), equalTo(0));
}
@Test
public void findQueryParamsGroupedByNameShouldReturnCorrectResult() {
// when