Merge pull request #44601 from sberyozkin/forward_and_x_forward_same_…

…values Ensure Forwarded and X-Forwarded values are the same
quarkusio · Nov 25, 2024 · 1bc6cb9 · 1bc6cb9
2 parents f5820e6 + 576ba7c
commit 1bc6cb9
Show file tree

Hide file tree

Showing 6 changed files with 386 additions and 63 deletions.
diff --git a/...eployment/src/test/java/io/quarkus/vertx/http/AllowForwardedAndXForwardedHeadersTest.java b/...eployment/src/test/java/io/quarkus/vertx/http/AllowForwardedAndXForwardedHeadersTest.java
@@ -0,0 +1,132 @@
+package io.quarkus.vertx.http;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class AllowForwardedAndXForwardedHeadersTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(ForwardedHandlerInitializer.class)
+                    .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
+                            "quarkus.http.proxy.allow-forwarded=true\n" +
+                            "quarkus.http.proxy.allow-x-forwarded=true\n" +
+                            "quarkus.http.proxy.enable-forwarded-host=true\n" +
+                            "quarkus.http.proxy.enable-forwarded-prefix=true\n" +
+                            "quarkus.http.proxy.forwarded-host-header=X-Forwarded-Server"),
+                            "application.properties"));
+
+    @Test
+    public void testAllHeaderValuesMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-Proto", "https")
+                .header("X-Forwarded-For", "backend2:5555")
+                .header("X-Forwarded-Server", "somehost2")
+                .get("/path")
+                .then()
+                .body(Matchers.equalTo("https|somehost2|backend2:5555|/path|https://somehost2/path"));
+    }
+
+    @Test
+    public void tesProtoHeaderValuesMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-Proto", "https")
+                .get("/path")
+                .then()
+                .body(Matchers.equalTo("https|somehost2|backend2:5555|/path|https://somehost2/path"));
+    }
+
+    @Test
+    public void testForHeaderValuesMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-For", "backend2:5555")
+                .get("/path")
+                .then()
+                .body(Matchers.equalTo("https|somehost2|backend2:5555|/path|https://somehost2/path"));
+    }
+
+    @Test
+    public void testHostHeaderValuesMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-Server", "somehost2")
+                .get("/path")
+                .then()
+                .body(Matchers.equalTo("https|somehost2|backend2:5555|/path|https://somehost2/path"));
+    }
+
+    @Test
+    public void testProtoDoesNotMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-Proto", "http")
+                .header("X-Forwarded-For", "backend2:5555")
+                .header("X-Forwarded-Server", "somehost2")
+                .get("/path")
+                .then()
+                .statusCode(400);
+    }
+
+    @Test
+    public void testForHostDoesNotMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend:5555;host=somehost2")
+                .header("X-Forwarded-Proto", "http")
+                .header("X-Forwarded-For", "backend2:5555")
+                .header("X-Forwarded-Server", "somehost2")
+                .get("/path")
+                .then()
+                .statusCode(400);
+    }
+
+    @Test
+    public void testForHostPortDoesNotMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:4444;host=somehost2")
+                .header("X-Forwarded-Proto", "http")
+                .header("X-Forwarded-For", "backend2:5555")
+                .header("X-Forwarded-Server", "somehost2")
+                .get("/path")
+                .then()
+                .statusCode(400);
+    }
+
+    @Test
+    public void testHostDoesNotMatch() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:4444;host=somehost")
+                .header("X-Forwarded-Proto", "http")
+                .header("X-Forwarded-For", "backend2:5555")
+                .header("X-Forwarded-Server", "somehost2")
+                .get("/path")
+                .then()
+                .statusCode(400);
+    }
+}
diff --git a/...c/test/java/io/quarkus/vertx/http/AllowForwardedHeadersOverrideXForwardedHeadersTest.java b/...c/test/java/io/quarkus/vertx/http/AllowForwardedHeadersOverrideXForwardedHeadersTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.vertx.http;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class AllowForwardedHeadersOverrideXForwardedHeadersTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(ForwardedHandlerInitializer.class)
+                    .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
+                            "quarkus.http.proxy.allow-forwarded=true\n" +
+                            "quarkus.http.proxy.allow-x-forwarded=true\n" +
+                            "quarkus.http.proxy.strict-forwarded-control=false\n"),
+                            "application.properties"));
+
+    @Test
+    public void testXForwardedProtoOverridesForwardedProto() {
+        assertThat(RestAssured.get("/path").asString()).startsWith("http|");
+
+        RestAssured.given()
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-Proto", "http")
+                .get("/path")
+                .then()
+                .body(Matchers.equalTo("https|somehost2|backend2:5555|/path|https://somehost2/path"));
+    }
+
+}
diff --git a/...x/http/AllowBothForwardedHeadersTest.java → ...dHeadersOverrideForwardedHeadersTest.java b/...x/http/AllowBothForwardedHeadersTest.java → ...dHeadersOverrideForwardedHeadersTest.java
@@ -10,7 +10,7 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.restassured.RestAssured;
 
-public class AllowBothForwardedHeadersTest {
+public class AllowXForwardedHeadersOverrideForwardedHeadersTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -19,22 +19,20 @@ public class AllowBothForwardedHeadersTest {
                     .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
                             "quarkus.http.proxy.allow-forwarded=true\n" +
                             "quarkus.http.proxy.allow-x-forwarded=true\n" +
-                            "quarkus.http.proxy.enable-forwarded-host=true\n" +
-                            "quarkus.http.proxy.enable-forwarded-prefix=true\n" +
-                            "quarkus.http.proxy.forwarded-host-header=X-Forwarded-Server"),
+                            "quarkus.http.proxy.forwarded-precedence=x-forwarded\n" +
+                            "quarkus.http.proxy.strict-forwarded-control=false\n"),
                             "application.properties"));
 
     @Test
-    public void test() {
+    public void testXForwardedProtoOverridesForwardedProto() {
         assertThat(RestAssured.get("/path").asString()).startsWith("http|");
 
         RestAssured.given()
-                .header("Forwarded", "proto=http;for=backend2:5555;host=somehost2")
-                .header("X-Forwarded-Proto", "https")
-                .header("X-Forwarded-For", "backend:4444")
-                .header("X-Forwarded-Server", "somehost")
+                .header("Forwarded", "proto=https;for=backend2:5555;host=somehost2")
+                .header("X-Forwarded-Proto", "http")
                 .get("/path")
                 .then()
                 .body(Matchers.equalTo("http|somehost2|backend2:5555|/path|http://somehost2/path"));
     }
+
 }