libeufin

commit 7cca62d586fb3c4d0935869c5fb5bb7ade23061e
parent bc119db2bf75b9319dd01cdcb36a98d099a15ddc
Author: Antoine A <>
Date:   Thu,  9 Nov 2023 14:15:25 +0000

Fix request body lenght limit

Diffstat:
M
bank/src/main/kotlin/tech/libeufin/bank/Main.kt
 | 
30
++++++++++++++----------------

1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
@@ -73,29 +73,21 @@ private val MAX_BODY_LENGTH: Long = 4 * 1024 // 4kB
  * This plugin check for body lenght limit and inflates the requests that have "Content-Encoding: deflate"
  */
 val bodyPlugin = createApplicationPlugin("BodyLimitAndDecompression") {
-    onCall {
-        val contentLenght = it.request.contentLength() 
-            ?: throw badRequest("Missing Content-Length header", TalerErrorCode.GENERIC_HTTP_HEADERS_MALFORMED)
-    
-        if (contentLenght > MAX_BODY_LENGTH) {
-            throw badRequest("Body is suspiciously big")
-        }
-    }
     onCallReceive { call ->
         transformBody { data ->
+            val bytes = ByteArray(MAX_BODY_LENGTH.toInt())
+            var read = 0;
             if (call.request.headers[HttpHeaders.ContentEncoding] == "deflate") {
                 val inflater = Inflater()
-                val bytes = ByteArray(MAX_BODY_LENGTH.toInt())
-                var decoded = 0;
-
+                
                 while (!inflater.finished()) {
-                    if (decoded == bytes.size) {
+                    if (read == bytes.size) {
                         throw badRequest("Decompressed body is suspiciously big")
                     }
                     data.read {
                         inflater.setInput(it)
                         try {
-                            decoded += inflater.inflate(bytes, decoded, bytes.size - decoded)
+                            read += inflater.inflate(bytes, read, bytes.size - read)
                         } catch (e: DataFormatException) {
                             logger.error("Deflated request failed to inflate: ${e.message}")
                             throw badRequest(
@@ -105,9 +97,15 @@ val bodyPlugin = createApplicationPlugin("BodyLimitAndDecompression") {
                         }
                     }
                 }
-
-                ByteReadChannel(bytes.copyOf(decoded))
-            } else data
+            } else {
+                while (!data.isClosedForRead) {
+                    if (read == bytes.size) {
+                        throw badRequest("Body is suspiciously big")
+                    }
+                    read  += data.readAvailable(bytes, read, bytes.size - read)
+                }
+            }
+            ByteReadChannel(bytes.copyOf(read))
         }
     }
 }