Fix context path bug on SSLHandler and ctx.getRequestUrl

Author: jknack

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -223,10 +223,6 @@ public interface DefaultContext extends Context {
     if (port.length() > 0 && !port.endsWith("80") && !hostAndPort.endsWith("443")) {
       url.append(":").append(port);
     }
-    String contextPath = getContextPath();
-    if (contextPath.length() > 0 && !contextPath.equals("/")) {
-      url.append(contextPath);
-    }
     url.append(pathString());
     url.append(queryString());
 

jooby/src/main/java/io/jooby/SSLHandler.java

@@ -80,10 +80,6 @@ public SSLHandler(boolean useProxy) {
           buff.append(":").append(port);
         }
       }
-      String contextPath = ctx.getContextPath();
-      if (!contextPath.equals("/")) {
-        buff.append(contextPath);
-      }
       buff.append(ctx.pathString());
       buff.append(ctx.queryString());
       ctx.sendRedirect(buff.toString());

tests/src/test/java/io/jooby/FeaturedTest.java

@@ -2978,6 +2978,36 @@ public void requestUrl() {
         assertEquals("http://first/somepath?useProxy=true", rsp.body().string());
       });
     });
+
+    new JoobyRunner(app -> {
+      app.setContextPath("/x");
+      app.get("/{path}", ctx -> ctx.getRequestURL(ctx.query("useProxy").booleanValue(false)));
+    }).ready(client -> {
+      client.get("/x/somepath", rsp -> {
+        assertEquals("http://localhost:" + client.getPort() + "/x/somepath", rsp.body().string());
+      });
+      client.header("X-Forwarded-Host", "myhost");
+      client.get("/x/somepath", rsp -> {
+        assertEquals("http://localhost:" + client.getPort() + "/x/somepath", rsp.body().string());
+      });
+      client.header("X-Forwarded-Host", "myhost");
+      client.header("X-Forwarded-Proto", "https");
+      client.get("/x/somepath?useProxy=true", rsp -> {
+        assertEquals("https://myhost/x/somepath?useProxy=true", rsp.body().string());
+      });
+      client.header("X-Forwarded-Host", "myhost:80");
+      client.get("/x/somepath?useProxy=true", rsp -> {
+        assertEquals("http://myhost/x/somepath?useProxy=true", rsp.body().string());
+      });
+      client.header("X-Forwarded-Host", "myhost:90");
+      client.get("/x/somepath?useProxy=true", rsp -> {
+        assertEquals("http://myhost:90/x/somepath?useProxy=true", rsp.body().string());
+      });
+      client.header("X-Forwarded-Host", "first,second");
+      client.get("/x/somepath?useProxy=true", rsp -> {
+        assertEquals("http://first/x/somepath?useProxy=true", rsp.body().string());
+      });
+    });
   }
 
   private byte[][] partition(byte[] bytes, int size) {

tests/src/test/java/io/jooby/HttpsTest.java

@@ -49,6 +49,30 @@ public void httpsX509() {
 
   @Test
   public void forceSSL() {
+    new JoobyRunner(app -> {
+
+      app.setContextPath("/secure");
+
+      app.setServerOptions(new ServerOptions().setSecurePort(8433));
+
+      app.before(new SSLHandler(true));
+
+      app.get("/{path}", ctx -> ctx.pathString());
+    }).dontFollowRedirects().ready((http, https, server) -> {
+      http.get("/secure/path", rsp -> {
+        assertEquals("https://localhost:" + https.getPort() + "/secure/path",
+            rsp.header("Location"));
+        assertEquals(302, rsp.code());
+      });
+
+      http.header("X-Forwarded-Host", "myhost.org");
+      http.get("/secure/path?a=b", rsp -> {
+        assertEquals("https://myhost.org/secure/path?a=b",
+            rsp.header("Location"));
+        assertEquals(302, rsp.code());
+      });
+    });
+
     new JoobyRunner(app -> {
 
       app.setServerOptions(new ServerOptions().setSecurePort(8433));
@@ -70,6 +94,7 @@ public void forceSSL() {
         assertEquals(302, rsp.code());
       });
     });
+
   }
 
   @Test
@@ -95,5 +120,27 @@ public void forceSSLStatic() {
         assertEquals(302, rsp.code());
       });
     });
+
+    new JoobyRunner(app -> {
+      app.setContextPath("/ppp");
+      app.setServerOptions(new ServerOptions().setSecurePort(8433));
+
+      app.before(new SSLHandler("static.org"));
+
+      app.get("/{path}", ctx -> ctx.pathString());
+    }).dontFollowRedirects().ready(http -> {
+      http.get("/ppp/path", rsp -> {
+        assertEquals("https://static.org/ppp/path",
+            rsp.header("Location"));
+        assertEquals(302, rsp.code());
+      });
+
+      http.header("X-Forwarded-Host", "myhost.org");
+      http.get("/ppp/path?a=b", rsp -> {
+        assertEquals("https://static.org/ppp/path?a=b",
+            rsp.header("Location"));
+        assertEquals(302, rsp.code());
+      });
+    });
   }
 }