feat: Added mapping for trust chain and categorize entity statement

Sphereon-Opensource · Jul 25, 2024 · a3fef17 · a3fef17
1 parent 6dcd541
commit a3fef17
Show file tree

Hide file tree

Showing 6 changed files with 138 additions and 17 deletions.
diff --git a/modules/openapi/build.gradle.kts b/modules/openapi/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     kotlin("multiplatform") version "2.0.0"
+    kotlin("plugin.serialization") version "2.0.0"
     id("org.openapi.generator") version "7.7.0"
     id("maven-publish")
 }
@@ -23,11 +24,26 @@ repositories {
 
 kotlin {
     tasks {
+        // Temporary fix for this issue: https://github.com/OpenAPITools/openapi-generator/issues/17658
+        register<Copy>("fixOpenApiGeneratorIssue") {
+            from(
+                "$projectDir/build/generated/src/commonMain/kotlin/com/sphereon/oid/fed/openapi"
+            )
+            into(
+                "$projectDir/build/copy/src/commonMain/kotlin/com/sphereon/oid/fed/openapi"
+            )
+            filter { line: String ->
+                line.replace(
+                    "kotlin.collections.Map<kotlin.String, kotlin.Any>",
+                    "kotlinx.serialization.json.JsonObject")
+            }
+        }
+
         withType<KotlinCompileCommon> {
-           dependsOn("openApiGenerate")
+            dependsOn("fixOpenApiGeneratorIssue")
         }
         named("sourcesJar") {
-            dependsOn("openApiGenerate")
+            dependsOn("fixOpenApiGeneratorIssue")
         }
     }
     jvm {
@@ -58,19 +74,23 @@ kotlin {
                 }
             }
 
-            named<KotlinJvmCompile>("compileKotlinJvm") {
+            named<Copy>("fixOpenApiGeneratorIssue") {
                 dependsOn("openApiGenerate")
+            }
+
+            named<KotlinJvmCompile>("compileKotlinJvm") {
+                dependsOn("fixOpenApiGeneratorIssue")
                 compilerOptions {
                     jvmTarget.set(JvmTarget.JVM_11)
                 }
             }
 
             named("jvmSourcesJar") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
 
             named<Jar>("jvmJar") {
-                dependsOn("compileKotlinJvm")
+                dependsOn("fixOpenApiGeneratorIssue")
                 archiveBaseName.set("openapi")
                 duplicatesStrategy = DuplicatesStrategy.EXCLUDE
                 from(configurations.kotlinCompilerClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
@@ -82,10 +102,10 @@ kotlin {
     js {
         tasks {
             named("compileKotlinJs") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
             named("jsSourcesJar") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
         }
         nodejs()
@@ -94,37 +114,37 @@ kotlin {
     iosX64 {
         tasks {
             named("compileKotlinIosX64") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
             named("iosX64SourcesJar") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
         }
     }
     iosArm64 {
         tasks {
             named("compileKotlinIosArm64") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
             named("iosArm64SourcesJar") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
         }
     }
     iosSimulatorArm64 {
         tasks {
             named("compileKotlinIosSimulatorArm64") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
             named("iosSimulatorArm64SourcesJar") {
-                dependsOn("openApiGenerate")
+                dependsOn("fixOpenApiGeneratorIssue")
             }
         }
     }
 
     sourceSets {
         val commonMain by getting {
-            kotlin.srcDir("build/generated/src/commonMain/kotlin")
+            kotlin.srcDir("build/copy/src/commonMain/kotlin")
             dependencies {
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")

diff --git a/modules/openapi/gradle.properties b/modules/openapi/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style=official
-profiles=models-only
+#profiles=models-only
diff --git a/...-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/logic/EntityLogic.kt b/...-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/logic/EntityLogic.kt
@@ -0,0 +1,33 @@
+package com.sphereon.oid.fed.common.logic
+
+import com.sphereon.oid.fed.openapi.models.EntityStatement
+
+class EntityLogic {
+
+    fun getEntityType(entityStatement: EntityStatement): EntityType {
+        if (isFederationListEndpointPresent(entityStatement) == true && isAuthorityHintPresent(entityStatement) == false) {
+            return EntityType.TRUST_ANCHOR
+        } else if (isFederationListEndpointPresent(entityStatement) == true && isAuthorityHintPresent(entityStatement) == true) {
+            return EntityType.INTERMEDIATE
+        } else if (isFederationListEndpointPresent(entityStatement) == false && isAuthorityHintPresent(entityStatement) == true) {
+            return EntityType.LEAF
+        } else {
+            return EntityType.UNDEFINED
+        }
+    }
+
+    private fun isAuthorityHintPresent(entityStatement: EntityStatement): Boolean {
+        return entityStatement.authorityHints?.isEmpty() == false
+    }
+
+    private fun isFederationListEndpointPresent(entityStatement: EntityStatement): Boolean {
+        return entityStatement.metadata?.federationEntity?.federationListEndpoint?.isNotEmpty() == true
+    }
+}
+
+enum class EntityType {
+    LEAF,
+    INTERMEDIATE,
+    TRUST_ANCHOR,
+    UNDEFINED
+}
diff --git a/...-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/mapper/JsonMapper.kt b/...-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/mapper/JsonMapper.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.json.decodeFromJsonElement
 class JsonMapper {
 
     /*
-    * Used for mapping JWT token to EntityStatement object
+     * Used for mapping JWT token to EntityStatement object
      */
     fun mapEntityStatement(jwtToken: String): EntityStatement? {
         val data = decodeJWTComponents(jwtToken)
@@ -17,4 +17,15 @@ class JsonMapper {
             null
         }
     }
+
+    /*
+     * Used for mapping trust chain
+     */
+    fun mapTrustChain(jwtTokenList: List<String>): List<EntityStatement?> {
+        val list: MutableList<EntityStatement?> = mutableListOf()
+        jwtTokenList.forEach { jwtToken ->
+            list.add(mapEntityStatement(jwtToken))
+        }
+        return list
+    }
 }
diff --git a/...id-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/model/JWTHeader.kt b/...id-federation-common/src/commonMain/kotlin/com/sphereon/oid/fed/common/model/JWTHeader.kt
@@ -8,5 +8,6 @@ import kotlinx.serialization.SerialName
 data class JWTHeader(
     @SerialName("alg") val alg: String, // RS256
     @SerialName("kid") val kid: String, // B6EB8488CC84C41017134BC77F4132A0467CCC0E
-    @SerialName("typ") val typ: String // entity-statement+jwt
+    @SerialName("typ") val typ: String? = null, // entity-statement+jwt
+    @SerialName("trust_chain") val trustChain: List<String>? = null // ["eyJhbGciOiJSUzI1NiIsImtpZCI6IlpXRlRRbWhmVFdaSVRuRlRZM0ZTV2pKdU5HMWZWV05hZWxkNmNtUjFRa0pEYlhaWlRYQm1hM1JWUVEiLCJ0eXAiOiJlbnRpdHktc3RhdGVtZW50K2p3dCJ9.eyJleHAiOjE2OTY1ODMzMzQsImlhdCI6MTY5NjI4MzMzNCwiaXNzIjoiaHR0cHM6Ly90cnVzdC1hbmNob3IuZXhhbXBsZS5vcmciLCJzdWIiOiJodHRwczovL2ludGVybWVkaWF0ZS5laWRhcy5leGFtcGxlLm9yZyIsImp3a3MiOnsia2V5cyI6W3sia3R5IjoiUlNBIiwia2lkIjoiWmxKd05tNDVUMmxVY1hsSFRHZzFaV2hsYmxkalVXbGxjbVF0U1VsUVdYcEhTMUpFUTA4eVRXVnZOQSIsImUiOiJBUUFCIiwibiI6ImtSQUlzLVRBblF6T29lc195RW9oaDNUeGlaWFlPRC1xekI2T25JalZCaVI0WFNGbkw4djhRQ0IxamJiSlZTQ1hBZmdObTlBZjdVRDNBX0E2T1pQOUtacldSUk00NEp0TVAzZmxVSU5CQ2xzNFBrdVd2RklmWEtaaWVUNGhBMzNYdUlTSndqT2NlNnRrbUZTUl9wQmI3S0JHbnB4d3dnRlJjeUM2RU1VQWtWUGdQRl9mbXM3NEEyTF83TGVaNzh2X053VUhsY2VxVHB1OUx6VTRuTTd1RTZQY0JPSmJweXI2SFFuUTR1VHN6WThsWHVmT3pHZ2IzVXNDNmRnQWVVVERIZlFROE4xYXV2bkJUNmR0SHNHNWMxS2NCT2QzLVp6ZTZ5WVE5c2JLUlUtWVoydDZKdUJIbS1xLTVOamxiRWVwNDAwbFgxSXlKdG9Tc3F0d3lCX1djdyJ9XX19.CvBvN0aG-r13UG4uITH72tC5CbAG0rT4qYQ5wwHOtGE021etZFQd40RFnQT5e-Gy_Y8Wiin-Zmc1hWW2rVyZ1RRInjYGUt26QI6ujR-5w9Y_LHVp-6RzYEF0lg9otpAyszQE4hf5qBZYAj8t39FvCYWTYVci6mtpovJQ380ha8I4QL__fZtEgDLQ-7VKS58nN1DOVdcIICMMfxpDR81bkY5i5Qxcy7AaZTN6xxE2SlCO-pKKub0jBUtnug20-BL2YgcPhLFOYWfj2cuyapOA9Omwu6CPhmZHgsL1P2oK_f4jA9JxNDYcV0losDbD86r8Wg3anM2lVM5BTHkiUr2grg"]
 )