implement binary parsing

Author: angryziber

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 * jdbc: PooledDataSource.queryTimeout can be configured separately from pool connection timeout
+* server: FormDataParser now is able to parse binary files
 
 # 1.7.0
 * core: TSIDGenerator can now be used with custom classes outside TSID companion

server/src/klite/FormDataParser.kt

@@ -1,8 +1,9 @@
 package klite
 
+import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import java.util.*
 import kotlin.reflect.KType
-import kotlin.text.Charsets.ISO_8859_1
 
 @Deprecated("Use FormDataParser")
 typealias MultipartFormDataParser = FormDataParser
@@ -12,29 +13,30 @@ class FormDataParser: BodyParser {
 
   @Suppress("UNCHECKED_CAST")
   override fun <T: Any> parse(input: InputStream, type: KType): T {
-    val reader = input.bufferedReader(ISO_8859_1)
-    val boundary = reader.readLine()
+    val boundary = input.readLine()!!.trimEnd()
     val result = mutableMapOf<String, Any?>()
     var state = State()
     while (true) {
-      val line = reader.readLine() ?: break
+      val line = input.readLine() ?: break
       if (state.readingHeaders) {
-        val lowerLine = line.lowercase()
+        val lineStr = line.toString(MimeTypes.textCharset).trimEnd()
+        val lowerLine = lineStr.lowercase()
         if (lowerLine.isEmpty()) state.readingHeaders = false
         else if (lowerLine.startsWith("content-disposition:")) {
-          val disposition = line.substring("content-disposition:".length).trim()
+          val disposition = lineStr.substring("content-disposition:".length).trim()
           val params = disposition.split(';').associate(::keyValue)
           state.name = params["name"]
           state.fileName = params["filename"]
         }
         else if (lowerLine.startsWith("content-type:")) {
-          state.contentType = line.substring("content-type:".length).trim()
+          state.contentType = lineStr.substring("content-type:".length).trim()
         }
       } else {
         if (line.startsWith(boundary)) {
           if (state.name != null) result[state.name!!] = state.fileName?.let {
-            FileUpload(it, state.contentType, state.content.removeSuffix("\n").toString().byteInputStream(ISO_8859_1))
-          } ?: state.content.toString().trim()
+            // TODO: remove last newline from content
+            FileUpload(it, state.contentType, state.content.toByteArray().trimEnd().inputStream())
+          } ?: state.content.toString(MimeTypes.textCharset).trim()
           state = State()
         }
         else state.append(line)
@@ -43,11 +45,34 @@ class FormDataParser: BodyParser {
     return result as T
   }
 
+  private fun InputStream.readLine(): ByteArray? {
+    val buf = ByteArrayOutputStream(128)
+    var b = read()
+    while (b >= 0) {
+      buf.write(b)
+      if (b == '\n'.code) break
+      b = read()
+    }
+    if (b == -1 && buf.size() == 0) return null
+    return buf.toByteArray()
+  }
+
+  private fun ByteArray.trimEnd(): ByteArray {
+    var newLen = size
+    if (this[newLen - 1] == 10.toByte()) newLen--
+    if (this[newLen - 1] == 13.toByte()) newLen--
+    return copyOf(newLen)
+  }
+
+  private fun ByteArray.startsWith(prefix: ByteArray): Boolean {
+    return prefix.size <= size && Arrays.equals(this, 0, prefix.size, prefix, 0, prefix.size)
+  }
+
   private fun keyValue(s: String) = s.split('=', limit = 2).let { it[0].trim() to it.getOrNull(1)?.trim('"') }
 
   private class State(var readingHeaders: Boolean = true, var name: String? = null, var fileName: String? = null, var contentType: String? = null) {
-    val content = StringBuilder()
-    fun append(line: String) = content.append(line).append('\n')
+    val content = ByteArrayOutputStream(4096)
+    fun append(line: ByteArray) = content.write(line)
   }
 }
 

server/test/klite/FormDataParserTest.kt

@@ -45,7 +45,7 @@ class FormDataParserTest {
   }
 
   @Test fun `parse binary`() {
-    val boundary = "---------------------------9051914041544843365972754266"
+    val boundary = "---XXX"
     val data = (-128..127).map { it.toByte() }.toByteArray()
     val body = (
       "$boundary\r\n"