Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WAL-775: Verifier presentation definition policy bug fixes #861

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

WAL-775: Verifier presentation definition policy bug fixes #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d613bd7
feat: fix json path evaluation in presentation definition policy, add…
cpatsonakis Dec 18, 2024
4397cb8
docs: fix verifier OpenAPI examples to reflect correct json path values
cpatsonakis Dec 18, 2024
054bda3
Merge branch 'main' into wal-775
cpatsonakis Dec 19, 2024
d4b36e5
test: preliminary test cases and infrastructure for elaborate present…
cpatsonakis Dec 19, 2024
b868f58
fix: out of order input descriptor to credential matching, ensure all…
cpatsonakis Dec 19, 2024
655b41f
test: wildcard test cases with and without disclosure provision by th…
cpatsonakis Dec 19, 2024
b58b2d7
Merge branch 'main' into wal-775
cpatsonakis Dec 19, 2024
8ad4d1a
refactor: fix function name, OpenApi example value and remove unneces…
cpatsonakis Dec 19, 2024
c1693ca
Merge branch 'main' into wal-775
cpatsonakis Dec 19, 2024
156cde3
Merge branch 'main' into wal-775
cpatsonakis Dec 20, 2024
13d43e6
fix: ietf sd-jwt vc ensure all input descriptors are evaluated, add s…
cpatsonakis Dec 20, 2024
0dbb4b5
test: multi descriptor cases for w3c and ietf vcs
cpatsonakis Dec 20, 2024
a1ac332
Merge branch 'main' into wal-775
cpatsonakis Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions ...licies/src/commonMain/kotlin/id/walt/policies/policies/vp/PresentationDefinitionPolicy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import id.walt.definitionparser.PresentationSubmission
import id.walt.policies.CredentialWrapperValidatorPolicy
import id.walt.sdjwt.SDJwt
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.toList
import kotlinx.serialization.Serializable
Expand All @@ -28,36 +29,40 @@ class PresentationDefinitionPolicy : CredentialWrapperValidatorPolicy(
val presentationDefinition = context["presentationDefinition"]?.toJsonElement()
?.let { Json.decodeFromJsonElement<PresentationDefinition>(it) }
?: throw IllegalArgumentException("No presentationDefinition in context!")
require(presentationDefinition.inputDescriptors.isNotEmpty()) {
"No input descriptors were found. " +
"At least one is required in the context of the presentation definition policy."
}
val presentationSubmission = context["presentationSubmission"]?.toJsonElement()
?.let { Json.decodeFromJsonElement<PresentationSubmission>(it) }
?: throw IllegalArgumentException("No presentationSubmission in context!")
val format = presentationSubmission.descriptorMap.firstOrNull()?.format?.let { Json.decodeFromJsonElement<VCFormat>(it) }

//val requestedTypes = presentationDefinition.primitiveVerificationGetTypeList()
val format =
presentationSubmission.descriptorMap.firstOrNull()?.format?.let { Json.decodeFromJsonElement<VCFormat>(it) }

val presentedTypes = when(format) {
val presentedTypes = when (format) {
VCFormat.sd_jwt_vc -> listOf(data["vct"]!!.jsonPrimitive.content)
else -> data["vp"]!!.jsonObject["verifiableCredential"]?.jsonArray?.mapNotNull {
it.jsonPrimitive.contentOrNull?.let { SDJwt.parse(it) }?.fullPayload
?.get("vc")?.jsonObject?.get("type")?.jsonArray?.last()?.jsonPrimitive?.contentOrNull
} ?: emptyList()
}

val presentationDefinitionMatch = when(format) {
VCFormat.sd_jwt_vc -> PresentationDefinitionParser.matchCredentialsForInputDescriptor(
flowOf(data), presentationDefinition.inputDescriptors.first()
).toList().isNotEmpty()
else -> data["vp"]!!.jsonObject["verifiableCredential"]?.jsonArray?.mapIndexedNotNull { idx,cred ->
val payload = cred.jsonPrimitive.contentOrNull?.let { SDJwt.parse(it) }?.fullPayload ?: throw IllegalArgumentException("Credential $idx is not a valid JWT string")
val credentialsFlow = when (format) {
VCFormat.sd_jwt_vc -> flowOf(data)

else -> (data["vp"]!!.jsonObject["verifiableCredential"]?.jsonArray?.mapNotNull { vc ->
vc.jsonPrimitive.contentOrNull?.let { SDJwt.parse(it) }?.fullPayload
?: throw IllegalArgumentException("Credential $vc is not a valid (SD-)JWT string")
} ?: emptyList()).asFlow()

PresentationDefinitionParser.matchCredentialsForInputDescriptor(
flowOf(payload["vc"]?.jsonObject ?: payload),
presentationDefinition.inputDescriptors[idx]
).toList().isNotEmpty()
}!!.all { it }
}

val success = /*presentedTypes.containsAll(requestedTypes) &&*/ presentationDefinitionMatch
val success = presentationDefinition.inputDescriptors.map { inputDescriptor ->
PresentationDefinitionParser.matchCredentialsForInputDescriptor(
credentialsFlow,
inputDescriptor,
).toList().isNotEmpty()
}.all { it }

return if (success)
Result.success(presentedTypes)
Expand All @@ -68,11 +73,7 @@ class PresentationDefinitionPolicy : CredentialWrapperValidatorPolicy(
log.debug { "Presented data: $data" }

Result.failure(
id.walt.policies.PresentationDefinitionException(
/*missingCredentialTypes = requestedTypes.minus(
presentedTypes.toSet()
),*/ presentationDefinitionMatch
)
id.walt.policies.PresentationDefinitionException(success)
)
}
}
Expand Down
Loading
Loading