fix: prefer JWS header kid over jwk.kid in attach decorator verify (fixes #4077)#4085
Merged
PatStLouis merged 4 commits intoMar 17, 2026
Conversation
…ixes openwallet-foundation#4077) When verifying JWS in attach decorator data, use kid from the JWS unprotected header first (canonical per spec). Fall back to jwk.kid only when header has no kid. Fixes DIDComm connection failure with agents (e.g. Credo) that put kid only in header and not in jwk. Add test for verify when kid is only in JWS header. Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca> Made-with: Cursor
Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca> Made-with: Cursor
- test_verify_uses_kid_from_jwk_when_header_has_no_kid: cover jwk.kid fallback - test_verify_returns_false_when_signer_verkey_does_not_match: cover signer_verkey rejection - Apply ruff format Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca> Made-with: Cursor
jamshale
approved these changes
Mar 12, 2026
|
PatStLouis
merged commit ad5ea22
into
openwallet-foundation:main
12 of 13 checks passed
PatStLouis
added a commit
to OpSecId/acapy
that referenced
this pull request
Mar 18, 2026
…ixes openwallet-foundation#4077) When verifying JWS in attach decorator data, use kid from the JWS unprotected header first (canonical per spec). Fall back to jwk.kid only when header has no kid. Fixes DIDComm connection failure with agents (e.g. Credo) that put kid only in header and not in jwk. Backport of openwallet-foundation#4085 for 1.2.lts. - Add test_verify_uses_kid_from_header_when_jwk_has_no_kid - Add test_verify_uses_kid_from_jwk_when_header_has_no_kid - Add test_verify_returns_false_when_signer_verkey_does_not_match Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca> Made-with: Cursor
PatStLouis
added a commit
to OpSecId/acapy
that referenced
this pull request
Mar 18, 2026
…ixes openwallet-foundation#4077) When verifying JWS in attach decorator data, use kid from the JWS unprotected header first (canonical per spec). Fall back to jwk.kid only when header has no kid. Fixes DIDComm connection failure with agents (e.g. Credo) that put kid only in header and not in jwk. Backport of openwallet-foundation#4085 for 1.3.lts. - Add test_verify_uses_kid_from_header_when_jwk_has_no_kid - Add test_verify_uses_kid_from_jwk_when_header_has_no_kid - Add test_verify_returns_false_when_signer_verkey_does_not_match Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca> Made-with: Cursor
This was referenced Mar 18, 2026
jamshale
pushed a commit
that referenced
this pull request
Mar 18, 2026
…ixes #4077) (#4094) When verifying JWS in attach decorator data, use kid from the JWS unprotected header first (canonical per spec). Fall back to jwk.kid only when header has no kid. Fixes DIDComm connection failure with agents (e.g. Credo) that put kid only in header and not in jwk. Backport of #4085 for 1.2.lts. - Add test_verify_uses_kid_from_header_when_jwk_has_no_kid - Add test_verify_uses_kid_from_jwk_when_header_has_no_kid - Add test_verify_returns_false_when_signer_verkey_does_not_match Made-with: Cursor Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca>
jamshale
pushed a commit
that referenced
this pull request
Mar 18, 2026
…ixes #4077) (#4095) When verifying JWS in attach decorator data, use kid from the JWS unprotected header first (canonical per spec). Fall back to jwk.kid only when header has no kid. Fixes DIDComm connection failure with agents (e.g. Credo) that put kid only in header and not in jwk. Backport of #4085 for 1.3.lts. - Add test_verify_uses_kid_from_header_when_jwk_has_no_kid - Add test_verify_uses_kid_from_jwk_when_header_has_no_kid - Add test_verify_returns_false_when_signer_verkey_does_not_match Made-with: Cursor Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes DIDComm connection failure with Credo (and other agents) when they put
kidonly in the JWS unprotected header and not injwk.Problem
During didexchange, ACA-Py's
verify()in the attach decorator only readkidfromprotected["jwk"]["kid"]. Agents like Credo sendkidin the JWS header (per spec). That led toValueErrorinDIDKey.from_did()or failed verification (issue #4077).Solution
sig.header.kidwhen present (canonical place per spec).protected["jwk"]["kid"]when the header has nokid.Testing
test_verify_uses_kid_from_header_when_jwk_has_no_kid(JWS with kid only in header).test_attach_decorator.pytests pass.Made with Cursor