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

Merge pull request #1071 from jebeaudet/fix-hardcoded-path-encoding

Browse Source 
* fix-hardcoded-path-encoding:
  Fixed the path encoding in ProxyRequestHelper when the character encoding was specifically set on HttpServletRequest.
This commit is contained in:
Spencer Gibb
2016-06-03 13:28:49 -06:00
parent 1c532d9637 8229eb657e
commit fc08b55eac
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java
View File

@@ -288,4 +288,36 @@ public class ProxyRequestHelperTests {
assertThat(requestURI, equalTo(encodedURI));
}
@Test
public void getUTF8Url() {
String requestURI = "/oléדרעק";
String encodedRequestURI = "/ol%C3%A9%D7%93%D7%A8%D7%A2%D7%A7";
MockHttpServletRequest request = new MockHttpServletRequest("GET", requestURI);
request.setCharacterEncoding("UTF-8");
RequestContext context = RequestContext.getCurrentContext();
context.set("requestURI", requestURI);
ProxyRequestHelper helper = new ProxyRequestHelper();
String uri = helper.buildZuulRequestURI(request);
assertThat(uri, is(encodedRequestURI));
}
@Test
public void getDefaultEncodingUrl() {
String requestURI = "/oléדרעק";
String encodedRequestURI = "/ol%E9%3F%3F%3F%3F";
MockHttpServletRequest request = new MockHttpServletRequest("GET", requestURI);
RequestContext context = RequestContext.getCurrentContext();
context.set("requestURI", requestURI);
ProxyRequestHelper helper = new ProxyRequestHelper();
String uri = helper.buildZuulRequestURI(request);
assertThat(uri, is(encodedRequestURI));
}
}

13
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilterTests.java
View File

@@ -377,6 +377,19 @@ public class PreDecorationFilterTests {
assertTrue("sensitiveHeaders is wrong: " + sensitiveHeaders,
sensitiveHeaders.containsAll(Arrays.asList("x-bar", "x-foo")));
}
@Test
public void urlProperlyDecodedWhenCharacterEncodingIsSet() throws Exception {
this.request.setCharacterEncoding("UTF-8");
this.properties.setPrefix("/api");
this.properties.setStripPrefix(true);
this.request.setRequestURI("/api/foo/ol%C3%A9%D7%93%D7%A8%D7%A2%D7%A7");
this.routeLocator.addRoute("/foo/**", "foo");
RequestContext ctx = RequestContext.getCurrentContext();
this.filter.run();
String decodedRequestURI = (String) ctx.get("requestURI");
assertTrue(decodedRequestURI.equals("/oléדרעק"));
}
private Object getHeader(List<Pair<String, String>> headers, String key) {
String value = null;