andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix regression in QueryStringEncoder

Browse Source 
Motivation:

Commit #d675febf07d14d4dff82471829f974369705655a introduced a regression in QueryStringEncoder, resulting in whitespace being converted into a literal `+` sign instead of `%20`.

Modification:

Modify `encodeComponent` to pattern match and replace on the result of the call to `URLEncoder#encode`

Result:

Fixes regression
This commit is contained in:
Brendt Lucas 2017-04-16 11:47:54 +01:00 committed by Norman Maurer
parent 155983f1a1
commit dcd322dda2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java
View File

@ -108,7 +108,7 @@ public class QueryStringEncoder {
private static String encodeComponent(String s, Charset charset) { private static String encodeComponent(String s, Charset charset) {
// TODO: Optimize me. // TODO: Optimize me.
try { try {
return URLEncoder.encode(s, PATTERN.matcher(charset.name()).replaceAll("%20")); return PATTERN.matcher(URLEncoder.encode(s, charset.name())).replaceAll("%20");
} catch (UnsupportedEncodingException ignored) { } catch (UnsupportedEncodingException ignored) {
throw new UnsupportedCharsetException(charset.name()); throw new UnsupportedCharsetException(charset.name());
} }

8
codec-http/src/test/java/io/netty/handler/codec/http/QueryStringEncoderTest.java
View File

@ -59,4 +59,12 @@ public class QueryStringEncoderTest {
Assert.assertEquals("/foo/\u00A5?a=%FE%FF%00%A5", e.toString()); Assert.assertEquals("/foo/\u00A5?a=%FE%FF%00%A5", e.toString());
Assert.assertEquals(new URI("/foo/\u00A5?a=%FE%FF%00%A5"), e.toUri()); Assert.assertEquals(new URI("/foo/\u00A5?a=%FE%FF%00%A5"), e.toUri());
} }
@Test
public void testWhitespaceEncoding() throws Exception {
QueryStringEncoder e = new QueryStringEncoder("/foo");
e.addParam("a", "b c");
Assert.assertEquals("/foo?a=b%20c", e.toString());
Assert.assertEquals(new URI("/foo?a=b%20c"), e.toUri());
}
} }