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

Jump to bottom

fix: more resilient checks in verify signed attachments #2609

Merged
merged 2 commits into from
Nov 18, 2023
Merged

fix: more resilient checks in verify signed attachments #2609

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e0fec6
fix: more resilient checks in verify signed attachments
dbluhm Nov 17, 2023
d0b6bfd
Merge branch 'main' into fix/signed-attach-resilience
swcurran Nov 17, 2023
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
16 changes: 11 additions & 5 deletions aries_cloudagent/messaging/decorators/attach_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,19 @@ async def verify(self, wallet: BaseWallet, signer_verkey: str = None) -> bool:

sign_input = (b64_protected + "." + b64_payload).encode("ascii")
b_sig = b64_to_bytes(b64_sig, urlsafe=True)
verkey = bytes_to_b58(b64_to_bytes(protected["jwk"]["x"], urlsafe=True))
encoded_pk = DIDKey.from_did(protected["jwk"]["kid"]).public_key_b58
verkey_to_check.append(encoded_pk)
jwk = protected["jwk"]
verkey = bytes_to_b58(b64_to_bytes(jwk["x"], urlsafe=True))
if not await wallet.verify_message(sign_input, b_sig, verkey, ED25519):
return False
if not await wallet.verify_message(sign_input, b_sig, encoded_pk, ED25519):
return False

if "kid" in jwk:
encoded_pk = DIDKey.from_did(protected["jwk"]["kid"]).public_key_b58
verkey_to_check.append(encoded_pk)
if not await wallet.verify_message(
sign_input, b_sig, encoded_pk, ED25519
):
return False

if signer_verkey and signer_verkey not in verkey_to_check:
return False
return True
Expand Down