Merge branch 'main' into dev/cpa-db

.github/dependabot.yaml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+#  - package-ecosystem: gradle
+#    directory: "/"
+#    schedule:
+#      interval: daily
+#    open-pull-requests-limit: 10

cpa-repo/build.gradle.kts

@@ -46,6 +46,7 @@ dependencies {
     implementation("org.jetbrains.exposed:exposed-dao:0.43.0")
     implementation("org.jetbrains.exposed:exposed-jdbc:0.43.0")
     implementation("org.jetbrains.exposed:exposed-java-time:0.43.0")
+    implementation("ch.qos.logback:logback-classic:1.4.11")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
 

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/App.kt

@@ -1,26 +1,35 @@
-/*
- * This Kotlin source file was generated by the Gradle 'init' task.
- */
 package no.nav.emottak.cpa
 
-import io.ktor.http.content.*
-import io.ktor.server.application.*
-import io.ktor.server.engine.*
-import io.ktor.server.netty.*
-import io.ktor.server.response.*
-import io.ktor.server.routing.*
-import no.nav.emottak.cpa.config.DatabaseConfig
-import no.nav.emottak.cpa.config.mapHikariConfig
+import io.ktor.server.application.call
+import io.ktor.server.engine.embeddedServer
+import io.ktor.server.netty.Netty
+import io.ktor.server.plugins.BadRequestException
+import io.ktor.server.plugins.NotFoundException
+import io.ktor.server.response.respond
+import io.ktor.server.routing.get
+import io.ktor.server.routing.routing
 
 fun main() {
     val database = Database(mapHikariConfig(DatabaseConfig()))
     database.migrate()
 
     embeddedServer(Netty, port = 8080) {
+
         routing {
-            get("/cpa") {
-                call.respondText("Hello, world!")
+            get("/cpa/{id}") {
+                val cpaId = call.parameters["id"] ?: throw BadRequestException("Mangler CPA ID")
+                val cpa = getCpa(cpaId) ?: throw NotFoundException("Fant ikke CPA")
+                call.respond(cpa)
+            }
+
+            get("/cpa/{id}/{herId}/certificate/encryption") {
+                val cpaId = call.parameters["id"] ?: throw BadRequestException("Mangler CPA ID")
+                val herId = call.parameters["herId"] ?: throw BadRequestException("Mangler HER ID")
+                val cpa = getCpa(cpaId) ?: throw NotFoundException("Fant ikke CPA")
+
+                call.respond(cpa.getCertificateForEncryption(herId))
             }
         }
     }.start(wait = true)
+
 }

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/CPAUtil.kt

@@ -0,0 +1,34 @@
+package no.nav.emottak.cpa
+
+import org.oasis_open.committees.ebxml_cppa.schema.cpp_cpa_2_0.Certificate
+import org.oasis_open.committees.ebxml_cppa.schema.cpp_cpa_2_0.CollaborationProtocolAgreement
+import org.w3._2000._09.xmldsig_.X509DataType
+import javax.xml.bind.JAXBElement
+
+private val cpaUtil = CPAUtil()
+
+fun getCpa(id: String) = cpaUtil.getCpa(id)
+
+
+private class CPAUtil {
+
+    fun getCpa(id: String): CollaborationProtocolAgreement? {
+        //TODO
+        val testCpaString = String(this::class.java.classLoader.getResource("nav-qass-35065.xml").readBytes())
+        return unmarshal(testCpaString, CollaborationProtocolAgreement::class.java)
+    }
+
+}
+
+fun CollaborationProtocolAgreement.getCertificateForEncryption(herId: String): ByteArray {
+    val partyInfo = this.partyInfo.first { partyInfo ->
+        partyInfo.partyId.any { partyId ->
+            partyId.type == "HER" && partyId.value == herId
+        }
+    }
+    val encryptionCert = partyInfo.collaborationRole.first().applicationCertificateRef.first().certId as Certificate
+    val datatype =
+        encryptionCert.keyInfo.content?.filterIsInstance(JAXBElement::class.java)?.firstOrNull()?.value as X509DataType
+    return datatype.x509IssuerSerialOrX509SKIOrX509SubjectName?.filterIsInstance(JAXBElement::class.java)
+        ?.firstOrNull()?.value as ByteArray
+}

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/XmlMarshaller.kt

@@ -0,0 +1,36 @@
+package no.nav.emottak.cpa
+
+import java.io.StringWriter
+import javax.xml.bind.JAXBContext
+import javax.xml.stream.XMLInputFactory
+
+private val xmlMarshaller = XmlMarshaller()
+
+fun marshal(objekt: Any) = xmlMarshaller.marshal(objekt)
+fun <T> unmarshal(xml: String, clazz: Class<T>) : T = xmlMarshaller.unmarshal(xml , clazz)
+
+class XmlMarshaller {
+
+    companion object {
+        private val jaxbContext = JAXBContext.newInstance(
+            org.oasis_open.committees.ebxml_cppa.schema.cpp_cpa_2_0.ObjectFactory::class.java,
+            org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.ObjectFactory::class.java,
+            org.xmlsoap.schemas.soap.envelope.ObjectFactory::class.java,
+            org.w3._1999.xlink.ObjectFactory::class.java,
+            org.w3._2009.xmldsig11_.ObjectFactory::class.java
+        );
+        private val marshaller = jaxbContext.createMarshaller()
+        private val unmarshaller = jaxbContext.createUnmarshaller()
+    }
+
+    fun marshal(objekt: Any) : String {
+        val writer = StringWriter()
+        marshaller.marshal(objekt,writer)
+        return writer.toString()
+    }
+
+    fun <T> unmarshal(xml: String, clazz: Class<T>) : T  {
+        val reader =  XMLInputFactory.newInstance().createXMLStreamReader(xml.reader())
+        return unmarshaller.unmarshal(reader, clazz).value
+    }
+}

ebms-provider/build.gradle.kts

@@ -31,6 +31,10 @@ tasks.register<Wrapper>("wrapper") {
     gradleVersion="8.1.1"
 }
 
+tasks.test {
+    useJUnitPlatform()
+}
+
 dependencies {
     implementation("io.ktor:ktor-server-core:2.3.4")
     implementation("io.ktor:ktor-server-netty:2.3.4")

payload-processor/build.gradle.kts

@@ -35,6 +35,8 @@ dependencies {
     implementation("io.ktor:ktor-server-call-logging-jvm:2.3.4")
     implementation("io.ktor:ktor-server-content-negotiation:2.3.4")
     implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.4")
+    implementation("io.ktor:ktor-client-core:2.3.4")
+    implementation("io.ktor:ktor-client-cio:2.3.4")
     implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0", )
     implementation("org.glassfish.jaxb:jaxb-runtime:4.0.3")
     implementation("org.bouncycastle:bcprov-jdk18on:1.76")

payload-processor/src/main/kotlin/no/nav/emottak/App.kt

@@ -52,11 +52,11 @@ private fun Application.serverSetup() {
                     conversationId = UUID.randomUUID().toString(),
                     cpaId = UUID.randomUUID().toString(),
                     to = Party(
-                        "12345",
+                        herID = "8141253",
                         role = "mottaker"
                     ),
                     from = Party(
-                        "54321",
+                        herID = "54321",
                         role = "sender"
                     ),
                     service = "melding",

payload-processor/src/main/kotlin/no/nav/emottak/melding/process/Kryptering.kt

@@ -3,6 +3,7 @@ package no.nav.emottak.melding.process
 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.hentKrypteringssertifikat
 import org.bouncycastle.asn1.ASN1ObjectIdentifier
 import org.bouncycastle.cms.CMSAlgorithm
 import org.bouncycastle.cms.CMSEnvelopedDataGenerator
@@ -44,11 +45,6 @@ class Kryptering {
 
     }
 
-    fun hentKrypteringssertifikat(cpaId: String, herId: String): ByteArray {
-        //TODO Hent krypteringssertifikat fra CPA
-        return this::class.java.classLoader.getResource("xml/cert.pem").readBytes()
-    }
-
 }
 
 private val encryptionAlgorithm: ASN1ObjectIdentifier = CMSAlgorithm.DES_EDE3_CBC

payload-processor/src/main/kotlin/no/nav/emottak/util/CommonUtil.kt

@@ -0,0 +1,13 @@
+package no.nav.emottak.util
+
+
+internal fun getEnvVar(varName: String, defaultValue: String? = null) =
+    System.getenv(varName) ?:
+    System.getProperty(varName) ?:
+    defaultValue ?: throw RuntimeException("Missing required variable $varName")
+
+
+
+
+
+

payload-processor/src/main/kotlin/no/nav/emottak/util/HttpClientUtil.kt

@@ -0,0 +1,31 @@
+package no.nav.emottak.util
+
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.request.request
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.readBytes
+import io.ktor.http.HttpMethod
+import kotlinx.coroutines.runBlocking
+
+
+private val httpClientUtil = HttpClientUtil()
+private val cpaRepoUrl = "http://cpa-repo"
+
+fun hentKrypteringssertifikat(cpaId: String, herId: String): ByteArray = runBlocking {
+    httpClientUtil.makeHttpRequest("$cpaRepoUrl/cpa/$cpaId/$herId/certificate/encryption").readBytes()
+}
+
+class HttpClientUtil {
+
+    private val client = HttpClient(CIO) {
+        expectSuccess = true
+    }
+
+    suspend fun makeHttpRequest(urlString: String): HttpResponse {
+        val response: HttpResponse = client.request(urlString) {
+            method = HttpMethod.Get
+        }
+        return response
+    }
+}

payload-processor/src/main/kotlin/no/nav/emottak/util/KeyStoreUtil.kt

@@ -66,7 +66,3 @@ internal class KeyStoreUtil {
     }
 }
 
-private fun getEnvVar(varName: String, defaultValue: String? = null) =
-    System.getenv(varName) ?:
-    System.getProperty(varName) ?:
-    defaultValue ?: throw RuntimeException("Missing required variable $varName")