Forwarded fixes & tests

Author: adamw

core/src/main/scala/sttp/model/headers/Forwarded.scala

@@ -12,10 +12,11 @@ case class Forwarded(by: Option[String], `for`: Option[String], host: Option[Str
     */
   override def toString: String = {
     val sb = new java.lang.StringBuilder()
-    by.foreach(v => sb.append("by=").append(v).append(";"))
-    `for`.foreach(v => sb.append("for=").append(v).append(";"))
-    host.foreach(v => sb.append("host=").append(v).append(";"))
-    proto.foreach(v => sb.append("proto=").append(v).append(";"))
+    var separator = ""
+    by.foreach { v => sb.append("by=").append(v); separator = ";" }
+    `for`.foreach { v => sb.append(separator).append("for=").append(v); separator = ";" }
+    host.foreach { v => sb.append(separator).append("host=").append(v); separator = ";" }
+    proto.foreach { v => sb.append(separator).append("proto=").append(v) }
     sb.toString
   }
 }
@@ -33,7 +34,7 @@ object Forwarded {
       val parts = headerValue.split(";").map(_.trim).toList
       val kvPairs = parts.map { part =>
         part.split("=").map(_.trim).toList match {
-          case key :: value :: Nil => Right(key -> value)
+          case key :: value :: Nil => Right(key.toLowerCase -> value)
           case _                   => Left(s"Invalid part: $part")
         }
       }
@@ -53,5 +54,5 @@ object Forwarded {
   }
 
   /** Serialize a list of [[Forwarded]] headers to a single string. Each header will be separated by a comma. */
-  def toString(headers: List[Forwarded]): String = headers.map(_.toString).mkString(", ")
+  def toString(headers: List[Forwarded]): String = headers.map(_.toString).mkString(",")
 }

core/src/test/scala/sttp/model/headers/ForwardedTest.scala

@@ -10,6 +10,11 @@ class ForwardedTest extends AnyFlatSpec with Matchers {
     actual shouldBe Right(List(Forwarded(Some("1.2.3.4"), Some("4.3.2.1"), Some("example.com"), Some("http"))))
   }
 
+  it should "parse a single header correctly, regardless of case of the directives" in {
+    val actual = Forwarded.parse("By=1.2.3.4;For=4.3.2.1;Host=example.com;Proto=http")
+    actual shouldBe Right(List(Forwarded(Some("1.2.3.4"), Some("4.3.2.1"), Some("example.com"), Some("http"))))
+  }
+
   it should "parse multiple headers correctly, when given as separate headers" in {
     val actual = Forwarded.parse(List("by=1.2.3.4;for=4.3.2.1", "host=example.com;proto=https"))
     actual shouldBe Right(
@@ -44,4 +49,33 @@ class ForwardedTest extends AnyFlatSpec with Matchers {
     val actual = Forwarded.parse("by=1.2.3.4;for")
     actual shouldBe Left("Invalid part: for")
   }
+
+  it should "serialize the header to a string" in {
+    val actual =
+      Forwarded.toString(List(Forwarded(Some("1.2.3.4"), Some("4.3.2.1"), Some("example.com"), Some("http"))))
+    actual shouldBe "by=1.2.3.4;for=4.3.2.1;host=example.com;proto=http"
+  }
+
+  it should "serialize multiple headers to a string" in {
+    val actual =
+      Forwarded.toString(
+        List(Forwarded(Some("1.2.3.4"), None, None, None), Forwarded(Some("4.3.2.1"), None, None, None))
+      )
+    actual shouldBe "by=1.2.3.4,by=4.3.2.1"
+  }
+
+  it should "parse ipv6 addresses in For" in {
+    val actual = Forwarded.parse("""For="[2001:db8:cafe::17]:4711"""")
+    actual shouldBe Right(List(Forwarded(None, Some("\"[2001:db8:cafe::17]:4711\""), None, None)))
+  }
+
+  it should "parse multiple ipv4 addresses" in {
+    val actual = Forwarded.parse("for=192.0.2.43, for=198.51.100.17")
+    actual shouldBe Right(
+      List(
+        Forwarded(None, Some("192.0.2.43"), None, None),
+        Forwarded(None, Some("198.51.100.17"), None, None)
+      )
+    )
+  }
 }