From f89767ffe16e5a91f570e66b3d82df6907776202 Mon Sep 17 00:00:00 2001
From: Thomas Burnett <thburnett@users.noreply.github.com>
Date: Tue, 26 Sep 2023 14:45:14 +0200
Subject: [PATCH] Flytter kode for prosesseringssteg til fellesmodul

---
 .../ebms/processing/PayloadProcessor.kt       | 13 ++--
 .../no/nav/emottak/util/SertifikatUtil.kt     |  7 +-
 .../kotlin/no/nav/emottak/util/XMLUtil.kt     |  8 +--
 .../util/crypto/EncryptionException.kt        |  4 ++
 .../no/nav/emottak/util/crypto}/Kryptering.kt | 30 ++------
 .../util/signatur}/SignaturVerifisering.kt    | 29 ++------
 .../util/signatur/SignatureException.kt       |  4 ++
 .../nav/emottak/util/signatur}/Signering.kt   | 45 ++++--------
 .../no/nav/emottak/melding/Processor.kt       | 71 +++++++++++++++++--
 .../no/nav/emottak/melding/model/Melding.kt   | 13 ----
 .../{melding/process => util}/GZipUtil.kt     | 24 +------
 .../melding/process/DekrypteringTest.kt       |  7 +-
 .../emottak/melding/process/GZipUtilTest.kt   |  8 ++-
 .../emottak/melding/process/KrypteringTest.kt |  6 +-
 .../emottak/melding/process/SigneringTest.kt  |  4 +-
 15 files changed, 124 insertions(+), 149 deletions(-)
 rename {payload-processor => felles}/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt (68%)
 rename {payload-processor => felles}/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt (89%)
 create mode 100644 felles/src/main/kotlin/no/nav/emottak/util/crypto/EncryptionException.kt
 rename {payload-processor/src/main/kotlin/no/nav/emottak/melding/process => felles/src/main/kotlin/no/nav/emottak/util/crypto}/Kryptering.kt (70%)
 rename {payload-processor/src/main/kotlin/no/nav/emottak/melding/process => felles/src/main/kotlin/no/nav/emottak/util/signatur}/SignaturVerifisering.kt (50%)
 create mode 100644 felles/src/main/kotlin/no/nav/emottak/util/signatur/SignatureException.kt
 rename {payload-processor/src/main/kotlin/no/nav/emottak/melding/process => felles/src/main/kotlin/no/nav/emottak/util/signatur}/Signering.kt (72%)
 rename payload-processor/src/main/kotlin/no/nav/emottak/{melding/process => util}/GZipUtil.kt (75%)

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/PayloadProcessor.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/PayloadProcessor.kt
index 6a1fb305..54c08a0a 100644
--- a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/PayloadProcessor.kt
+++ b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/PayloadProcessor.kt
@@ -1,5 +1,6 @@
 package no.nav.emottak.ebms.processing
 
+import io.ktor.server.plugins.BadRequestException
 import no.nav.emottak.ebms.model.EbMSMessage
 import no.nav.emottak.ebms.postPayloadRequest
 import no.nav.emottak.melding.model.Header
@@ -26,22 +27,22 @@ class PayloadProcessor: Processor {
 
 fun MessageHeader.payloadRequestHeader(): Header {
     return Header(
-        messageId = this.id ?: throw RuntimeException("MessageID mangler fra header"),
-        cpaId = this.cpaId ?: throw RuntimeException("CPAID mangler fra header"),
+        messageId = this.id ?: throw BadRequestException("MessageID mangler fra header"),
+        cpaId = this.cpaId ?: throw BadRequestException("CPAID mangler fra header"),
         conversationId = this.conversationId,
         to = Party(
             herID = this.to.partyId.herID(),
-            role = this.to.role ?: throw RuntimeException("Melding mangler role for en eller flere parter")
+            role = this.to.role ?: throw BadRequestException("Melding mangler role for en eller flere parter")
         ),
         from = Party(
             herID = this.from.partyId.herID(),
-            role = this.from.role ?: throw RuntimeException("Melding mangler role for en eller flere parter")
+            role = this.from.role ?: throw BadRequestException("Melding mangler role for en eller flere parter")
         ),
-        service = this.service.value ?: throw RuntimeException("Service mangler fra header"),
+        service = this.service.value ?: throw BadRequestException("Service mangler fra header"),
         action = this.action
     )
 }
 
 fun List<PartyId>.herID(): String {
-    return this.firstOrNull() { partyId -> partyId.type == "HER" }?.value ?: throw RuntimeException("Melding mangler HER-ID for en eller flere parter")
+    return this.firstOrNull() { partyId -> partyId.type == "HER" }?.value ?: throw BadRequestException("Melding mangler HER-ID for en eller flere parter")
 }
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt b/felles/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt
similarity index 68%
rename from payload-processor/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt
rename to felles/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt
index 955b927e..9a80e0ad 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt
+++ b/felles/src/main/kotlin/no/nav/emottak/util/SertifikatUtil.kt
@@ -1,20 +1,19 @@
 package no.nav.emottak.util
 
-import io.ktor.server.plugins.BadRequestException
 import java.io.ByteArrayInputStream
 import java.security.cert.CertificateException
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 
-internal fun isSelfSigned(certificate: X509Certificate) =
+fun isSelfSigned(certificate: X509Certificate) =
     certificate.subjectX500Principal == certificate.issuerX500Principal
 
-internal fun createX509Certificate(byteArray: ByteArray): X509Certificate {
+fun createX509Certificate(byteArray: ByteArray): X509Certificate {
     val cf = CertificateFactory.getInstance("X.509")
     return try {
         cf.generateCertificate(ByteArrayInputStream(byteArray)) as X509Certificate
     }
     catch (e: CertificateException) {
-        throw BadRequestException("")
+        throw RuntimeException("Kunne ikke opprette X509Certificate fra ByteArray", e)
     }
 }
\ No newline at end of file
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt b/felles/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt
similarity index 89%
rename from payload-processor/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt
rename to felles/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt
index 4e4f9f42..043c9d28 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt
+++ b/felles/src/main/kotlin/no/nav/emottak/util/XMLUtil.kt
@@ -1,7 +1,7 @@
 package no.nav.emottak.util
 
-import io.ktor.server.plugins.BadRequestException
 import no.nav.emottak.util.signatur.KeyValueKeySelector
+import no.nav.emottak.util.signatur.SignatureException
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
@@ -31,7 +31,7 @@ internal fun retrieveXMLSignature(validateContext: DOMValidateContext): XMLSigna
 
 private fun retrieveSignatureElement(document: Document): Node {
     val nodeList: NodeList = document.getElementsByTagNameNS(XMLSignature.XMLNS, "Signature")
-    return nodeList.item(0) ?: throw BadRequestException("MANGLER_XML_SIGNATUR")
+    return nodeList.item(0) ?: throw SignatureException("Mangler xmldsig")
 }
 
 internal fun retrievePublicCertificateFromSignature(document: Document): X509Certificate {
@@ -46,13 +46,13 @@ private fun retrievePublicCertificateFromSignature(signature: XMLSignature): X50
 }
 
 
-internal fun createDocument(inputstream: InputStream): Document {
+fun createDocument(inputstream: InputStream): Document {
     val dbf = DocumentBuilderFactory.newInstance()
     dbf.isNamespaceAware = true
     return dbf.newDocumentBuilder().parse(inputstream)
 }
 
-internal fun getByteArrayFromDocument(doc: Document): ByteArray {
+fun getByteArrayFromDocument(doc: Document): ByteArray {
     val outputStream = ByteArrayOutputStream()
     val xmlSource = DOMSource(doc)
     val result = StreamResult(outputStream)
diff --git a/felles/src/main/kotlin/no/nav/emottak/util/crypto/EncryptionException.kt b/felles/src/main/kotlin/no/nav/emottak/util/crypto/EncryptionException.kt
new file mode 100644
index 00000000..c128b03a
--- /dev/null
+++ b/felles/src/main/kotlin/no/nav/emottak/util/crypto/EncryptionException.kt
@@ -0,0 +1,4 @@
+package no.nav.emottak.util.crypto
+
+class EncryptionException(override val message: String, e: Exception? = null) : Exception(message, e) {
+}
\ No newline at end of file
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Kryptering.kt b/felles/src/main/kotlin/no/nav/emottak/util/crypto/Kryptering.kt
similarity index 70%
rename from payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Kryptering.kt
rename to felles/src/main/kotlin/no/nav/emottak/util/crypto/Kryptering.kt
index 7b87ff20..93c49fdf 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Kryptering.kt
+++ b/felles/src/main/kotlin/no/nav/emottak/util/crypto/Kryptering.kt
@@ -1,10 +1,6 @@
-package no.nav.emottak.melding.process
+package no.nav.emottak.util.crypto
 
-import io.ktor.server.plugins.BadRequestException
-import no.nav.emottak.melding.model.Header
-import no.nav.emottak.melding.model.Melding
 import no.nav.emottak.util.createX509Certificate
-import no.nav.emottak.util.hentKrypteringssertifikat
 import org.bouncycastle.asn1.ASN1ObjectIdentifier
 import org.bouncycastle.cms.CMSAlgorithm
 import org.bouncycastle.cms.CMSEnvelopedDataGenerator
@@ -17,30 +13,14 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider
 import java.security.cert.CertificateEncodingException
 import java.security.cert.X509Certificate
 
-private val kryptering = Kryptering()
-
-fun krypter(byteArray: ByteArray, sertifikat: ByteArray) = kryptering.krypter(byteArray, sertifikat)
-
-fun Melding.krypter(): Melding {
-    return this.copy(
-        processedPayload = kryptering.krypter(this.processedPayload, this.header),
-        kryptert = true
-    )
-}
-
 class Kryptering {
 
-    fun krypter(byteArray: ByteArray, header: Header): ByteArray {
-        val krypteringSertifikat = hentKrypteringssertifikat(header.cpaId, header.to.herID)
-        return krypter(byteArray, krypteringSertifikat)
-    }
     fun krypter(byteArray: ByteArray, krypteringSertifikat: ByteArray): ByteArray {
         if (byteArray.isEmpty()) {
-            throw BadRequestException("Meldingen er tom.")
+            throw EncryptionException("Meldingen er tom.")
         }
         val sertifikat = createX509Certificate(krypteringSertifikat)
         return krypterDokument(byteArray, sertifikat)
-
     }
 
 }
@@ -55,7 +35,7 @@ private fun krypterDokument(doc: ByteArray, certificate: X509Certificate): ByteA
     return try {
         krypterDokument(doc, listOf(certificate))
     } catch (e: Exception) {
-        throw e
+        throw EncryptionException("Feil ved kryptering av dokument", e)
     }
 }
 
@@ -75,8 +55,8 @@ private fun krypterDokument(input: ByteArray, certificates: List<X509Certificate
         )
         envelopedData.encoded
     } catch (e: CertificateEncodingException) {
-        throw e
+        throw EncryptionException("Feil ved kryptering av dokument", e)
     } catch (e: CMSException) {
-        throw e
+        throw EncryptionException("Feil ved kryptering av dokument", e)
     }
 }
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/SignaturVerifisering.kt b/felles/src/main/kotlin/no/nav/emottak/util/signatur/SignaturVerifisering.kt
similarity index 50%
rename from payload-processor/src/main/kotlin/no/nav/emottak/melding/process/SignaturVerifisering.kt
rename to felles/src/main/kotlin/no/nav/emottak/util/signatur/SignaturVerifisering.kt
index dadb750a..32aa43bd 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/SignaturVerifisering.kt
+++ b/felles/src/main/kotlin/no/nav/emottak/util/signatur/SignaturVerifisering.kt
@@ -1,27 +1,10 @@
-package no.nav.emottak.melding.process
+package no.nav.emottak.util.signatur
 
-import io.ktor.server.plugins.BadRequestException
-import no.nav.emottak.melding.model.Melding
 import no.nav.emottak.util.createValidateContext
 import no.nav.emottak.util.retrieveXMLSignature
-import no.nav.emottak.util.signatur.validateAlgorithms
-import no.nav.emottak.util.createDocument
-import no.nav.emottak.util.getByteArrayFromDocument
-import no.nav.emottak.util.signatur.AlgorithmNotSupportedException
 import org.w3c.dom.Document
-import java.io.ByteArrayInputStream
 import javax.xml.crypto.dsig.XMLSignatureException
 
-private val signatureVerifisering = SignaturVerifisering()
-
-internal fun Melding.verifiserSignatur(): Melding {
-    return this.copy(
-        processedPayload = getByteArrayFromDocument(
-            signatureVerifisering.validerSignatur(createDocument( ByteArrayInputStream(this.processedPayload)))
-        ),
-        signaturVerifisert = true
-    )
-}
 
 class SignaturVerifisering {
 
@@ -31,8 +14,6 @@ class SignaturVerifisering {
         val signature = retrieveXMLSignature(validateContext)
 
         try {
-            //TODO https://bugs.openjdk.java.net/browse/JDK-8259801
-            //Må vurderes opp mot java 17 for sha1
             return if (signature.validate(validateContext)) {
                 validateAlgorithms(signature.signedInfo)
                 document
@@ -42,15 +23,13 @@ class SignaturVerifisering {
                 signature.signedInfo.references.forEach {
                     status += ", ${it.digestMethod.algorithm} validation status: ${it.validate(validateContext)}"
                 }
-                throw BadRequestException("Sertifikat er ugyldig: $status")
+                throw SignatureException("Sertifikat er ugyldig: $status")
             }
         } catch (signatureException: XMLSignatureException) {
-            throw signatureException
+            throw SignatureException("Feil ved validering av signatur", signatureException)
         } catch (algorithmNotSupported: AlgorithmNotSupportedException) {
-            throw BadRequestException(algorithmNotSupported.message,algorithmNotSupported)
+            throw SignatureException("Feil ved validering av signatur", algorithmNotSupported)
         }
     }
 
-
-
 }
\ No newline at end of file
diff --git a/felles/src/main/kotlin/no/nav/emottak/util/signatur/SignatureException.kt b/felles/src/main/kotlin/no/nav/emottak/util/signatur/SignatureException.kt
new file mode 100644
index 00000000..03061b5d
--- /dev/null
+++ b/felles/src/main/kotlin/no/nav/emottak/util/signatur/SignatureException.kt
@@ -0,0 +1,4 @@
+package no.nav.emottak.util.signatur
+
+class SignatureException(override val message: String, e: Exception? = null) : Exception(message, e) {
+}
\ No newline at end of file
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Signering.kt b/felles/src/main/kotlin/no/nav/emottak/util/signatur/Signering.kt
similarity index 72%
rename from payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Signering.kt
rename to felles/src/main/kotlin/no/nav/emottak/util/signatur/Signering.kt
index a1bc320d..c82cbd88 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Signering.kt
+++ b/felles/src/main/kotlin/no/nav/emottak/util/signatur/Signering.kt
@@ -1,12 +1,8 @@
-package no.nav.emottak.melding.process
+package no.nav.emottak.util.signatur
 
-import no.nav.emottak.melding.model.Melding
 import no.nav.emottak.util.crypto.getSignerCertificate
 import no.nav.emottak.util.crypto.getSignerKey
-import no.nav.emottak.util.createDocument
-import no.nav.emottak.util.getByteArrayFromDocument
 import org.w3c.dom.Document
-import java.io.ByteArrayInputStream
 import java.security.Key
 import java.security.cert.X509Certificate
 import javax.xml.crypto.dsig.Reference
@@ -17,19 +13,6 @@ import javax.xml.crypto.dsig.dom.DOMSignContext
 import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec
 import javax.xml.crypto.dsig.spec.TransformParameterSpec
 
-private val signering = Signering()
-fun signer(document: Document) = signering.signerXML(document)
-fun signer(document: Document, alias: String) = signering.signerXML(document, alias)
-
-fun Melding.signer(): Melding {
-    return this.copy(
-        processedPayload = getByteArrayFromDocument(
-            signering.signerXML(createDocument( ByteArrayInputStream(this.processedPayload)))
-        ),
-        signert = true
-    )
-}
-
 
 class Signering {
 
@@ -40,7 +23,7 @@ class Signering {
 
     private val factory = XMLSignatureFactory.getInstance("DOM")
 
-    fun signerXML(doc: Document, alias: String = defaultAlias): Document {
+    fun signerXML(document: Document, alias: String = defaultAlias): Document {
         val signerCertificate: X509Certificate = getSignerCertificate(alias)
         val signerKey: Key = getSignerKey(alias)
         val keyInfoFactory = factory.keyInfoFactory
@@ -49,21 +32,11 @@ class Signering {
         val x509data = keyInfoFactory.newX509Data(x509Content)
         val keyInfo = keyInfoFactory.newKeyInfo(listOf(x509data))
 
-        val dsc = DOMSignContext(signerKey, doc.documentElement)
+        val dsc = DOMSignContext(signerKey, document.documentElement)
 
         val signature = factory.newXMLSignature(createSignedInfo(), keyInfo)
         signature.sign(dsc)
-        return doc
-    }
-
-    private fun createReference(): Reference {
-        return factory.newReference(
-            "",
-            factory.newDigestMethod(digestAlgorithm, null),
-            listOf(factory.newTransform(Transform.ENVELOPED, null as TransformParameterSpec?)),
-            null,
-            null
-        )
+        return document
     }
 
     private fun createSignedInfo(): SignedInfo {
@@ -75,5 +48,15 @@ class Signering {
             factory.newSignatureMethod(signatureAlgorithm, null), listOf(createReference())
         )
     }
+
+    private fun createReference(): Reference {
+        return factory.newReference(
+            "",
+            factory.newDigestMethod(digestAlgorithm, null),
+            listOf(factory.newTransform(Transform.ENVELOPED, null as TransformParameterSpec?)),
+            null,
+            null
+        )
+    }
 }
 
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/Processor.kt b/payload-processor/src/main/kotlin/no/nav/emottak/melding/Processor.kt
index ea981c1c..5a1b5594 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/melding/Processor.kt
+++ b/payload-processor/src/main/kotlin/no/nav/emottak/melding/Processor.kt
@@ -3,12 +3,15 @@ package no.nav.emottak.melding
 import no.nav.emottak.melding.model.Melding
 import no.nav.emottak.melding.model.PayloadRequest
 import no.nav.emottak.melding.model.PayloadResponse
-import no.nav.emottak.melding.model.dekrypter
-import no.nav.emottak.melding.process.dekomprimer
-import no.nav.emottak.melding.process.komprimer
-import no.nav.emottak.melding.process.krypter
-import no.nav.emottak.melding.process.signer
-import no.nav.emottak.melding.process.verifiserSignatur
+import no.nav.emottak.util.GZipUtil
+import no.nav.emottak.util.signatur.SignaturVerifisering
+import no.nav.emottak.util.createDocument
+import no.nav.emottak.util.crypto.Dekryptering
+import no.nav.emottak.util.crypto.Kryptering
+import no.nav.emottak.util.getByteArrayFromDocument
+import no.nav.emottak.util.hentKrypteringssertifikat
+import no.nav.emottak.util.signatur.Signering
+import java.io.ByteArrayInputStream
 
 class Processor {
 
@@ -46,4 +49,58 @@ class Processor {
 fun PayloadRequest.isIncomingMessage(): Boolean {
     //TODO
     return true
-}
\ No newline at end of file
+}
+
+private val kryptering = Kryptering()
+private val dekryptering = Dekryptering()
+private val signering = Signering()
+private val gZipUtil = GZipUtil()
+private val signatureVerifisering = SignaturVerifisering()
+
+fun Melding.dekrypter(isBase64: Boolean = false): Melding {
+    return this.copy(
+        processedPayload = dekryptering.dekrypter(this.processedPayload, isBase64),
+        dekryptert = true
+    )
+}
+
+fun Melding.signer(): Melding {
+    return this.copy(
+        processedPayload = getByteArrayFromDocument(
+            signering.signerXML(createDocument( ByteArrayInputStream(this.processedPayload)))
+        ),
+        signert = true
+    )
+}
+
+fun Melding.dekomprimer(): Melding {
+    return this.copy(
+        processedPayload = gZipUtil.uncompress(this.processedPayload),
+        dekomprimert = true
+    )
+}
+
+fun Melding.komprimer(): Melding {
+    return this.copy(
+        processedPayload = gZipUtil.compress(this.processedPayload),
+        komprimert = true
+    )
+}
+
+fun Melding.verifiserSignatur(): Melding {
+    return this.copy(
+        processedPayload = getByteArrayFromDocument(
+            signatureVerifisering.validerSignatur(createDocument( ByteArrayInputStream(this.processedPayload)))
+        ),
+        signaturVerifisert = true
+    )
+}
+
+fun Melding.krypter(): Melding {
+    val krypteringSertifikat = hentKrypteringssertifikat(header.cpaId, header.to.herID)
+    return this.copy(
+        processedPayload = kryptering.krypter(this.processedPayload, krypteringSertifikat),
+        kryptert = true
+    )
+}
+
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/model/Melding.kt b/payload-processor/src/main/kotlin/no/nav/emottak/melding/model/Melding.kt
index 47b9b765..53c7e119 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/melding/model/Melding.kt
+++ b/payload-processor/src/main/kotlin/no/nav/emottak/melding/model/Melding.kt
@@ -1,7 +1,6 @@
 package no.nav.emottak.melding.model
 
 import kotlinx.serialization.Serializable
-import no.nav.emottak.util.crypto.Dekryptering
 
 @Serializable
 data class Melding(
@@ -21,15 +20,3 @@ data class Melding(
         originalPayload = payloadRequest.payload,
         processedPayload = payloadRequest.payload)
 }
-
-val dekryptering = Dekryptering()
-
-fun dekrypter(byteArray: ByteArray) = dekryptering.dekrypter(byteArray, false)
-fun dekrypter(byteArray: ByteArray, isBase64: Boolean) = dekryptering.dekrypter(byteArray, isBase64)
-
-fun Melding.dekrypter(isBase64: Boolean = false): Melding {
-    return this.copy(
-        processedPayload = dekryptering.dekrypter(this.processedPayload, isBase64),
-        dekryptert = true
-    )
-}
\ No newline at end of file
diff --git a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/GZipUtil.kt b/payload-processor/src/main/kotlin/no/nav/emottak/util/GZipUtil.kt
similarity index 75%
rename from payload-processor/src/main/kotlin/no/nav/emottak/melding/process/GZipUtil.kt
rename to payload-processor/src/main/kotlin/no/nav/emottak/util/GZipUtil.kt
index c034ad23..50950ed9 100644
--- a/payload-processor/src/main/kotlin/no/nav/emottak/melding/process/GZipUtil.kt
+++ b/payload-processor/src/main/kotlin/no/nav/emottak/util/GZipUtil.kt
@@ -1,33 +1,11 @@
-package no.nav.emottak.melding.process;
+package no.nav.emottak.util;
 
 import io.ktor.server.plugins.BadRequestException
-import no.nav.emottak.melding.model.Melding
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 
-private val gZipUtil = GZipUtil()
-
-fun compress(byteArray: ByteArray) = gZipUtil.compress(byteArray)
-fun uncompress(byteArray: ByteArray) = gZipUtil.uncompress(byteArray)
-fun isCompressed(byteArray: ByteArray) = gZipUtil.isCompressed(byteArray)
-
-fun Melding.dekomprimer(): Melding {
-    return this.copy(
-        processedPayload = gZipUtil.uncompress(this.processedPayload),
-        dekomprimert = true
-    )
-}
-
-fun Melding.komprimer(): Melding {
-    return this.copy(
-        processedPayload = gZipUtil.compress(this.processedPayload),
-        komprimert = true
-    )
-}
-
-
 class GZipUtil {
     val GZIP_ENCODE_UTF_8 = "UTF-8"
     val GZIP_ENCODE_ISO_8859_1 = "ISO-8859-1"
diff --git a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/DekrypteringTest.kt b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/DekrypteringTest.kt
index a3f88cfc..34739745 100644
--- a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/DekrypteringTest.kt
+++ b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/DekrypteringTest.kt
@@ -1,18 +1,17 @@
 package no.nav.emottak.melding.process
 
-import no.nav.emottak.melding.model.dekrypter
+import no.nav.emottak.util.crypto.Dekryptering
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
 class DekrypteringTest {
 
     @Test
     fun dekrypterFil() {
-
+        val dekryptering = Dekryptering()
         val input = createInputstreamFromFile("src/test/resources/xml/kryptert_fil")
-        val dekryptert = dekrypter(input.readBytes(), isBase64 = true)
+        val dekryptert = dekryptering.dekrypter(input.readBytes(), isBase64 = true)
 
         val expectedOutput = createInputstreamFromFile("src/test/resources/xml/testfil.xml").readBytes()
 
diff --git a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/GZipUtilTest.kt b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/GZipUtilTest.kt
index 27bbfe56..c83142a4 100644
--- a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/GZipUtilTest.kt
+++ b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/GZipUtilTest.kt
@@ -1,5 +1,6 @@
 package no.nav.emottak.melding.process
 
+import no.nav.emottak.util.GZipUtil
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 
@@ -11,10 +12,11 @@ class GZipUtilTest {
 
     @Test
     fun uncompress() {
+        val gZipUtil = GZipUtil()
         val komprimertInput = createInputstreamFromFile("src/test/resources/2023_08_29T12_56_58_328.p7m.deenveloped").readBytes()
-        assertTrue(isCompressed(komprimertInput))
-        val dekomprimert = uncompress(komprimertInput)
-        assertFalse(isCompressed(dekomprimert))
+        assertTrue(gZipUtil.isCompressed(komprimertInput))
+        val dekomprimert = gZipUtil.uncompress(komprimertInput)
+        assertFalse(gZipUtil.isCompressed(dekomprimert))
         println(String(dekomprimert))
     }
 }
\ No newline at end of file
diff --git a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/KrypteringTest.kt b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/KrypteringTest.kt
index 704031a0..79d6160b 100644
--- a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/KrypteringTest.kt
+++ b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/KrypteringTest.kt
@@ -1,5 +1,6 @@
 package no.nav.emottak.melding.process
 
+import no.nav.emottak.util.crypto.Kryptering
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 
@@ -7,12 +8,11 @@ class KrypteringTest {
 
     @Test
     fun `Krypter dokument returnerer OK`() {
+        val kryptering = Kryptering()
         val inputXML = createInputstreamFromFile("src/test/resources/xml/testfil.xml")
         val sertifikat = createInputstreamFromFile("src/test/resources/keystore/cert.pem")
 
-        val kryptert = krypter(inputXML.readBytes(), sertifikat.readBytes())
-
-
+        val kryptert = kryptering.krypter(inputXML.readBytes(), sertifikat.readBytes())
     }
 
     companion object {
diff --git a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/SigneringTest.kt b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/SigneringTest.kt
index 7ee03e0c..ba968293 100644
--- a/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/SigneringTest.kt
+++ b/payload-processor/src/test/kotlin/no/nav/emottak/melding/process/SigneringTest.kt
@@ -1,6 +1,7 @@
 package no.nav.emottak.melding.process
 
 import no.nav.emottak.util.createDocument
+import no.nav.emottak.util.signatur.Signering
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
@@ -9,12 +10,13 @@ class SigneringTest {
 
     @Test
     fun testSigneringAvDokument() {
+        val signering = Signering()
         val usignertXMLInputStream = SigneringTest::class.java.classLoader
             .getResourceAsStream("xml/test.xml")
         val usignertDokument = createDocument(usignertXMLInputStream!!)
         assertEquals(0, usignertDokument.getElementsByTagName("Signature").length)
 
-        val signertDokument = signer(document = usignertDokument, "emottaktestkeypair")
+        val signertDokument = signering.signerXML(document = usignertDokument, "emottaktestkeypair")
         assertEquals(1, signertDokument.getElementsByTagName("Signature").length)
     }