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

Fix infinite loop (#10855)

Browse Source 
Motivation:

To fix the infinite loop parsing a multipart body.

Modifications:

Modified the loop to use the correct variable.

Result:

Multipart bodies will be parsed correctly again.
This commit is contained in:
James Kleeh 2020-12-11 08:15:23 -05:00 committed by Norman Maurer
parent 643b8471e2
commit 88cb2113ba
2 changed files with 39 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/multipart/HttpPostMultipartRequestDecoder.java
View File

@ -1117,7 +1117,7 @@ public class HttpPostMultipartRequestDecoder implements InterfaceHttpPostRequest
newOffset = toRead;
return -newOffset;
}
newOffset = posFirstChar + offset;
newOffset = posFirstChar + newOffset;
if (newOffset + delimeterLength > toRead) {
return -newOffset;
}

38
codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoderTest.java
View File

@ -938,4 +938,42 @@ public class HttpPostRequestDecoderTest {
assertTrue(req.release());
}
}
@Test
public void testDecodeMultipartRequest() {
byte[] bodyBytes = ("--be38b42a9ad2713f\n" +
"content-disposition: form-data; name=\"title\"\n" +
"content-length: 10\n" +
"content-type: text/plain; charset=UTF-8\n" +
"\n" +
"bar-stream\n" +
"--be38b42a9ad2713f\n" +
"content-disposition: form-data; name=\"data\"; filename=\"data.json\"\n" +
"content-length: 16\n" +
"content-type: application/json; charset=UTF-8\n" +
"\n" +
"{\"title\":\"Test\"}\n" +
"--be38b42a9ad2713f--").getBytes();
ByteBuf content = Unpooled.directBuffer(bodyBytes.length);
content.writeBytes(bodyBytes);
FullHttpRequest req = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/", content);
req.headers().add("Content-Type", "multipart/form-data;boundary=be38b42a9ad2713f");
try {
HttpPostRequestDecoder decoder = new HttpPostRequestDecoder(new DefaultHttpDataFactory(false), req);
InterfaceHttpData data = decoder.getBodyHttpData("title");
assertTrue(data instanceof MemoryAttribute);
assertEquals("bar-stream", ((MemoryAttribute) data).getString());
assertTrue(data.release());
data = decoder.getBodyHttpData("data");
assertTrue(data instanceof MemoryFileUpload);
assertEquals("{\"title\":\"Test\"}", ((MemoryFileUpload) data).getString());
assertTrue(data.release());
decoder.destroy();
} catch (HttpPostRequestDecoder.ErrorDataDecoderException e) {
fail("Was not expecting an exception");
} finally {
assertTrue(req.release());
}
}
}