Feature/oidf 42

modules/local-kms/build.gradle.kts

@@ -0,0 +1,64 @@
+plugins {
+    kotlin("multiplatform") version "2.0.0"
+    id("app.cash.sqldelight") version "2.0.2"
+}
+
+group = "com.sphereon.oid.fed.kms.local"
+version = "0.1.0"
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+    google()
+}
+
+sqldelight {
+    databases {
+        create("Database") {
+            packageName = "com.sphereon.oid.fed.kms.local"
+            dialect("app.cash.sqldelight:postgresql-dialect:2.0.2")
+            schemaOutputDirectory = file("src/commonMain/resources/db/migration")
+            migrationOutputDirectory = file("src/commonMain/resources/db/migration")
+            deriveSchemaFromMigrations = true
+            migrationOutputFileFormat = ".sql"
+            srcDirs.from(
+                "src/commonMain/sqldelight"
+            )
+        }
+    }
+}
+
+kotlin {
+    jvm()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(projects.modules.openapi)
+            }
+        }
+
+        jvmMain {
+            dependencies {
+                implementation("app.cash.sqldelight:jdbc-driver:2.0.2")
+                implementation("com.zaxxer:HikariCP:5.1.0")
+                implementation("org.postgresql:postgresql:42.7.3")
+                implementation("com.nimbusds:nimbus-jose-jwt:9.40")
+            }
+        }
+
+//        jsMain {
+//            dependencies {
+//                implementation(npm("typescript", "5.5.3"))
+//                implementation(npm("jose", "5.6.3"))
+//                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
+//            }
+//        }
+
+        jvmTest {
+            dependencies {
+                implementation(kotlin("test-junit"))
+            }
+        }
+    }
+}

modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/Constants.kt

@@ -0,0 +1,10 @@
+package com.sphereon.oid.fed.kms.local
+
+class Constants {
+    companion object {
+        const val DATASOURCE_URL = "DATASOURCE_URL"
+        const val DATASOURCE_USER = "DATASOURCE_USER"
+        const val DATASOURCE_PASSWORD = "DATASOURCE_PASSWORD"
+        const val SQLITE_IS_NOT_SUPPORTED_IN_JVM = "SQLite is not supported in JVM"
+    }
+}

modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/database/LocalKmsDatabase.kt

@@ -0,0 +1,11 @@
+package com.sphereon.oid.fed.kms.local.database
+
+import com.sphereon.oid.fed.kms.local.models.Keys
+
+expect class LocalKmsDatabase() {
+    fun getKey(keyId: String): Keys
+    fun insertKey(keyId: String, privateKey: ByteArray, publicKey: ByteArray, algorithm: String)
+    fun deleteKey(keyId: String)
+}
+
+class KeyNotFoundException(message: String) : Exception(message)

modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/database/PlatformSqlDriver.kt

@@ -0,0 +1,8 @@
+package com.sphereon.oid.fed.kms.local.database
+
+import app.cash.sqldelight.db.SqlDriver
+
+expect class PlatformSqlDriver {
+    fun createPostgresDriver(url: String, username: String, password: String): SqlDriver
+    fun createSqliteDriver(path: String): SqlDriver
+}

modules/openid-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/jwk/Jwk.kt → modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/jwk/Jwk.kt

@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed.common.jwk
+package com.sphereon.oid.fed.kms.local.jwk
 
 import com.sphereon.oid.fed.openapi.models.Jwk
 

modules/openid-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwt.kt → modules/local-kms/src/commonMain/kotlin/com/sphereon/oid/fed/kms/local/jwt/JoseJwt.kt

@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed.common.jwt
+package com.sphereon.oid.fed.kms.local.jwt
 
 expect class JwtHeader
 expect class JwtPayload

modules/local-kms/src/commonMain/sqldelight/com/sphereon/oid/fed/kms/local/models/1.sqm

@@ -0,0 +1,7 @@
+CREATE TABLE Keys (
+    id TEXT PRIMARY KEY,
+    private_key BYTEA NOT NULL,
+    public_key BYTEA NOT NULL,
+    algorithm TEXT NOT NULL,
+    deleted_at TIMESTAMP
+);

modules/local-kms/src/commonMain/sqldelight/com/sphereon/oid/fed/kms/local/models/Keys.sq

@@ -0,0 +1,11 @@
+findAll:
+SELECT * FROM Keys;
+
+create:
+INSERT INTO Keys (id, private_key, public_key, algorithm) VALUES (?, ?, ?, ?) RETURNING *;
+
+findById:
+SELECT * FROM Keys WHERE id = ?;
+
+delete:
+UPDATE Keys SET deleted_at = CURRENT_TIMESTAMP WHERE id = ?;

modules/openid-federation-common/src/jsMain/kotlin/com.sphereon.oid.fed.common.jwk/Jwk.kt → modules/local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/jwk/Jwk.kt

@@ -1,6 +1,6 @@
-package com.sphereon.oid.fed.common.jwk
+package com.sphereon.oid.fed.kms.local.jwk
 
-import com.sphereon.oid.fed.common.jwt.Jose
+import com.sphereon.oid.fed.kms.local.jwt.Jose
 import com.sphereon.oid.fed.openapi.models.Jwk
 
 @ExperimentalJsExport

modules/openid-federation-common/src/jsMain/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwt.js.kt → modules/local-kms/src/jsMain/kotlin/com/sphereon/oid/fed/kms/local/jwt/JoseJwt.js.kt

@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed.common.jwt
+package com.sphereon.oid.fed.kms.local.jwt
 
 import com.sphereon.oid.fed.openapi.models.EntityConfigurationStatement
 import com.sphereon.oid.fed.openapi.models.JWTHeader

modules/local-kms/src/jvmMain/kotlin/com/sphereon/oid/fed/kms/local/database/LocalKmsDatabase.jvm.kt

@@ -0,0 +1,41 @@
+package com.sphereon.oid.fed.kms.local.database
+
+import app.cash.sqldelight.db.SqlDriver
+import com.sphereon.oid.fed.kms.local.Constants
+import com.sphereon.oid.fed.kms.local.Database
+import com.sphereon.oid.fed.kms.local.models.Keys
+
+
+actual class LocalKmsDatabase {
+
+    private var database: Database
+
+    init {
+        val driver = getDriver()
+
+        database = Database(driver)
+    }
+
+    private fun getDriver(): SqlDriver {
+        return PlatformSqlDriver().createPostgresDriver(
+            System.getenv(Constants.DATASOURCE_URL),
+            System.getenv(Constants.DATASOURCE_USER),
+            System.getenv(Constants.DATASOURCE_PASSWORD)
+        )
+    }
+
+    actual fun getKey(keyId: String): Keys {
+        return database.keysQueries.findById(keyId).executeAsOneOrNull()
+            ?: throw KeyNotFoundException("$keyId not found")
+    }
+
+    actual fun insertKey(
+        keyId: String, privateKey: ByteArray, publicKey: ByteArray, algorithm: String
+    ) {
+        database.keysQueries.create(keyId, privateKey, publicKey, algorithm).executeAsOneOrNull()
+    }
+
+    actual fun deleteKey(keyId: String) {
+        database.keysQueries.delete(keyId)
+    }
+}

modules/local-kms/src/jvmMain/kotlin/com/sphereon/oid/fed/kms/local/database/PlatformSqlDriver.kt

@@ -0,0 +1,23 @@
+package com.sphereon.oid.fed.kms.local.database
+
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.driver.jdbc.asJdbcDriver
+import com.sphereon.oid.fed.kms.local.Constants
+import com.zaxxer.hikari.HikariConfig
+import com.zaxxer.hikari.HikariDataSource
+
+actual class PlatformSqlDriver {
+    actual fun createPostgresDriver(url: String, username: String, password: String): SqlDriver {
+        val config = HikariConfig()
+        config.jdbcUrl = url
+        config.username = username
+        config.password = password
+
+        val dataSource = HikariDataSource(config)
+        return dataSource.asJdbcDriver()
+    }
+
+    actual fun createSqliteDriver(path: String): SqlDriver {
+        throw UnsupportedOperationException(Constants.SQLITE_IS_NOT_SUPPORTED_IN_JVM)
+    }
+}

modules/openid-federation-common/src/jvmMain/kotlin/com/sphereon/oid/fed/common/jwk/Jwk.jvm.kt → modules/local-kms/src/jvmMain/kotlin/com/sphereon/oid/fed/kms/local/jwk/Jwk.jvm.kt

@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed.common.jwk
+package com.sphereon.oid.fed.kms.local.jwk
 
 import com.nimbusds.jose.Algorithm
 import com.nimbusds.jose.jwk.Curve

modules/openid-federation-common/src/jvmMain/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwt.jvm.kt → modules/local-kms/src/jvmMain/kotlin/com/sphereon/oid/fed/kms/local/jwt/JoseJwt.jvm.kt

@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed.common.jwt
+package com.sphereon.oid.fed.kms.local.jwt
 
 import com.nimbusds.jose.JWSHeader
 import com.nimbusds.jose.JWSSigner

modules/openid-federation-common/src/jvmTest/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwtTest.jvm.kt → modules/local-kms/src/jvmTest/kotlin/com/sphereon/oid/fed/kms/local/jwt/JoseJwtTest.jvm.kt

@@ -1,4 +1,4 @@
-package com.sphereon.oid.fed.common.jwt
+package com.sphereon.oid.fed.kms.local.jwt
 
 import com.nimbusds.jose.jwk.RSAKey
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator

modules/openid-federation-common/build.gradle.kts

@@ -73,7 +73,6 @@ kotlin {
             dependencies {
                 implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
                 runtimeOnly("io.ktor:ktor-client-cio-jvm:$ktorVersion")
-                implementation("com.nimbusds:nimbus-jose-jwt:9.40")
             }
         }
         val jvmTest by getting {
@@ -130,8 +129,6 @@ kotlin {
             dependencies {
                 runtimeOnly("io.ktor:ktor-client-core-js:$ktorVersion")
                 runtimeOnly("io.ktor:ktor-client-js:$ktorVersion")
-                implementation(npm("typescript", "5.5.3"))
-                implementation(npm("jose", "5.6.3"))
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC")
             }

modules/services/build.gradle.kts

@@ -21,6 +21,7 @@ kotlin {
                 api(projects.modules.openapi)
                 api(projects.modules.persistence)
                 api(projects.modules.openidFederationCommon)
+                api(projects.modules.localKms)
                 implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11")
             }
         }

modules/services/src/commonMain/kotlin/com/sphereon/oid/fed/services/KeyService.kt

@@ -1,6 +1,6 @@
 package com.sphereon.oid.fed.services
 
-import com.sphereon.oid.fed.common.jwk.generateKeyPair
+import com.sphereon.oid.fed.kms.local.jwk.generateKeyPair
 import com.sphereon.oid.fed.openapi.models.JwkAdminDTO
 import com.sphereon.oid.fed.persistence.Persistence
 import com.sphereon.oid.fed.persistence.models.Jwk

modules/services/src/commonMain/kotlin/com/sphereon/oid/fed/services/KmsService.kt

@@ -0,0 +1,30 @@
+package com.sphereon.oid.fed.services
+
+import com.sphereon.oid.fed.openapi.models.Jwk
+
+
+class KmsService(private val provider: String) {
+
+    private val kmsClient: KmsClient = when (provider) {
+        "local" -> LocalKmsClient()
+        else -> throw IllegalArgumentException("Unsupported KMS provider: $provider")
+    }
+
+    fun generateKeyPair(keyId: String): Jwk {
+        return kmsClient.generateKeyPair(keyId)
+    }
+
+    fun sign(data: String, keyId: String): String {
+        return kmsClient.sign(data, keyId)
+    }
+
+    fun verify(token: String, keyId: String): Boolean {
+        return kmsClient.verify(token, keyId)
+    }
+}
+
+interface KmsClient {
+    fun generateKeyPair(keyId: String): Jwk
+    fun sign(data: String, keyId: String): String
+    fun verify(token: String, keyId: String): Boolean
+}

modules/services/src/commonMain/kotlin/com/sphereon/oid/fed/services/LocalKmsClient.kt

@@ -0,0 +1,21 @@
+package com.sphereon.oid.fed.services
+
+import com.sphereon.oid.fed.kms.local.database.LocalKmsDatabase
+import com.sphereon.oid.fed.openapi.models.Jwk
+
+class LocalKmsClient : KmsClient {
+
+    private val database: LocalKmsDatabase = LocalKmsDatabase()
+
+    override fun generateKeyPair(keyId: String): Jwk {
+        TODO("Not yet implemented")
+    }
+
+    override fun sign(data: String, keyId: String): String {
+        TODO("Not yet implemented")
+    }
+
+    override fun verify(token: String, keyId: String): Boolean {
+        TODO("Not yet implemented")
+    }
+}

modules/services/src/jvmTest/kotlin/com/sphereon/oid/fed/services/KeyServiceTest.jvm.kt

@@ -1,6 +1,6 @@
 package com.sphereon.oid.fed.services
 
-import com.sphereon.oid.fed.common.jwk.generateKeyPair
+import com.sphereon.oid.fed.kms.local.jwk.generateKeyPair
 import com.sphereon.oid.fed.services.extensions.decrypt
 import com.sphereon.oid.fed.services.extensions.encrypt
 import org.junit.Test

settings.gradle.kts

@@ -48,3 +48,4 @@ include(":modules:federation-server")
 include(":modules:openapi")
 include(":modules:persistence")
 include(":modules:services")
+include("modules:local-kms")