Safety: Use copy(url) instead of withUrl() to avoid possible infinite…

… recursion.
playframework · Feb 8, 2019 · 4a42bf5 · 4a42bf5
1 parent c5326ae
commit 4a42bf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala
@@ -280,7 +280,10 @@ object StandaloneAhcWSClient {
     } yield key -> value
 
     req
-      .withUrl(urlNoQueryParams)
+      // Intentionally using copy(url) instead of withUrl(url) to avoid
+      // withUrl() -> normalize() -> withUrl() -> normalize()
+      // just in case we missed a case.
+      .copy(url = urlNoQueryParams)(req.materializer)
       .withQueryStringParameters(queryParams: _*)
   }
 }

diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala
@@ -42,7 +42,7 @@ case class StandaloneAhcWSRequest(
     proxyServer: Option[WSProxyServer] = None,
     disableUrlEncoding: Option[Boolean] = None,
     private val filters: Seq[WSRequestFilter] = Nil
-)(implicit materializer: Materializer) extends StandaloneWSRequest with AhcUtilities with WSCookieConverter {
+)(implicit private[ahc] val materializer: Materializer) extends StandaloneWSRequest with AhcUtilities with WSCookieConverter {
   override type Self = StandaloneWSRequest
   override type Response = StandaloneWSResponse