Handle invalid forms

eclipse-vertx · Mar 13, 2016 · c3ce612 · c3ce612
1 parent 0d7a042
commit c3ce612
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 13 deletions.
diff --git a/src/main/java/io/vertx/core/http/impl/Http2ServerRequestImpl.java b/src/main/java/io/vertx/core/http/impl/Http2ServerRequestImpl.java
@@ -149,7 +149,7 @@ void handleReset(long code) {
   }
 
   @Override
-  void handleError(Throwable cause) {
+  void handleException(Throwable cause) {
     if (exceptionHandler != null) {
       exceptionHandler.handle(cause);
       response.handleError(cause);
@@ -171,8 +171,8 @@ private void callHandler(Buffer data) {
     if (decoder != null) {
       try {
         decoder.offer(new DefaultHttpContent(data.getByteBuf()));
-      } catch (HttpPostRequestDecoder.ErrorDataDecoderException e) {
+      } catch (Exception e) {
-        e.printStackTrace();
+        handleException(e);
       }
     }
     if (dataHandler != null) {
@@ -197,10 +197,10 @@ private void callEnd() {
             }
           }
         }
-      } catch (HttpPostRequestDecoder.ErrorDataDecoderException e) {
-        handleException(e);
       } catch (HttpPostRequestDecoder.EndOfDataDecoderException e) {
         // ignore this as it is expected
+      } catch (Exception e) {
+        handleException(e);
       } finally {
         decoder.destroy();
       }
@@ -210,10 +210,6 @@ private void callEnd() {
     }
   }
 
-  private void handleException(Throwable t) {
-    t.printStackTrace();
-  }
-
   private void consume(int numBytes) {
     try {
       boolean windowUpdateSent = conn.local().flowController().consumeBytes(stream, numBytes);

diff --git a/src/main/java/io/vertx/core/http/impl/VertxHttp2Handler.java b/src/main/java/io/vertx/core/http/impl/VertxHttp2Handler.java
@@ -286,7 +286,7 @@ public Push(Http2ServerResponseImpl response, Handler<AsyncResult<HttpServerResp
     }
 
     @Override
-    void handleError(Throwable cause) {
+    void handleException(Throwable cause) {
       response.handleError(cause);
     }
 
@@ -458,7 +458,7 @@ protected void onStreamError(ChannelHandlerContext ctx, Throwable cause, Http2Ex
     VertxHttp2Stream stream = streams.get(http2Ex.streamId());
     if (stream != null) {
       handlerContext.executeFromIO(() -> {
-        stream.handleError(http2Ex);
+        stream.handleException(http2Ex);
       });
     }
     // Default behavior reset stream
@@ -475,7 +475,7 @@ protected void onConnectionError(ChannelHandlerContext ctx, Throwable cause, Htt
     }
     for (VertxHttp2Stream stream : streams.values()) {
       handlerContext.executeFromIO(() -> {
-        stream.handleError(cause);
+        stream.handleException(cause);
       });
     }
     // Default behavior send go away

diff --git a/src/main/java/io/vertx/core/http/impl/VertxHttp2Stream.java b/src/main/java/io/vertx/core/http/impl/VertxHttp2Stream.java
@@ -25,7 +25,7 @@ abstract class VertxHttp2Stream {
 
   abstract void handleReset(long code);
 
-  abstract void handleError(Throwable cause);
+  abstract void handleException(Throwable cause);
 
   abstract void handleClose();
 

diff --git a/src/test/java/io/vertx/test/core/Http2Test.java b/src/test/java/io/vertx/test/core/Http2Test.java
@@ -597,6 +597,43 @@ public void testPostFileUpload() throws Exception {
     await();
   }
 
+  @Test
+  public void testInvalidPostFileUpload() throws Exception {
+    server.requestHandler(req -> {
+      req.setExpectMultipart(true);
+      AtomicInteger errCount = new AtomicInteger();
+      req.exceptionHandler(err -> {
+        errCount.incrementAndGet();
+      });
+      req.endHandler(v -> {
+        assertTrue(errCount.get() > 0);
+        testComplete();
+      });
+    });
+    startServer();
+
+    String contentType = "multipart/form-data; boundary=a4e41223-a527-49b6-ac1c-315d76be757e";
+    String contentLength = "225";
+    String body = "--a4e41223-a527-49b6-ac1c-315d76be757e\r\n" +
+        "Content-Disposition: form-data; name=\"file\"; filename=\"tmp-0.txt\"\r\n" +
+        "Content-Type: image/gif; charset=ABCD\r\n" +
+        "Content-Length: 12\r\n" +
+        "\r\n" +
+        "some-content\r\n" +
+        "--a4e41223-a527-49b6-ac1c-315d76be757e--\r\n";
+
+    TestClient client = new TestClient();
+    ChannelFuture fut = client.connect(4043, "localhost", request -> {
+      int id = request.nextStreamId();
+      request.encoder.writeHeaders(request.context, id, POST("/form").
+          set("content-type", contentType).set("content-length", contentLength), 0, false, request.context.newPromise());
+      request.encoder.writeData(request.context, id, Buffer.buffer(body).getByteBuf(), 0, true, request.context.newPromise());
+      request.context.flush();
+    });
+    fut.sync();
+    await();
+  }
+
   @Test
   public void testConnect() throws Exception {
     server.requestHandler(req -> {