encoded multipart requests #240

3 files changed, 44 insertions, 14 deletions

diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 20fbc79..847aee2 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -467,6 +467,14 @@ public abstract class NanoHTTPD {
         }
     }
 
+    private static final String CHARSET_REGEX = "[ |\t]*(charset)[ |\t]*=[ |\t]*['|\"]?([^\"^'^;]*)['|\"]?";
+
+    private static final Pattern CHARSET_PATTERN = Pattern.compile(CHARSET_REGEX, Pattern.CASE_INSENSITIVE);
+
+    private static final String BOUNDARY_REGEX = "[ |\t]*(boundary)[ |\t]*=[ |\t]*['|\"]?([^\"^'^;]*)['|\"]?";
+
+    private static final Pattern BOUNDARY_PATTERN = Pattern.compile(BOUNDARY_REGEX, Pattern.CASE_INSENSITIVE);
+
     private static final String CONTENT_DISPOSITION_REGEX = "([ |\t]*Content-Disposition[ |\t]*:)(.*)";
 
     private static final Pattern CONTENT_DISPOSITION_PATTERN = Pattern.compile(CONTENT_DISPOSITION_REGEX, Pattern.CASE_INSENSITIVE);
@@ -588,7 +596,7 @@ public abstract class NanoHTTPD {
         /**
          * Decodes the Multipart Body data and put it into Key/Value pairs.
          */
-        private void decodeMultipartFormData(String boundary, ByteBuffer fbuf, Map<String, String> parms, Map<String, String> files) throws ResponseException {
+        private void decodeMultipartFormData(String boundary, String encoding, ByteBuffer fbuf, Map<String, String> parms, Map<String, String> files) throws ResponseException {
             try {
                 int[] boundary_idxs = getBoundaryPositions(fbuf, boundary.getBytes());
                 if (boundary_idxs.length < 2) {
@@ -602,7 +610,7 @@ public abstract class NanoHTTPD {
                     int len = (fbuf.remaining() < MAX_HEADER_SIZE) ? fbuf.remaining() : MAX_HEADER_SIZE;
                     fbuf.get(part_header_buff, 0, len);
                     ByteArrayInputStream bais = new ByteArrayInputStream(part_header_buff, 0, len);
-                    BufferedReader in = new BufferedReader(new InputStreamReader(bais, Charset.forName("US-ASCII")));
+                    BufferedReader in = new BufferedReader(new InputStreamReader(bais, Charset.forName(encoding)));
 
                     // First line is boundary string
                     String mpline = in.readLine();
@@ -647,7 +655,7 @@ public abstract class NanoHTTPD {
                         // Read the part into a string
                         byte[] data_bytes = new byte[part_data_end - part_data_start];
                         fbuf.get(data_bytes);
-                        parms.put(part_name, new String(data_bytes));
+                        parms.put(part_name, new String(data_bytes, encoding));
                     } else {
                         // Read it into a file
                         String path = saveTmpFile(fbuf, part_data_start, part_data_end - part_data_start, file_name);
@@ -985,15 +993,8 @@ public abstract class NanoHTTPD {
                             throw new ResponseException(Response.Status.BAD_REQUEST,
                                     "BAD REQUEST: Content type is multipart/form-data but boundary missing. Usage: GET /example/file.html");
                         }
-
-                        String boundaryStartString = "boundary=";
-                        int boundaryContentStart = contentTypeHeader.indexOf(boundaryStartString) + boundaryStartString.length();
-                        String boundary = contentTypeHeader.substring(boundaryContentStart, contentTypeHeader.length());
-                        if (boundary.startsWith("\"") && boundary.endsWith("\"")) {
-                            boundary = boundary.substring(1, boundary.length() - 1);
-                        }
-
-                        decodeMultipartFormData(boundary, fbuf, this.parms, files);
+                        decodeMultipartFormData(getAttributeFromContentHeader(contentTypeHeader, BOUNDARY_PATTERN, null), //
+                                getAttributeFromContentHeader(contentTypeHeader, CHARSET_PATTERN, "US-ASCII"), fbuf, this.parms, files);
                     } else {
                         byte[] postBytes = new byte[fbuf.remaining()];
                         fbuf.get(postBytes);
@@ -1016,6 +1017,11 @@ public abstract class NanoHTTPD {
             }
         }
 
+        private String getAttributeFromContentHeader(String contentTypeHeader, Pattern pattern, String defaultValue) {
+            Matcher matcher = pattern.matcher(contentTypeHeader);
+            return matcher.find() ? matcher.group(2) : defaultValue;
+        }
+
         /**
          * Retrieves the content of a sent file and saves it to a temporary
          * file. The full path to the saved file is returned.
diff --git a/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java b/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java
index d4fc5cf..d2f5181 100644
--- a/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java
+++ b/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java
@@ -35,6 +35,7 @@ package fi.iki.elonen.integration;
 
 import static org.junit.Assert.assertEquals;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -154,4 +155,27 @@ public class GetAndPostIntegrationTest extends IntegrationTestBase<GetAndPostInt
 
         assertEquals("GET:testSimpleGetRequest", responseBody);
     }
+
+    @Test
+    public void testPostRequestWithMultipartExtremEncodedParameters() throws Exception {
+        this.testServer.response = "testPostRequestWithMultipartEncodedParameters";
+
+        HttpPost httppost = new HttpPost("http://localhost:8192/");
+        MultipartEntity reqEntity = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE, "sfsadfasdf", Charset.forName("UTF-8"));
+        reqEntity.addPart("specialString", new StringBody("拖拉图片到浏览器，可以实现预览功能", "text/plain", Charset.forName("UTF-8")));
+        reqEntity.addPart("gender", new StringBody("图片名称", Charset.forName("UTF-8")) {
+
+            @Override
+            public String getFilename() {
+                return "图片名称";
+            }
+        });
+        httppost.setEntity(reqEntity);
+
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        String responseBody = this.httpclient.execute(httppost, responseHandler);
+
+        // assertEquals("POST:testPostRequestWithMultipartEncodedParameters-params=2;age=120;gender=Male",
+        // responseBody);
+    }
 }
diff --git a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
index e305d8d..7f75f7a 100644
--- a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
+++ b/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
@@ -845,9 +845,9 @@ public abstract class NanoWebSocketServer extends NanoHTTPD {
             return serveHttp(session);
         }
     }
-    
+
     protected Response serveHttp(final IHTTPSession session) {
-    	return super.serve(session);
+        return super.serve(session);
     }
 
     /**