Merge branch 'main' of github.com:walt-id/waltid-identity into wal-31…

…3-fix-sd-property-check
walt-id · Dec 2, 2024 · 2d506c5 · 2d506c5
2 parents 16e4812 + 59d0ec2
commit 2d506c5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/waltid-applications/waltid-cli/README.md b/waltid-applications/waltid-cli/README.md
@@ -512,7 +512,7 @@ Usage: waltid vc verify [<options>] <vc>
   ╰─────────────────────────────────────────────────────────────────────────────────────────╯
 
 Options:
-  -p, --policy=(signature|expired|not-before|revoked_status_list|schema|allowed-issuer|webhook)
+  -p, --policy=(signature|expired|not-before|revoked-status-list|schema|allowed-issuer|webhook)
                      Specify one, or more policies to be applied during the verification process of the VC (signature policy is always applied).
   -a, --arg=<value>  Argument required by some policies, namely:
 
@@ -525,7 +525,7 @@ Options:
                      ├─────────────────────┼─────────────────────────────────────────────────────────────────┤
                      │ not-before          │ -                                                               │
                      ├─────────────────────┼─────────────────────────────────────────────────────────────────┤
-                     │ revoked_status_list │ -                                                               │
+                     │ revoked-status-list │ -                                                               │
                      ├─────────────────────┼─────────────────────────────────────────────────────────────────┤
                      │ schema              │ schema=/path/to/schema.json                                     │
                      ├─────────────────────┼─────────────────────────────────────────────────────────────────┤

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCVerifyCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VCVerifyCmd.kt
@@ -57,7 +57,7 @@ class VCVerifyCmd : CliktCommand(
             "signature",
             "expired",
             "not-before",
-            "revoked_status_list",
+            "revoked-status-list",
             "schema",
             "allowed-issuer",
             "webhook",
@@ -75,7 +75,7 @@ class VCVerifyCmd : CliktCommand(
             |signature| - |
             |expired| - |
             |not-before| - |
-            |revoked_status_list| - |
+            |revoked-status-list| - |
             |schema|schema=/path/to/schema.json|
             |allowed-issuer|issuer=did:key:z6Mkp7AVwvWxnsNDuSSbf19sgKzrx223WY95AqZyAGifFVyV|
             |webhook|url=https://example.com|
@@ -145,7 +145,7 @@ class VCVerifyCmd : CliktCommand(
         args.putAll(getAllowedIssuerPolicyArguments())
         args.putAll(getWebhookPolicyArguments())
         args.putAll(getRevocationPolicyArguments())
-        for (noArgPolicyName in listOf("signature", "expired", "not-before", "revoked_status_list")) {
+        for (noArgPolicyName in listOf("signature", "expired", "not-before", "revoked-status-list")) {
             if (noArgPolicyName in policies) {
                 args[noArgPolicyName] = "".toJsonElement()
             }
@@ -205,7 +205,7 @@ class VCVerifyCmd : CliktCommand(
 
     private fun getRevocationPolicyArguments(): Map<out String, JsonElement> {
         val args = mutableMapOf<String, JsonElement>()
-        if ("revoked_status_list" in policies) {
+        if ("revoked-status-list" in policies) {
             args["vc"] = vc.readText().toJsonElement()
         }
 

diff --git a/...-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt b/...-applications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/commands/WaltIdVCVerifyCmdTest.kt
@@ -330,11 +330,11 @@ class WaltIdVCVerifyCmdTest {
     fun `should output Success when the credential does not contain a revocation status list entry`() = runTest {
         val result = command.test(
             listOf(
-                "--policy=revoked_status_list",
+                "--policy=revoked-status-list",
                 signedVCFilePath,
             )
         )
-        assertContains(result.output, "revoked_status_list: Success!")
+        assertContains(result.output, "revoked-status-list: Success!")
     }
 
     private fun sign(vcFilePath: String): String {

diff --git a/...verification-policies/src/commonMain/kotlin/id/walt/policies/policies/RevocationPolicy.kt b/...verification-policies/src/commonMain/kotlin/id/walt/policies/policies/RevocationPolicy.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.json.JsonObject
 abstract class RevocationPolicyMp : CredentialWrapperValidatorPolicy(
 ) {
 
-    override val name = "revoked_status_list"
+    override val name = "revoked-status-list"
     override val description = "Verifies Credential Status"
     override val supportedVCFormats = setOf(VCFormat.jwt_vc, VCFormat.jwt_vc_json, VCFormat.ldp_vc)
 

diff --git a/...erification-policies/src/jvmMain/kotlin/id/walt/policies/policies/RevocationPolicy.jvm.kt b/...erification-policies/src/jvmMain/kotlin/id/walt/policies/policies/RevocationPolicy.jvm.kt
@@ -47,7 +47,7 @@ actual class RevocationPolicy : RevocationPolicyMp() {
             val credentialSubject = payload["vc"]!!.jsonObject["credentialSubject"]?.jsonObject!!
             val encodedList = credentialSubject["encodedList"]?.jsonPrimitive?.content ?: ""
             val bitValue = get(encodedList, statusListIndex)
-            if (bitValue!![0].code == 0) {
+            if (StreamUtils.binToInt(bitValue!!.joinToString("")) == 0) {
                 Result.success(statusListCredentialUrl!!)
             } else {
                 Result.failure(Throwable("Credential has been revoked"))
@@ -67,6 +67,8 @@ object Base64Utils {
 object StreamUtils {
     private const val BITS_PER_BYTE = 8u
 
+    fun binToInt(bin: String) = bin.toInt(2)
+
     fun getBitValue(inputStream: InputStream, index: ULong, bitSize: Int): List<Char> = inputStream.use { stream ->
         //TODO: bitSize constraints
         val bitStartPosition = index * bitSize.toUInt()
@@ -89,4 +91,4 @@ object StreamUtils {
 }
 
 fun get(bitstring: String, idx: ULong? = null, bitSize: Int = 1) =
-    idx?.let { StreamUtils.getBitValue(GZIPInputStream(Base64Utils.decode(bitstring).inputStream()), it, bitSize) }
+    idx?.let { StreamUtils.getBitValue(GZIPInputStream(Base64Utils.decode(bitstring).inputStream()), it, bitSize) }
diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApi.kt
@@ -427,7 +427,7 @@ fun Application.verfierApi() {
                     add("signature")
                     add("expired")
                     add("not-before")
-                    add("revoked_status_list")
+                    add("revoked-status-list")
                 },
                 presentationDefinitionJson = when (scope.contains("openid ver_test:vp_token")) {
                     true -> Json.parseToJsonElement(fixedPresentationDefinitionForEbsiConformanceTest).jsonObject
@@ -458,7 +458,7 @@ private fun getErrorDescription(it: Throwable): String? = when (it.message) {
     "Verification policies did not succeed: not-before" ->
         "<\$presentation_submission.descriptor_map[x].id> is not yet valid"
 
-    "Verification policies did not succeed: revoked_status_list" ->
+    "Verification policies did not succeed: revoked-status-list" ->
         "<\$presentation_submission.descriptor_map[x].id> is revoked"
 
     else -> null

diff --git a/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApiExamples.kt b/waltid-services/waltid-verifier-api/src/main/kotlin/id/walt/verifier/VerifierApiExamples.kt
@@ -114,7 +114,7 @@ object VerifierApiExamples {
         """
             {
                 "vp_policies": $vpPolicyMinMaxData,
-                "vc_policies": ${vcPoliciesData("\"revoked_status_list\"")},
+                "vc_policies": ${vcPoliciesData("\"revoked-status-list\"")},
                 "request_credentials":
                 [
                     { "format": "jwt_vc_json", "type": "OpenBadgeCredential" },
@@ -131,7 +131,7 @@ object VerifierApiExamples {
         """
             {
                 "vp_policies": $vpPolicyMinMaxData,
-                "vc_policies": ${vcPoliciesData("\"revoked_status_list\"")},
+                "vc_policies": ${vcPoliciesData("\"revoked-status-list\"")},
                 "request_credentials":
                 [
                     { "format": "jwt_vc_json", "type": "VerifiableId" },
@@ -157,7 +157,7 @@ object VerifierApiExamples {
         """
             {
                 "vp_policies": $vpPolicyMinMaxData,
-                "vc_policies": ${vcPoliciesData("\"revoked_status_list\"")},
+                "vc_policies": ${vcPoliciesData("\"revoked-status-list\"")},
                 "request_credentials":
                 [
                     { "format": "jwt_vc_json", "type": "VerifiableId" },
@@ -229,7 +229,7 @@ object VerifierApiExamples {
     val EbsiVerifiablePDA1 = jsonObjectValueExampleDescriptorDsl(
         """
             {
-                "vc_policies": ${vcPoliciesData("\"revoked_status_list\"")},
+                "vc_policies": ${vcPoliciesData("\"revoked-status-list\"")},
                 "request_credentials":
                 [
                     { "input_descriptor": {