fix(verification): use remote master key in ConfirmSAS - #554
Open
underhax wants to merge 1 commit into
Open
Conversation
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
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 cross-user SAS verification failure (
failed to trust keys: master keys do not match) when the remote user confirms the SAS emojis before the local user does.Problem Description
In
verificationhelper, cross-user (cross-account) SAS verification fails withfailed to trust keys: master keys do not matchif the remote user confirms the SAS emojis before the local user does. If the local user confirms first, the verification succeeds.This happens because the local
ConfirmSASfunction mistakenly passes the local user's master key totrustKeysAfterMACCheck, which expects the remote user's master key for cross-signing verification.Root Cause
In
ConfirmSAS,masterKeywas populated with the local user's own master key:When the remote user confirmed first (
txn.ReceivedTheirMAC == true),ConfirmSAScalled:In cross-user verification (
txn.TheirUserID != vh.client.UserID),trustKeysAfterMACCheckcomparestheirSigningKeys.MasterKeywith the passedmasterKey. SincemasterKeycontained the local user's master key, verification failed withmaster keys do not match.Solution
TheirMasterKeyfield toVerificationTransactionto preserve the remote master key extracted inonVerificationMAC.ConfirmSASto passtxn.TheirMasterKeytotrustKeysAfterMACCheck.TestCrossSignVerification_SAStoverificationhelper_sas_test.gocovering both confirmation orders (sendingConfirmsFirst = true/false).Checklist