POST endpoint with Pac4j module kills Jooby server fix jooby-project#1548

jknack · jknack · commit 92826cf64e40 · 2020-03-12T20:26:04.000-03:00
- issue affect netty server (undertow and jetty were OK)
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -600,6 +600,13 @@ public interface Context extends Registry {
    */
   @Nonnull Multipart multipart();
 
+  /**
+   * Whether request content type is set to <code>application/x-www-form-urlencoded</code> or
+   * <code>multipart/*</code>
+   * @return
+   */
+  boolean isForm();
+
   /**
    * Get a multipart field that matches the given name.
    *
diff --git a/jooby/src/main/java/io/jooby/DefaultContext.java b/jooby/src/main/java/io/jooby/DefaultContext.java
@@ -93,6 +93,17 @@ public interface DefaultContext extends Context {
             .create(this, new Cookie(getRouter().getFlashCookie()).setHttpOnly(true)));
   }
 
+  @Override default boolean isForm() {
+    String contentType = header("Content-Type").value("");
+    if (contentType.equalsIgnoreCase(MediaType.FORM_URLENCODED)) {
+      return true;
+    }
+    if (contentType.toLowerCase().startsWith(MediaType.MULTIPART_FORMDATA)) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Get a flash attribute.
    *
diff --git a/jooby/src/main/java/io/jooby/ForwardingContext.java b/jooby/src/main/java/io/jooby/ForwardingContext.java
@@ -201,6 +201,10 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.getRequestType(defaults);
   }
 
+  @Override public boolean isForm() {
+    return ctx.isForm();
+  }
+
   @Override public long getRequestLength() {
     return ctx.getRequestLength();
   }
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java
@@ -67,6 +67,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.Executor;
 
 import static org.eclipse.jetty.http.HttpHeader.CONTENT_TYPE;
diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java
@@ -700,7 +700,7 @@ private FileUpload register(FileUpload upload) {
   }
 
   private void decodeForm(HttpRequest req, Formdata form) {
-    if (decoder == null) {
+    if (decoder == null || decoder instanceof HttpRawPostRequestDecoder) {
       // empty/bad form
       return;
     }
diff --git a/tests/src/test/java/io/jooby/Issue1548.java b/tests/src/test/java/io/jooby/Issue1548.java
@@ -0,0 +1,23 @@
+package io.jooby;
+
+import io.jooby.junit.ServerTest;
+import io.jooby.junit.ServerTestRunner;
+import okhttp3.MediaType;
+
+import static okhttp3.RequestBody.create;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1548 {
+
+  @ServerTest
+  public void issue1548(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.post("/1548", ctx -> ctx.multipart().toString());
+    }).ready(client -> {
+      client
+          .post("/1548", create("{\"foo\": \"bar\"}", MediaType.parse("application/json")), rsp -> {
+            assertEquals("{}", rsp.body().string());
+          });
+    });
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,10 @@ public ForwardingContext(@Nonnull Context context) {`
`201`	`201`	`return ctx.getRequestType(defaults);`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ @Override public boolean isForm() {`
	`205`	`+ return ctx.isForm();`
	`206`	`+ }`
	`207`	`+`
`204`	`208`	`@Override public long getRequestLength() {`
`205`	`209`	`return ctx.getRequestLength();`
`206`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ private FileUpload register(FileUpload upload) {`
`700`	`700`	`}`
`701`	`701`
`702`	`702`	`private void decodeForm(HttpRequest req, Formdata form) {`
`703`		`- if (decoder == null) {`
	`703`	`+ if (decoder == null \|\| decoder instanceof HttpRawPostRequestDecoder) {`
`704`	`704`	`// empty/bad form`
`705`	`705`	`return;`
`706`	`706`	`}`