Fix recursive disclosure (example: address)

Author: QZHelen

app/src/main/assets/databasenew.json

@@ -183,6 +183,19 @@ class CredentialRepository {
             val currPath = path.toMutableList() // Make a copy
             currPath.add(key)
             if (v is JSONObject) {
+                val displayName = displayConfig?.claims?.firstOrNull{
+                    JSONArray(it.path) == currPath
+                }?.display?.first()?.name ?: currPath.joinToString(separator = ".")
+                claims.add(
+                    SdJwtClaim(
+                        path = currPath,
+                        value = null,
+                        fieldDisplayPropertySet = setOf(VerificationFieldDisplayProperties(
+                            displayName = displayName,
+                        )),
+//                        isSelectivelyDisclosable = TODO()
+                    )
+                )
                 constructJwtClaims(
                     v,
                     displayConfig,

app/src/main/java/com/credman/cmwallet/data/repository/CredentialRepository.kt

@@ -9,13 +9,17 @@ import java.math.BigInteger
 import java.nio.ByteBuffer
 import java.security.MessageDigest
 import android.util.Base64
+import android.util.Log
 import com.credman.cmwallet.createJWTES256
 import com.credman.cmwallet.jwsDeserialization
 import com.credman.cmwallet.loadECPrivateKey
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
+import java.lang.IllegalStateException
 import java.security.PrivateKey
 import java.time.Instant
+import kotlin.collections.iterator
+import kotlin.collections.mutableListOf
 
 class SdJwt(
     credential: String,
@@ -37,6 +41,23 @@ class SdJwt(
         verify(issuerJwt, disclosures)
     }
 
+    private fun addDisclosuresToPresentation(sd: JSONObject, ret: MutableList<String>) {
+        for (key in sd.keys()) {
+            if ("_sd" == key) {
+                val digest = sd.getString("_sd")
+                val disclosure = verifiedResult.digestDisclosureMap[digest]!!
+                ret.add(disclosure)
+            } else {
+                val recursiveSd = sd.get(key)
+                if (recursiveSd is JSONObject) {
+                    addDisclosuresToPresentation(recursiveSd, ret)
+                } else {
+                    throw IllegalStateException("Unexpected type ${recursiveSd::class.java}")
+                }
+            }
+        }
+    }
+
     fun present(
         claimSets: JSONArray?, // If null, match all
         nonce: String,
@@ -67,8 +88,7 @@ class SdJwt(
                         }
                     }
                     if (claimSetMatched) {
-                        val digest = sd.getString("_sd")
-                        ret.add(verifiedResult.digestDisclosureMap[digest]!!)
+                        addDisclosuresToPresentation(sd, ret)
                     } else {
                         break
                     }

app/src/main/java/com/credman/cmwallet/sdjwt/SdJwt.kt

@@ -101,10 +101,11 @@ __attribute__((import_module("credman"), import_name("GetCallingAppInfo")))
 #endif
 void GetCallingAppInfo(CallingAppInfo* info);
 
-#endif 
 
 // Only works for system applications
 #if defined(__wasm__)
 __attribute__((import_module("credman_v4"), import_name("SelfDeclarePackageInfo")))
 #endif
-void SelfDeclarePackageInfo(char *package_display_name, char* package_icon, size_t package_icon_len);
+void SelfDeclarePackageInfo(char *package_display_name, char* package_icon, size_t package_icon_len);
+
+#endif