From 89ed1517f506362eda1f78759fdff89ee5ff4704 Mon Sep 17 00:00:00 2001
From: Frederic Bregier <fredbregier@free.fr>
Date: Thu, 5 Jun 2014 23:20:41 +0200
Subject: [PATCH] [#2542] HTTP post request decoder does not support quoted
 boundaries

Motivation:
According to RFC2616 section 19, boundary string could be quoted, but
currently the PostRequestDecoder does not support it while it should.

Modifications:
Once the boundary is found, one check is made to verify if the boundary
is "quoted", and if so, it is "unqoted".

Note: in following usage of this boundary (as delimiter), quote seems no
more allowed according to the same RFC, so the reason that only the
boundary definition is corrected.

Result:
Now the boundary could be whatever quoted or not. A Junit test case
checks it.
---
 .../multipart/HttpPostRequestDecoder.java     |  7 ++++
 .../multipart/HttpPostRequestDecoderTest.java | 38 +++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
index 9ea3185fc5..5b8d15d4d9 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
@@ -172,6 +172,13 @@ public class HttpPostRequestDecoder implements InterfaceHttpPostRequestDecoder {
             if (boundary.length != 2) {
                 throw new ErrorDataDecoderException("Needs a boundary value");
             }
+            if (boundary[1].charAt(0) == '"') {
+                String bound = boundary[1].trim();
+                int index = bound.length() - 1;
+                if (bound.charAt(index) == '"') {
+                    boundary[1] = bound.substring(1, index);
+                }
+            }
             if (headerContentType[crank].toLowerCase().startsWith(
                     HttpHeaders.Values.CHARSET.toString())) {
                 String[] charset = StringUtil.split(headerContentType[crank], '=');
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoderTest.java
index f5fe26d907..500d47e386 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoderTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoderTest.java
@@ -138,10 +138,10 @@ public class HttpPostRequestDecoderTest {
         final DefaultHttpDataFactory inMemoryFactory = new DefaultHttpDataFactory(false);
         // Build test case
         String extradata = "aaaa";
-        String [] datas = new String[5];
+        String[] datas = new String[5];
         for (int i = 0; i < 4; i++) {
             datas[i] = extradata;
-            for (int j = 0; j < i ; j++) {
+            for (int j = 0; j < i; j++) {
                 datas[i] += '\r';
             }
         }
@@ -168,7 +168,7 @@ public class HttpPostRequestDecoderTest {
             InterfaceHttpData httpdata = decoder.getBodyHttpData("file" + i);
             assertNotNull(httpdata);
             Attribute attribute = (Attribute) httpdata;
-            byte []datar = attribute.get();
+            byte[] datar = attribute.get();
             assertNotNull(datar);
             assertEquals(datas[i].getBytes(CharsetUtil.UTF_8).length, datar.length);
 
@@ -176,6 +176,38 @@ public class HttpPostRequestDecoderTest {
         }
     }
 
+    // See https://github.com/netty/netty/issues/2542
+    @Test
+    public void testQuotedBoundary() throws Exception {
+        final String boundary = "dLV9Wyq26L_-JQxk6ferf-RT153LhOO";
+
+        final DefaultFullHttpRequest req = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST,
+                "http://localhost");
+
+        req.setDecoderResult(DecoderResult.SUCCESS);
+        req.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data; boundary=\"" + boundary + '"');
+        req.headers().add(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED);
+
+        // Force to use memory-based data.
+        final DefaultHttpDataFactory inMemoryFactory = new DefaultHttpDataFactory(false);
+
+        for (String data : Arrays.asList("", "\r", "\r\r", "\r\r\r")) {
+            final String body =
+                    "--" + boundary + "\r\n" +
+                            "Content-Disposition: form-data; name=\"file\"; filename=\"tmp-0.txt\"\r\n" +
+                            "Content-Type: image/gif\r\n" +
+                            "\r\n" +
+                            data + "\r\n" +
+                            "--" + boundary + "--\r\n";
+
+            req.content().writeBytes(body.getBytes(CharsetUtil.UTF_8));
+        }
+        // Create decoder instance to test.
+        final HttpPostRequestDecoder decoder = new HttpPostRequestDecoder(inMemoryFactory, req);
+        assertFalse(decoder.getBodyHttpDatas().isEmpty());
+        decoder.destroy();
+    }
+
     // See https://github.com/netty/netty/issues/1848
     @Test
     public void testNoZeroOut() throws Exception {