Skip to content

fix(verification): use remote master key in ConfirmSAS #554

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

Open
underhax wants to merge 1 commit into
base: main
Choose a base branch
from
+76 −1
Open

fix(verification): use remote master key in ConfirmSAS #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion crypto/verificationhelper/sas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (vh *VerificationHelper) ConfirmSAS(ctx context.Context, txnID id.Verificat
if txn.ReceivedTheirMAC {
txn.VerificationState = VerificationStateSASMACExchanged

if err := vh.trustKeysAfterMACCheck(ctx, txn, masterKey); err != nil {
if err := vh.trustKeysAfterMACCheck(ctx, txn, txn.TheirMasterKey); err != nil {
return fmt.Errorf("failed to trust keys: %w", err)
}

Expand Down Expand Up @@ -750,6 +750,7 @@ func (vh *VerificationHelper) onVerificationMAC(ctx context.Context, txn Verific
log.Info().Msg("All MACs verified")

txn.ReceivedTheirMAC = true
txn.TheirMasterKey = masterKey
if txn.SentOurMAC {
txn.VerificationState = VerificationStateSASMACExchanged

Expand Down
73 changes: 73 additions & 0 deletions crypto/verificationhelper/verificationhelper_sas_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,3 +358,76 @@ func TestVerification_SAS_BothCallStart(t *testing.T) {
assert.True(t, sendingCallbacks.IsVerificationDone(txnID))
assert.True(t, receivingCallbacks.IsVerificationDone(txnID))
}

func TestCrossSignVerification_SAS(t *testing.T) {
ctx := log.Logger.WithContext(t.Context())

testCases := []struct {
sendingConfirmsFirst bool
}{
{true},
{false},
}

for _, tc := range testCases {
t.Run(fmt.Sprintf("sendingConfirmsFirst=%t", tc.sendingConfirmsFirst), func(t *testing.T) {
ts, sendingClient, receivingClient, _, _, sendingMachine, receivingMachine := initServerAndLoginAliceBob(t, ctx)
sendingCallbacks, receivingCallbacks, sendingHelper, receivingHelper := initDefaultCallbacks(t, ctx, sendingClient, receivingClient, sendingMachine, receivingMachine)
var err error

_, _, err = sendingMachine.GenerateAndUploadCrossSigningKeys(ctx, nil, "")
require.NoError(t, err)
_, _, err = receivingMachine.GenerateAndUploadCrossSigningKeys(ctx, nil, "")
require.NoError(t, err)

_, err = sendingMachine.FetchKeys(ctx, []id.UserID{bobUserID}, true)
require.NoError(t, err)
_, err = receivingMachine.FetchKeys(ctx, []id.UserID{aliceUserID}, true)
require.NoError(t, err)

txnID, err := sendingHelper.StartVerification(ctx, bobUserID)
require.NoError(t, err)
ts.DispatchToDevice(t, ctx, receivingClient)
err = receivingHelper.AcceptVerification(ctx, txnID)
require.NoError(t, err)
ts.DispatchToDevice(t, ctx, sendingClient)

err = sendingHelper.StartSAS(ctx, txnID)
require.NoError(t, err)

ts.DispatchToDevice(t, ctx, receivingClient)
ts.DispatchToDevice(t, ctx, sendingClient)
ts.DispatchToDevice(t, ctx, receivingClient)
ts.DispatchToDevice(t, ctx, sendingClient)

assert.Equal(t, sendingCallbacks.GetDecimalsShown(txnID), receivingCallbacks.GetDecimalsShown(txnID))

if tc.sendingConfirmsFirst {
err = sendingHelper.ConfirmSAS(ctx, txnID)
require.NoError(t, err)

ts.DispatchToDevice(t, ctx, receivingClient)

err = receivingHelper.ConfirmSAS(ctx, txnID)
require.NoError(t, err)

ts.DispatchToDevice(t, ctx, sendingClient)
ts.DispatchToDevice(t, ctx, receivingClient)
} else {
err = receivingHelper.ConfirmSAS(ctx, txnID)
require.NoError(t, err)

ts.DispatchToDevice(t, ctx, sendingClient)

err = sendingHelper.ConfirmSAS(ctx, txnID)
require.NoError(t, err)

ts.DispatchToDevice(t, ctx, receivingClient)
ts.DispatchToDevice(t, ctx, sendingClient)
}

assert.True(t, sendingCallbacks.IsVerificationDone(txnID))
assert.True(t, receivingCallbacks.IsVerificationDone(txnID))
})
}
}
1 change: 1 addition & 0 deletions crypto/verificationhelper/verificationstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ type VerificationTransaction struct {
EphemeralPublicKeyShared bool `json:"ephemeral_public_key_shared,omitempty"` // Whether this device's ephemeral public key has been shared
OtherPublicKey *ECDHPublicKey `json:"other_public_key,omitempty"` // The other device's ephemeral public key
ReceivedTheirMAC bool `json:"received_their_mac,omitempty"` // Whether we have received their MAC
TheirMasterKey string `json:"their_master_key,omitempty"` // The other user's master key from their MAC event
SentOurMAC bool `json:"sent_our_mac,omitempty"` // Whether we have sent our MAC
ReceivedTheirDone bool `json:"received_their_done,omitempty"` // Whether we have received their done event
SentOurDone bool `json:"sent_our_done,omitempty"` // Whether we have sent our done event
Expand Down