add HeaderKey to make sure keys in Header are compared ignoring the case

dmaicher · dmaicher · commit fa563fc587a2 · 2015-06-07T18:20:54.000+02:00
diff --git a/src/main/scala/server/handler/FastCgi/FastCgiHandler.scala b/src/main/scala/server/handler/FastCgi/FastCgiHandler.scala
@@ -30,7 +30,7 @@ class FastCgiHandler(val documentRoot: String) extends Handler with LazyLogging
     //params.add("HTTP_CONNECTION", "keep-alive") //TODO
 
     for((k,v) <- request.headers) {
-      params.add("HTTP_"+k.replace("-", "_").toUpperCase, v)
+      params.add("HTTP_"+k.toString.replace("-", "_").toUpperCase, v)
       if(k == Headers.CONTENT_TYPE) {
         params.add("CONTENT_TYPE", v)
       }
diff --git a/src/main/scala/server/http/headers/HeaderParser.scala b/src/main/scala/server/http/headers/HeaderParser.scala
@@ -5,7 +5,7 @@ class HeaderParser {
     val headers = new Headers
     s.trim.split("\r\n(?!( |\t))").map(_.split(":", 2).map(_.trim)).foreach(h => {
       if(h.length == 2) {
-        headers += h(0) -> (headers.get(h(0)).map(_+",").getOrElse("")+h(1).replaceAll("\r\n[ \t]+", " "))
+        headers += new HeaderKey(h(0)) -> (headers.get(h(0)).map(_+",").getOrElse("")+h(1).replaceAll("\r\n[ \t]+", " "))
       }
     })
     headers
diff --git a/src/main/scala/server/http/headers/Headers.scala b/src/main/scala/server/http/headers/Headers.scala
@@ -2,22 +2,46 @@ package server.http.headers
 
 import scala.collection.mutable.HashMap
 
-//TODO: has to be case insensitive!
-class Headers extends HashMap[String, String]
-object Headers {
-  val CONTENT_LENGTH = "Content-Length"
-  val CONTENT_TYPE = "Content-Type"
-  val TRANSFER_ENCODING = "Transfer-Encoding"
-  val ACCEPT_ENCODING = "Accept-Encoding"
-  val CONNECTION = "Connection"
-}
+class HeaderKey(private val key: String) {
+  protected lazy val keyLower = if(key != null) key.toLowerCase else null
+
+  override def equals(other: scala.Any): Boolean = {
+    if(other == null || !other.isInstanceOf[HeaderKey]) {
+      return false
+    }
+
+    val otherKeyLower = other.asInstanceOf[HeaderKey].keyLower
 
-/*
-class HeaderName(name: String) {
-  override def hashCode(): Int = name.toLowerCase.hashCode
+    if(keyLower == null) {
+      return otherKeyLower == null
+    }
 
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case other: HeaderName
+    keyLower.equals(otherKeyLower)
   }
+
+  override def hashCode(): Int = {
+    if(keyLower != null) keyLower.hashCode() else 0
+  }
+
+  override def toString: String = key
 }
-*/
+
+class Headers extends HashMap[HeaderKey, String] {
+  def put(key: String, value: String): Option[String] = put(new HeaderKey(key), value)
+
+  def get(key: String): Option[String] = get(new HeaderKey(key))
+
+  def getOrElse[B1 >: String](key: String, default: => B1): B1 = getOrElse(new HeaderKey(key), default)
+
+  def contains(key: String): Boolean = contains(new HeaderKey(key))
+
+  def +=(kv: (String, String)): Headers = +=(new HeaderKey(kv._1) -> kv._2)
+}
+
+object Headers {
+  val CONTENT_LENGTH = new HeaderKey("Content-Length")
+  val CONTENT_TYPE = new HeaderKey("Content-Type")
+  val TRANSFER_ENCODING = new HeaderKey("Transfer-Encoding")
+  val ACCEPT_ENCODING = new HeaderKey("Accept-Encoding")
+  val CONNECTION = new HeaderKey("Connection")
+}
diff --git a/src/test/scala/server/http/headers/HeadersTestSpec.scala b/src/test/scala/server/http/headers/HeadersTestSpec.scala
@@ -0,0 +1,14 @@
+package server.http.headers
+
+import org.scalamock.scalatest._
+import org.scalatest._
+
+class HeadersTestSpec  extends FlatSpec with Matchers with MockFactory {
+  "Headers" should "should treat the keys case-insensitive" in {
+    val headers = new Headers
+
+    headers.put("Foo", "Bar")
+    headers.get("foo") should be(Some("Bar"))
+    headers.get("Foo") should be(Some("Bar"))
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class FastCgiHandler(val documentRoot: String) extends Handler with LazyLogging`
`30`	`30`	`//params.add("HTTP_CONNECTION", "keep-alive") //TODO`
`31`	`31`
`32`	`32`	`for((k,v) <- request.headers) {`
`33`		`- params.add("HTTP_"+k.replace("-", "_").toUpperCase, v)`
	`33`	`+ params.add("HTTP_"+k.toString.replace("-", "_").toUpperCase, v)`
`34`	`34`	`if(k == Headers.CONTENT_TYPE) {`
`35`	`35`	`params.add("CONTENT_TYPE", v)`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ class HeaderParser {`
`5`	`5`	`val headers = new Headers`
`6`	`6`	`s.trim.split("\r\n(?!( \|\t))").map(_.split(":", 2).map(_.trim)).foreach(h => {`
`7`	`7`	`if(h.length == 2) {`
`8`		`- headers += h(0) -> (headers.get(h(0)).map(_+",").getOrElse("")+h(1).replaceAll("\r\n[ \t]+", " "))`
	`8`	`+ headers += new HeaderKey(h(0)) -> (headers.get(h(0)).map(_+",").getOrElse("")+h(1).replaceAll("\r\n[ \t]+", " "))`
`9`	`9`	`}`
`10`	`10`	`})`
`11`	`11`	`headers`