req.rawPath fix jooby-project#555

jknack · jknack · commit fc6a01f47711 · 2016-11-10T20:09:46.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue555.java b/coverage-report/src/test/java/org/jooby/issues/Issue555.java
@@ -0,0 +1,24 @@
+package org.jooby.issues;
+
+import org.jooby.assets.AssetsBase;
+import org.junit.Test;
+
+public class Issue555 extends AssetsBase {
+
+  {
+    get("/555/raw/**", req -> req.rawPath());
+    get("/555/path/**", req -> req.path());
+  }
+
+  @Test
+  public void rawPath() throws Exception {
+    request()
+        .get("/555/raw/x%252Fy%252Fz")
+        .expect("/555/raw/x%252Fy%252Fz");
+
+    request()
+        .get("/555/path/x%252Fy%252Fz")
+        .expect("/555/path/x/y/z");
+  }
+
+}
diff --git a/jooby-netty/src/main/java/org/jooby/internal/netty/NettyRequest.java b/jooby-netty/src/main/java/org/jooby/internal/netty/NettyRequest.java
@@ -121,6 +121,13 @@ public String method() {
     return req.method().name();
   }
 
+  @Override
+  public String rawPath() {
+    String uri = req.uri();
+    int at = uri.indexOf('?');
+    return at > 0 ? uri.substring(0, at) : uri;
+  }
+
   @Override
   public String path() {
     return path;
diff --git a/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java b/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java
@@ -92,6 +92,11 @@ public String path() {
     return path;
   }
 
+  @Override
+  public String rawPath() {
+    return req.getRequestURI();
+  }
+
   @Override
   public List<String> paramNames() {
     return toList(req.getParameterNames());
diff --git a/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java b/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java
@@ -97,6 +97,11 @@ public String path() {
     return path;
   }
 
+  @Override
+  public String rawPath() {
+    return exchange.getRequestURI();
+  }
+
   @Override
   public List<String> paramNames() {
     ImmutableList.Builder<String> builder = ImmutableList.<String> builder();
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -126,6 +126,11 @@ public String path() {
       return req.path();
     }
 
+    @Override
+    public String rawPath() {
+      return req.rawPath();
+    }
+
     @Override
     public Optional<String> queryString() {
       return req.queryString();
@@ -484,6 +489,13 @@ default String path() {
     return path(false);
   }
 
+  /**
+   * Raw path, like {@link #path()} but without decoding.
+   *
+   * @return Raw path, like {@link #path()} but without decoding.
+   */
+  String rawPath();
+
   /**
    * The query string, without the leading <code>?</code>.
    *
diff --git a/jooby/src/main/java/org/jooby/internal/RequestImpl.java b/jooby/src/main/java/org/jooby/internal/RequestImpl.java
@@ -338,6 +338,10 @@ public Route route() {
     return route;
   }
 
+  public String rawPath() {
+    return req.rawPath();
+  }
+
   @Override
   public String hostname() {
     return req.header("host").map(host -> host.split(":")[0]).orElse(ip());
diff --git a/jooby/src/main/java/org/jooby/spi/NativeRequest.java b/jooby/src/main/java/org/jooby/spi/NativeRequest.java
@@ -42,8 +42,8 @@ public interface NativeRequest {
   String method();
 
   /**
-   * @return The part of this request's URL from the protocol
-   *         name up to the query string in the first line of the HTTP request
+   * @return The part of this request's URL from the protocol name up to the query string in the
+   *         first line of the HTTP request.
    */
   String path();
 
@@ -161,4 +161,9 @@ default void push(final String method, final String path, final Map<String, Obje
       throws Exception {
     upgrade(NativePushPromise.class).push(method, path, headers);
   }
+
+  /**
+   * @return Request path without decoding.
+   */
+  String rawPath();
 }
diff --git a/jooby/src/test/java/org/jooby/RequestForwardingTest.java b/jooby/src/test/java/org/jooby/RequestForwardingTest.java
@@ -63,6 +63,18 @@ public void path() throws Exception {
         });
   }
 
+  @Test
+  public void rawPath() throws Exception {
+    new MockUnit(Request.class)
+        .expect(unit -> {
+          Request req = unit.get(Request.class);
+          expect(req.rawPath()).andReturn("/path");
+        })
+        .run(unit -> {
+          assertEquals("/path", new Request.Forwarding(unit.get(Request.class)).rawPath());
+        });
+  }
+
   @Test
   public void port() throws Exception {
     new MockUnit(Request.class)
diff --git a/jooby/src/test/java/org/jooby/RequestTest.java b/jooby/src/test/java/org/jooby/RequestTest.java
@@ -28,6 +28,11 @@ public MediaType type() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public String rawPath() {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public Optional<String> queryString() {
       throw new UnsupportedOperationException();
