Skip to content

Commit

Permalink
Revert "verificationhelper: save verification status in store"
Browse files Browse the repository at this point in the history 
Reverts commit 40dbe75

Signed-off-by: Sumner Evans <[email protected]>
  • Loading branch information
@sumnerevans
sumnerevans committed Nov 22, 2024
1 parent b4551fc commit aef1397
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 417 deletions.
69 changes: 31 additions & 38 deletions crypto/verificationhelper/reciprocate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by
vh.activeTransactionsLock.Lock()
defer vh.activeTransactionsLock.Unlock()

txn, err := vh.store.GetVerificationTransaction(ctx, qrCode.TransactionID)
if err != nil {
return fmt.Errorf("failed to get transaction %s: %w", qrCode.TransactionID, err)
} else if txn.VerificationState != VerificationStateReady {
txn, ok := vh.activeTransactions[qrCode.TransactionID]
if !ok {
return fmt.Errorf("unknown transaction ID found in QR code")
} else if txn.VerificationState != verificationStateReady {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeUnexpectedMessage, "transaction found in the QR code is not in the ready state")
}
txn.VerificationState = VerificationStateTheirQRScanned
txn.VerificationState = verificationStateTheirQRScanned

// Verify the keys
log.Info().Msg("Verifying keys from QR code")
Expand All @@ -53,9 +53,9 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by

switch qrCode.Mode {
case QRCodeModeCrossSigning:
theirSigningKeys, err := vh.mach.GetCrossSigningPublicKeys(ctx, txn.TheirUserID)
theirSigningKeys, err := vh.mach.GetCrossSigningPublicKeys(ctx, txn.TheirUser)
if err != nil {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeKeyMismatch, "couldn't get %s's cross-signing keys: %w", txn.TheirUserID, err)
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeKeyMismatch, "couldn't get %s's cross-signing keys: %w", txn.TheirUser, err)
}
if bytes.Equal(theirSigningKeys.MasterKey.Bytes(), qrCode.Key1[:]) {
log.Info().Msg("Verified that the other device has the master key we expected")
Expand All @@ -70,15 +70,15 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeKeyMismatch, "the master key does not match")
}

if err := vh.mach.SignUser(ctx, txn.TheirUserID, theirSigningKeys.MasterKey); err != nil {
if err := vh.mach.SignUser(ctx, txn.TheirUser, theirSigningKeys.MasterKey); err != nil {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeInternalError, "failed to sign their master key: %w", err)
}
case QRCodeModeSelfVerifyingMasterKeyTrusted:
// The QR was created by a device that trusts the master key, which
// means that we don't trust the key. Key1 is the master key public
// key, and Key2 is what the other device thinks our device key is.

if vh.client.UserID != txn.TheirUserID {
if vh.client.UserID != txn.TheirUser {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeUnexpectedMessage, "mode %d is only allowed when the other user is the same as the current user", qrCode.Mode)
}

Expand Down Expand Up @@ -114,12 +114,12 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeMasterKeyNotTrusted, "the master key is not trusted by this device, cannot verify device that does not trust the master key")
}

if vh.client.UserID != txn.TheirUserID {
if vh.client.UserID != txn.TheirUser {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeUnexpectedMessage, "mode %d is only allowed when the other user is the same as the current user", qrCode.Mode)
}

// Get their device
theirDevice, err := vh.mach.GetOrFetchDevice(ctx, txn.TheirUserID, txn.TheirDeviceID)
theirDevice, err := vh.mach.GetOrFetchDevice(ctx, txn.TheirUser, txn.TheirDevice)
if err != nil {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeInternalError, "failed to get their device: %w", err)
}
Expand All @@ -140,7 +140,7 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by

// Trust their device
theirDevice.Trust = id.TrustStateVerified
err = vh.mach.CryptoStore.PutDevice(ctx, txn.TheirUserID, theirDevice)
err = vh.mach.CryptoStore.PutDevice(ctx, txn.TheirUser, theirDevice)
if err != nil {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeInternalError, "failed to update device trust state after verifying: %+v", err)
}
Expand Down Expand Up @@ -177,12 +177,8 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by
txn.SentOurDone = true
if txn.ReceivedTheirDone {
log.Debug().Msg("We already received their done event. Setting verification state to done.")
if err = vh.store.DeleteVerification(ctx, txn.TransactionID); err != nil {
return err
}
delete(vh.activeTransactions, txn.TransactionID)
vh.verificationDone(ctx, txn.TransactionID)
} else {
vh.store.SaveVerificationTransaction(ctx, txn)
}
return nil
}
Expand All @@ -200,27 +196,28 @@ func (vh *VerificationHelper) ConfirmQRCodeScanned(ctx context.Context, txnID id

vh.activeTransactionsLock.Lock()
defer vh.activeTransactionsLock.Unlock()
txn, err := vh.store.GetVerificationTransaction(ctx, txnID)
if err != nil {
return fmt.Errorf("failed to get transaction %s: %w", txnID, err)
} else if txn.VerificationState != VerificationStateOurQRScanned {
txn, ok := vh.activeTransactions[txnID]
if !ok {
log.Warn().Msg("Ignoring QR code scan confirmation for an unknown transaction")
return nil
} else if txn.VerificationState != verificationStateOurQRScanned {
return fmt.Errorf("transaction is not in the scanned state")
}

log.Info().Msg("Confirming QR code scanned")

if txn.TheirUserID == vh.client.UserID {
if txn.TheirUser == vh.client.UserID {
// Self-signing situation. Trust their device.

// Get their device
theirDevice, err := vh.mach.GetOrFetchDevice(ctx, txn.TheirUserID, txn.TheirDeviceID)
theirDevice, err := vh.mach.GetOrFetchDevice(ctx, txn.TheirUser, txn.TheirDevice)
if err != nil {
return err
}

// Trust their device
theirDevice.Trust = id.TrustStateVerified
err = vh.mach.CryptoStore.PutDevice(ctx, txn.TheirUserID, theirDevice)
err = vh.mach.CryptoStore.PutDevice(ctx, txn.TheirUser, theirDevice)
if err != nil {
return fmt.Errorf("failed to update device trust state after verifying: %w", err)
}
Expand All @@ -234,33 +231,29 @@ func (vh *VerificationHelper) ConfirmQRCodeScanned(ctx context.Context, txnID id
}
} else {
// Cross-signing situation. Sign their master key.
theirSigningKeys, err := vh.mach.GetCrossSigningPublicKeys(ctx, txn.TheirUserID)
theirSigningKeys, err := vh.mach.GetCrossSigningPublicKeys(ctx, txn.TheirUser)
if err != nil {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeKeyMismatch, "couldn't get %s's cross-signing keys: %w", txn.TheirUserID, err)
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeKeyMismatch, "couldn't get %s's cross-signing keys: %w", txn.TheirUser, err)
}

if err := vh.mach.SignUser(ctx, txn.TheirUserID, theirSigningKeys.MasterKey); err != nil {
if err := vh.mach.SignUser(ctx, txn.TheirUser, theirSigningKeys.MasterKey); err != nil {
return vh.cancelVerificationTxn(ctx, txn, event.VerificationCancelCodeInternalError, "failed to sign their master key: %w", err)
}
}

err = vh.sendVerificationEvent(ctx, txn, event.InRoomVerificationDone, &event.VerificationDoneEventContent{})
err := vh.sendVerificationEvent(ctx, txn, event.InRoomVerificationDone, &event.VerificationDoneEventContent{})
if err != nil {
return err
}
txn.SentOurDone = true
if txn.ReceivedTheirDone {
if err = vh.store.DeleteVerification(ctx, txn.TransactionID); err != nil {
return err
}
delete(vh.activeTransactions, txn.TransactionID)
vh.verificationDone(ctx, txn.TransactionID)
} else {
vh.store.SaveVerificationTransaction(ctx, txn)
}
return nil
}

func (vh *VerificationHelper) generateAndShowQRCode(ctx context.Context, txn VerificationTransaction) error {
func (vh *VerificationHelper) generateAndShowQRCode(ctx context.Context, txn *verificationTransaction) error {
log := vh.getLog(ctx).With().
Str("verification_action", "generate and show QR code").
Stringer("transaction_id", txn.TransactionID).
Expand All @@ -283,7 +276,7 @@ func (vh *VerificationHelper) generateAndShowQRCode(ctx context.Context, txn Ver
return err
}
mode := QRCodeModeCrossSigning
if vh.client.UserID == txn.TheirUserID {
if vh.client.UserID == txn.TheirUser {
// This is a self-signing situation.
if ownMasterKeyTrusted {
mode = QRCodeModeSelfVerifyingMasterKeyTrusted
Expand All @@ -305,7 +298,7 @@ func (vh *VerificationHelper) generateAndShowQRCode(ctx context.Context, txn Ver
key1 = ownCrossSigningPublicKeys.MasterKey.Bytes()

// Key 2 is the other user's master signing key.
theirSigningKeys, err := vh.mach.GetCrossSigningPublicKeys(ctx, txn.TheirUserID)
theirSigningKeys, err := vh.mach.GetCrossSigningPublicKeys(ctx, txn.TheirUser)
if err != nil {
return err
}
Expand All @@ -315,7 +308,7 @@ func (vh *VerificationHelper) generateAndShowQRCode(ctx context.Context, txn Ver
key1 = ownCrossSigningPublicKeys.MasterKey.Bytes()

// Key 2 is the other device's key.
theirDevice, err := vh.mach.GetOrFetchDevice(ctx, txn.TheirUserID, txn.TheirDeviceID)
theirDevice, err := vh.mach.GetOrFetchDevice(ctx, txn.TheirUser, txn.TheirDevice)
if err != nil {
return err
}
Expand All @@ -333,5 +326,5 @@ func (vh *VerificationHelper) generateAndShowQRCode(ctx context.Context, txn Ver
qrCode := NewQRCode(mode, txn.TransactionID, [32]byte(key1), [32]byte(key2))
txn.QRCodeSharedSecret = qrCode.SharedSecret
vh.showQRCode(ctx, txn.TransactionID, qrCode)
return vh.store.SaveVerificationTransaction(ctx, txn)
return nil
}
Loading

0 comments on commit aef1397

Please sign in to comment.