Fix CAIP-122 verification #193
Merged
Conversation
This file contains 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
wilwade
commented
Oct 10, 2024
wilwade
commented
Oct 10, 2024
wilwade
commented
Oct 10, 2024
| @@ -4,7 +4,7 @@ | |||
| "encodedValue": "f6akufkq9Lex6rT8RCEDRuoZQRgo5pWiRzeo81nmKNGWGNJdJ", | |||
| "encoding": "base58", | |||
| "format": "ss58", | |||
| "type": "SR25519" | |||
| "type": "Sr25519" | |||
There was a problem hiding this comment.
Switch is due to how FA is doing things. No really matter either way
wilwade
commented
Oct 10, 2024
| @@ -20,14 +21,17 @@ interface SiwxMessage { | |||
| nonce: string; | |||
| expired: boolean; | |||
| issuedAt: Date; | |||
| expirationTime: Date; | |||
| expirationTime?: Date; | |||
wilwade
commented
Oct 10, 2024
| @@ -54,6 +58,36 @@ function parseMessage(message: string): SiwxMessage { | |||
| }; | |||
| } | |||
|
|
|||
| // SIWA is switching away from this, but we should still support it for now | |||
| function verifySignatureHashMaybeWrapped(publicKey: string, signature: string, message: Uint8Array): boolean { | |||
| const unwrappedSigned = message.length > 256 ? blake2AsU8a(message) : message; | |||
There was a problem hiding this comment.
This is from how the Polkadot-SDK signs payloads. We might want to require it, but for now we support it either way.
wilwade
commented
Oct 10, 2024
| @@ -84,4 +84,11 @@ describe('validateSiwfResponse', () => { | |||
| 'Response failed to correctly parse or invalid content: {"foo":"bad"}' | |||
| ); | |||
| }); | |||
|
|
|||
| it('throws on a bad domain', async () => { | |||
enddynayn
reviewed
Oct 10, 2024
|
|
||
| // Support both wrapped and unwrapped signatures | ||
| const wrappedSignedBytes = u8aWrapBytes(message); | ||
| const wrappedSigned = wrappedSignedBytes.length > 256 ? blake2AsU8a(wrappedSignedBytes) : wrappedSignedBytes; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
Various issues found when testing the CAIP-122 signature verification
Solution
publicKeyshould beSrnotSR(verification doesn't care however)