When calculating the client ip, allow the possibility of the address …

…to be null (#3389)
softwaremill · Dec 12, 2023 · 15fb9fd · 15fb9fd
1 parent 19d08b1
commit 15fb9fd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/main/scala/sttp/tapir/Tapir.scala b/core/src/main/scala/sttp/tapir/Tapir.scala
@@ -480,7 +480,13 @@ trait TapirComputedInputs { this: Tapir =>
         .flatMap(_.split(",").headOption)
         .orElse(request.header("Remote-Address"))
         .orElse(request.header("X-Real-Ip"))
-        .orElse(request.connectionInfo.remote.flatMap(a => Option(a.getAddress.getHostAddress)))
+        .orElse {
+          for {
+            r <- request.connectionInfo.remote
+            a <- Option(r.getAddress)
+            ha <- Option(a.getHostAddress)
+          } yield ha
+        }
     )
 
   def isWebSocket: EndpointInput[Boolean] =