From 92e992e6fce10bfda0ec70ddc505318e4c08d4fd Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 20 Apr 2015 16:30:42 +0200 Subject: [PATCH] =htc #17227 always render `HttpChallenge` realm in double-quotes --- .../scala/akka/http/model/headers/HttpChallenge.scala | 2 +- .../scala/akka/http/model/parser/HttpHeaderSpec.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala b/akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala index 6d27935ad4..443997ec31 100644 --- a/akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala +++ b/akka-http-core/src/main/scala/akka/http/model/headers/HttpChallenge.scala @@ -14,7 +14,7 @@ final case class HttpChallenge(scheme: String, realm: String, params: Map[String, String] = Map.empty) extends japi.headers.HttpChallenge with ValueRenderable { def render[R <: Rendering](r: R): r.type = { - r ~~ scheme ~~ " realm=" ~~# realm + r ~~ scheme ~~ " realm=" ~~#! realm if (params.nonEmpty) params.foreach { case (k, v) ⇒ r ~~ ',' ~~ k ~~ '=' ~~# v } r } diff --git a/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala b/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala index c0e4eac08f..28b4655560 100644 --- a/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/model/parser/HttpHeaderSpec.scala @@ -337,7 +337,7 @@ class HttpHeaderSpec extends FreeSpec with Matchers { } "Proxy-Authenticate" in { - "Proxy-Authenticate: Basic realm=WallyWorld,attr=\"val>ue\", Fancy realm=yeah" =!= + "Proxy-Authenticate: Basic realm=\"WallyWorld\",attr=\"val>ue\", Fancy realm=\"yeah\"" =!= `Proxy-Authenticate`(HttpChallenge("Basic", "WallyWorld", Map("attr" -> "val>ue")), HttpChallenge("Fancy", "yeah")) } @@ -453,10 +453,10 @@ class HttpHeaderSpec extends FreeSpec with Matchers { } "WWW-Authenticate" in { - "WWW-Authenticate: Basic realm=WallyWorld" =!= + "WWW-Authenticate: Basic realm=\"WallyWorld\"" =!= `WWW-Authenticate`(HttpChallenge("Basic", "WallyWorld")) "WWW-Authenticate: BaSiC rEaLm=WallyWorld" =!= - `WWW-Authenticate`(HttpChallenge("BaSiC", "WallyWorld")).renderedTo("BaSiC realm=WallyWorld") + `WWW-Authenticate`(HttpChallenge("BaSiC", "WallyWorld")).renderedTo("BaSiC realm=\"WallyWorld\"") "WWW-Authenticate: Basic realm=\"foo "auth,auth-int", "nonce" -> "dcd98b7102dd2f0e8b11d0f600bfb0c093", "opaque" -> "5ccc069c403ebaf9f0171e9517f40e41"))).renderedTo( "Digest realm=\"testrealm@host.com\",qop=\"auth,auth-int\",nonce=dcd98b7102dd2f0e8b11d0f600bfb0c093,opaque=5ccc069c403ebaf9f0171e9517f40e41") - "WWW-Authenticate: Basic realm=WallyWorld,attr=\"val>ue\", Fancy realm=yeah" =!= + "WWW-Authenticate: Basic realm=\"WallyWorld\",attr=\"val>ue\", Fancy realm=\"yeah\"" =!= `WWW-Authenticate`(HttpChallenge("Basic", "WallyWorld", Map("attr" -> "val>ue")), HttpChallenge("Fancy", "yeah")) """WWW-Authenticate: Fancy realm="Secure Area",nonce=42""" =!= `WWW-Authenticate`(HttpChallenge("Fancy", "Secure Area", Map("nonce" -> "42")))