Merge pull request #187 from fgstewart/proxy-header-fix

Parse host:port in host header for proxied connections

Author: jksolbakken

src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpRequest.kt

@@ -33,6 +33,7 @@ import no.nav.security.mock.oauth2.http.RequestType.WELL_KNOWN
 import no.nav.security.mock.oauth2.missingParameter
 import okhttp3.Headers
 import okhttp3.HttpUrl
+import java.net.URI
 
 data class OAuth2HttpRequest(
     val headers: Headers,
@@ -109,11 +110,15 @@ data class OAuth2HttpRequest(
         val proto = this.headers["x-forwarded-proto"]
         val port = this.headers["x-forwarded-port"]
         return if (hostheader != null && proto != null) {
+            val hostUri = URI(null, hostheader, null, null, null).parseServerAuthority()
+            val hostFromHostHeader = hostUri.host
+            val portFromHostHeader = hostUri.port
+
             HttpUrl.Builder()
                 .scheme(proto)
-                .host(hostheader)
+                .host(hostFromHostHeader)
                 .apply {
-                    port?.toInt()?.let { port(it) }
+                    port?.toInt()?.let { port(it) } ?: port(portFromHostHeader)
                 }
                 .encodedPath(originalUrl.encodedPath)
                 .query(originalUrl.query).build()

src/test/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpRequestTest.kt

@@ -28,6 +28,34 @@ internal class OAuth2HttpRequestTest {
             originalUrl = "http://localhost:8080/mypath?query=1".toHttpUrl()
         )
         req2.proxyAwareUrl().toString() shouldBe "https://fakedings.nais.io:444/mypath?query=1"
+
+        // host header has host:port and x-forwarded-port is set
+        val req3 = OAuth2HttpRequest(
+            headers = Headers.headersOf(
+                "host",
+                "fakedings.nais.io:666",
+                "x-forwarded-proto",
+                "https",
+                "x-forwarded-port",
+                "444"
+            ),
+            method = "GET",
+            originalUrl = "http://localhost:8080/mypath?query=1".toHttpUrl()
+        )
+        req3.proxyAwareUrl().toString() shouldBe "https://fakedings.nais.io:444/mypath?query=1"
+
+        // host header has host:port and no x-forwarded-port
+        val req4 = OAuth2HttpRequest(
+            headers = Headers.headersOf(
+                "host",
+                "fakedings.nais.io:666",
+                "x-forwarded-proto",
+                "https"
+            ),
+            method = "GET",
+            originalUrl = "http://localhost:8080/mypath?query=1".toHttpUrl()
+        )
+        req4.proxyAwareUrl().toString() shouldBe "https://fakedings.nais.io:666/mypath?query=1"
     }
 
     @Test