Glemte muligheten for komprimerte filer

navikt · Nov 27, 2024 · 51d8f47 · 51d8f47
1 parent 1bb897b
commit 51d8f47
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/ebms-payload/src/main/kotlin/no/nav/emottak/payload/Processor.kt b/ebms-payload/src/main/kotlin/no/nav/emottak/payload/Processor.kt
@@ -41,7 +41,21 @@ class Processor(
         )
     }
 
-    fun decrypt(bytes: ByteArray) = dekryptering.dekrypter(bytes, isBase64 = false)
+    fun getDecryptedAndDecompressedBytes(bytes: ByteArray, encrypted: Boolean, compressed: Boolean): ByteArray {
+        return bytes.let {
+            if (encrypted) {
+                dekryptering.dekrypter(bytes, isBase64 = false)
+            } else {
+                it
+            }
+        }.let {
+            if (compressed) {
+                gZipUtil.uncompress(bytes)
+            } else {
+                it
+            }
+        }
+    }
 
     private suspend fun processIncoming(payloadRequest: PayloadRequest): Payload {
         val processConfig = payloadRequest.processing.processConfig

diff --git a/ebms-payload/src/main/kotlin/no/nav/emottak/payload/Routes.kt b/ebms-payload/src/main/kotlin/no/nav/emottak/payload/Routes.kt
@@ -45,11 +45,11 @@ fun Route.postPayload() = post("/payload") {
                 true -> {
                     log.info(request.marker(), "Oppretter negativ AppRec for payload <${request.payload.contentId}>")
                     val msgHead = unmarshal(
-                        if (request.processing.processConfig.kryptering) {
-                            processor.decrypt(request.payload.bytes)
-                        } else {
-                            request.payload.bytes
-                        },
+                        processor.getDecryptedAndDecompressedBytes(
+                            request.payload.bytes,
+                            request.processing.processConfig.kryptering,
+                            request.processing.processConfig.komprimering
+                        ),
                         MsgHead::class.java
                     )
                     val apprec = createNegativeApprec(msgHead, originalError as Exception)