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

[#2732] HttpRequestEncoder may produce invalid uri if uri parameters are included.

Browse Source 
Motivation:

If the requests contains uri parameters but not path the HttpRequestEncoder does produce an invalid uri while try to add the missing path.

Modifications:

Correctly handle the case of uri with paramaters but no path.

Result:

HttpRequestEncoder produce correct uri in all cases.
This commit is contained in:
Norman Maurer 2014-08-05 10:13:05 +02:00
parent 730bfd4fdb
commit 2258b32549
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java
View File

@ -26,6 +26,7 @@ import static io.netty.handler.codec.http.HttpConstants.*;
*/
public class HttpRequestEncoder extends HttpObjectEncoder<HttpRequest> {
private static final char SLASH = '/';
private static final char QUESTION_MARK = '?';
private static final byte[] CRLF = { CR, LF };
@Override
@ -48,8 +49,22 @@ public class HttpRequestEncoder extends HttpObjectEncoder<HttpRequest> {
int start = uri.indexOf("://");
if (start != -1 && uri.charAt(0) != SLASH) {
int startIndex = start + 3;
if (uri.lastIndexOf(SLASH) <= startIndex) {
uri += SLASH;
// Correctly handle query params.
// See https://github.com/netty/netty/issues/2732
int index = uri.indexOf(QUESTION_MARK, startIndex);
if (index == -1) {
if (uri.lastIndexOf(SLASH) <= startIndex) {
uri += SLASH;
}
} else {
if (uri.lastIndexOf(SLASH, index) <= startIndex) {
int len = uri.length();
StringBuilder sb = new StringBuilder(len + 1);
sb.append(uri, 0, index);
sb.append(SLASH);
sb.append(uri, index, len);
uri = sb.toString();
}
}
}
}

10
codec-http/src/test/java/io/netty/handler/codec/http/HttpRequestEncoderTest.java
View File

@ -37,6 +37,16 @@ public class HttpRequestEncoderTest {
assertEquals("GET http://localhost/ HTTP/1.1\r\n", req);
}
@Test
public void testUriWithoutPath2() throws Exception {
HttpRequestEncoder encoder = new HttpRequestEncoder();
ByteBuf buffer = Unpooled.buffer(64);
encoder.encodeInitialLine(buffer, new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET,
"http://localhost:9999?p1=v1"));
String req = buffer.toString(Charset.forName("US-ASCII"));
assertEquals("GET http://localhost:9999/?p1=v1 HTTP/1.1\r\n", req);
}
@Test
public void testUriWithPath() throws Exception {
HttpRequestEncoder encoder = new HttpRequestEncoder();