Merge remote-tracking branch 'origin/develop' into feature/OIDF-65-2

# Conflicts: # .docker/admin-server/Dockerfile # .docker/federation-server/Dockerfile # modules/openid-federation-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/helpers/Helpers.kt # modules/openid-federation-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChain.kt # modules/openid-federation-client/src/commonTest/kotlin/com/sphereon/oid/fed/client/trustchain/MockResponses.kt # modules/openid-federation-client/src/jsMain/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChain.js.kt # modules/openid-federation-client/src/jsTest/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChainTest.js.kt # modules/openid-federation-client/src/jvmTest/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChainTest.jvm.kt
Sphereon-Opensource · Nov 4, 2024 · df071b9 · df071b9
2 parents 659d514 + 3947fdf
commit df071b9
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 39 deletions.
diff --git a/.docker/admin-server/Dockerfile b/.docker/admin-server/Dockerfile
@@ -13,6 +13,6 @@ FROM openjdk:21-jdk as runner
 
 WORKDIR /app
 
-COPY --from=builder /app/modules/admin-server/build/libs/admin-server-0.0.1.jar ./admin-server-0.0.1.jar
+COPY --from=builder /app/modules/admin-server/build/libs/admin-server-0.1.0-SNAPSHOT.jar ./admin-server-0.0.1.jar
 
 ENTRYPOINT ["java", "-jar", "admin-server-0.0.1.jar"]
diff --git a/.docker/federation-server/Dockerfile b/.docker/federation-server/Dockerfile
@@ -13,6 +13,6 @@ FROM openjdk:21-jdk as runner
 
 WORKDIR /app
 
-COPY --from=builder /app/modules/federation-server/build/libs/federation-server-0.0.1.jar ./federation-server-0.0.1.jar
+COPY --from=builder /app/modules/federation-server/build/libs/federation-server-0.1.0-SNAPSHOT.jar ./federation-server-0.0.1.jar
 
 ENTRYPOINT ["java", "-jar", "federation-server-0.0.1.jar"]
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+
+* text=auto eol=lf
diff --git a/...id-federation-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/helpers/Helpers.kt b/...id-federation-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/helpers/Helpers.kt
@@ -4,6 +4,6 @@ fun getEntityConfigurationEndpoint(iss: String): String {
     return "${if (iss.endsWith("/")) iss.dropLast(1) else iss}/.well-known/openid-federation"
 }
 
-fun getSubordinateStatementEndpoint(fetchEndpoint: String, sub: String): String {
-    return "${fetchEndpoint}?sub=$sub"
+fun getSubordinateStatementEndpoint(fetchEndpoint: String, sub: String, iss: String): String {
+    return "${fetchEndpoint}?sub=$sub&iss=$iss"
 }
diff --git a/...eration-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChain.kt b/...eration-client/src/commonMain/kotlin/com/sphereon/oid/fed/client/trustchain/TrustChain.kt
@@ -25,22 +25,23 @@ expect interface ITrustChainCallbackMarkerType
 interface ITrustChainMarkerType
 
 @JsExport.Ignore
-interface ITrustChainCallbackService: ITrustChainMarkerType {
+interface ITrustChainCallbackService : ITrustChainMarkerType {
     suspend fun resolve(
         entityIdentifier: String, trustAnchors: Array<String>, maxDepth: Int = 5
     ): MutableList<String>?
 }
 
 @JsExport.Ignore
-interface ITrustChainService: ITrustChainMarkerType {
+interface ITrustChainService : ITrustChainMarkerType {
     suspend fun resolve(
         entityIdentifier: String, trustAnchors: Array<String>, maxDepth: Int = 5
     ): MutableList<String>?
 }
 
 expect fun trustChainService(platformCallback: ITrustChainCallbackMarkerType = DefaultCallbacks.trustChainService()): ITrustChainService
 
-abstract class AbstractTrustChainService<CallbackServiceType>(open val platformCallback: CallbackServiceType): ICallbackService<CallbackServiceType> {
+abstract class AbstractTrustChainService<CallbackServiceType>(open val platformCallback: CallbackServiceType) :
+    ICallbackService<CallbackServiceType> {
     private var disabled = false
 
     override fun isEnabled(): Boolean {
@@ -66,7 +67,8 @@ abstract class AbstractTrustChainService<CallbackServiceType>(open val platformC
     }
 }
 
-class TrustChainService(override val platformCallback: ITrustChainCallbackService = DefaultCallbacks.trustChainService()): AbstractTrustChainService<ITrustChainCallbackService>(platformCallback), ITrustChainService {
+class TrustChainService(override val platformCallback: ITrustChainCallbackService = DefaultCallbacks.trustChainService()) :
+    AbstractTrustChainService<ITrustChainCallbackService>(platformCallback), ITrustChainService {
 
     override fun platform(): ITrustChainCallbackService {
         return this.platformCallback
@@ -92,7 +94,10 @@ class SimpleCache<K, V> {
     }
 }
 
-class DefaultTrustChainImpl(private val fetchService: IFetchCallbackMarkerType?, private val cryptoService: ICryptoCallbackMarkerType?): ITrustChainCallbackService, ITrustChainCallbackMarkerType {
+class DefaultTrustChainImpl(
+    private val fetchService: IFetchCallbackMarkerType?,
+    private val cryptoService: ICryptoCallbackMarkerType?
+) : ITrustChainCallbackService, ITrustChainCallbackMarkerType {
     override suspend fun resolve(
         entityIdentifier: String, trustAnchors: Array<String>, maxDepth: Int
     ): MutableList<String>? {
@@ -114,9 +119,11 @@ class DefaultTrustChainImpl(private val fetchService: IFetchCallbackMarkerType?,
         depth: Int,
         maxDepth: Int
     ): MutableList<String>? {
-        if(depth == maxDepth) return null
+        if (depth == maxDepth) return null
 
-        val entityConfigurationJwt = fetchService(fetchService ?: DefaultCallbacks.fetchService()).fetchStatement(getEntityConfigurationEndpoint(entityIdentifier))
+        val entityConfigurationJwt = fetchService(fetchService ?: DefaultCallbacks.fetchService()).fetchStatement(
+            getEntityConfigurationEndpoint(entityIdentifier)
+        )
         val decodedEntityConfiguration = decodeJWTComponents(entityConfigurationJwt)
 
         val key = findKeyInJwks(
@@ -180,7 +187,10 @@ class DefaultTrustChainImpl(private val fetchService: IFetchCallbackMarkerType?,
             // Avoid processing the same entity twice
             if (cache.get(authorityConfigurationEndpoint) != null) return null
 
-            val authorityEntityConfigurationJwt = fetchService(this.fetchService ?: DefaultCallbacks.fetchService()).fetchStatement(authorityConfigurationEndpoint)
+            val authorityEntityConfigurationJwt =
+                fetchService(this.fetchService ?: DefaultCallbacks.fetchService()).fetchStatement(
+                    authorityConfigurationEndpoint
+                )
             cache.put(authorityConfigurationEndpoint, authorityEntityConfigurationJwt)
 
             val decodedJwt = decodeJWTComponents(authorityEntityConfigurationJwt)
@@ -212,9 +222,12 @@ class DefaultTrustChainImpl(private val fetchService: IFetchCallbackMarkerType?,
                 federationEntityMetadata["federation_fetch_endpoint"]?.jsonPrimitive?.content ?: return null
 
             val subordinateStatementEndpoint =
-                getSubordinateStatementEndpoint(authorityEntityFetchEndpoint, entityIdentifier)
+                getSubordinateStatementEndpoint(authorityEntityFetchEndpoint, entityIdentifier, authority)
 
-            val subordinateStatementJwt = fetchService(this.fetchService ?: DefaultCallbacks.fetchService()).fetchStatement(subordinateStatementEndpoint)
+            val subordinateStatementJwt =
+                fetchService(this.fetchService ?: DefaultCallbacks.fetchService()).fetchStatement(
+                    subordinateStatementEndpoint
+                )
 
             val decodedSubordinateStatement = decodeJWTComponents(subordinateStatementJwt)
 
@@ -226,7 +239,11 @@ class DefaultTrustChainImpl(private val fetchService: IFetchCallbackMarkerType?,
 
             if (subordinateStatementKey == null) return null
 
-            if (!cryptoService(this.cryptoService ?: DefaultCallbacks.jwtService()).verify(subordinateStatementJwt, subordinateStatementKey)) {
+            if (!cryptoService(this.cryptoService ?: DefaultCallbacks.jwtService()).verify(
+                    subordinateStatementJwt,
+                    subordinateStatementKey
+                )
+            ) {
                 return null
             }