[split] finagle-http dtab: don't emit (illegal) newlines in lengthy d…

…tab header values CSL-996 RB_ID=403381
zhijie435 · Jul 17, 2014 · 1edfba5 · 1edfba5
1 parent 9e7677e
commit 1edfba5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/finagle-http/src/main/scala/com/twitter/finagle/http/codec/HttpDtab.scala b/finagle-http/src/main/scala/com/twitter/finagle/http/codec/HttpDtab.scala
@@ -30,7 +30,8 @@ object HttpDtab {
 
   private def encodeValue(v: String): String = {
     val buf = ChannelBuffers.wrappedBuffer(v.getBytes(Utf8))
-    val buf64 = Base64.encode(buf)
+    val breakLines = false     // don't want newlines in http headers
+    val buf64 = Base64.encode(buf, breakLines)
     buf64.toString(Ascii)
   }
 

diff --git a/finagle-http/src/test/scala/com/twitter/finagle/http/codec/HttpDtabTest.scala b/finagle-http/src/test/scala/com/twitter/finagle/http/codec/HttpDtabTest.scala
@@ -30,6 +30,15 @@ class HttpDtabTest extends FunSuite {
       assert(Equiv[Dtab].equiv(dtab, dtab1))
     }
   }
+
+  // some base64 encoders insert newlines to enforce max line length.  ensure we aren't doing that
+  test("long dest round-trips") {
+    val expectedDtab = Dtab.read("/s/a => /s/abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz")
+    val m = newMsg()
+    HttpDtab.write(expectedDtab, m)
+    val observedDtab = HttpDtab.read(m)
+    assert(Equiv[Dtab].equiv(expectedDtab, observedDtab))
+  }
 
   test("Invalid: no shared prefix") {
     val m = newMsg()