Merge branch 'master' into dependabot/gradle/junitJupiterVersion-5.10.1

navikt · Nov 6, 2023 · 7f8d247 · 7f8d247
2 parents da63e30 + f90b563
commit 7f8d247
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpServer.kt b/src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpServer.kt
@@ -78,6 +78,7 @@ MockWebServerWrapper
         val ssl: Ssl? = null,
     ) : OAuth2HttpServer {
         val mockWebServer: MockWebServer = MockWebServer()
+        private var address: InetAddress? = null
 
         override fun start(
             inetAddress: InetAddress,
@@ -90,6 +91,7 @@ MockWebServerWrapper
                 if (ssl != null) {
                     mockWebServer.useHttps(ssl.sslContext().socketFactory, false)
                 }
+                this.address = inetAddress
                 log.debug("started server on address=$inetAddress and port=${mockWebServer.port}, httpsEnabled=${ssl != null}")
             }
 
@@ -100,7 +102,11 @@ MockWebServerWrapper
 
         override fun port(): Int = mockWebServer.port
 
-        override fun url(path: String): HttpUrl = mockWebServer.url(path)
+        override fun url(path: String): HttpUrl = mockWebServer
+            .url(path)
+            .newBuilder()
+            .host(address?.hostName ?: mockWebServer.hostName)
+            .build()
 
         override fun sslConfig(): Ssl? = ssl
 
@@ -189,7 +195,7 @@ class NettyWrapper
                 }
             return HttpUrl.Builder()
                 .scheme(scheme)
-                .host(address.address.canonicalHostName)
+                .host(address.address.hostName)
                 .port(port())
                 .build()
                 .resolve(path)!!