mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-04-29 05:44:10 +02:00
fixup! e2ee/device verification: move general error handling under framework
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
This commit is contained in:
parent
3fbb048689
commit
d6c6a0361f
|
|
@ -602,24 +602,27 @@ package naming convention.
|
||||||
At any point the interactive verification can go wrong. The following describes
|
At any point the interactive verification can go wrong. The following describes
|
||||||
what to do when an error happens:
|
what to do when an error happens:
|
||||||
|
|
||||||
- Alice or Bob can cancel the verification at any time. An
|
- Alice or Bob can cancel the verification at any time. An
|
||||||
[`m.key.verification.cancel`](#mkeyverificationcancel) message must be sent to signify the
|
[`m.key.verification.cancel`](#mkeyverificationcancel) message must be sent to
|
||||||
cancellation.
|
signify the cancellation.
|
||||||
- The verification can time out. Clients should time out a verification that
|
- The verification can time out. Clients should time out a verification that
|
||||||
does not complete within 10 minutes. Additionally, clients should expire a
|
does not complete within 10 minutes. Additionally, clients should expire a
|
||||||
`transaction_id` which goes unused for 10 minutes after having last
|
`transaction_id` which goes unused for 10 minutes after having last
|
||||||
sent/received it. The client should inform the user that the verification
|
sent/received it. The client should inform the user that the verification
|
||||||
timed out, and send an appropriate `m.key.verification.cancel` message to
|
timed out, and send an appropriate
|
||||||
the other device.
|
[`m.key.verification.cancel`](#mkeyverificationcancel) message to the other
|
||||||
- When the same device attempts to initiate multiple verification attempts,
|
device.
|
||||||
the recipient should cancel all attempts with that device.
|
- When the same device attempts to initiate multiple verification attempts,
|
||||||
- When a device receives an unknown `transaction_id`, it should send an
|
the recipient should cancel all attempts with that device.
|
||||||
appropriate `m.key.verification.cancel` message to the other device
|
- When a device receives an unknown `transaction_id`, it should send an
|
||||||
indicating as such. This does not apply for inbound
|
appropriate [`m.key.verification.cancel`](#mkeyverificationcancel) message to
|
||||||
`m.key.verification.request` or `m.key.verification.cancel` messages.
|
the other device indicating as such. This does not apply for inbound
|
||||||
- If the device receives a message out of sequence or that it was not
|
[`m.key.verification.request`](#mkeyverificationrequest),
|
||||||
expecting, it should notify the other device with an appropriate
|
[`m.key.verification.start`](#mkeyverificationstart), or
|
||||||
`m.key.verification.cancel` message.
|
[`m.key.verification.cancel`](#mkeyverificationcancel) messages.
|
||||||
|
- If the device receives a message out of sequence or that it was not expecting,
|
||||||
|
it should notify the other device with an appropriate
|
||||||
|
[`m.key.verification.cancel`](#mkeyverificationcancel) message.
|
||||||
|
|
||||||
##### Short Authentication String (SAS) verification
|
##### Short Authentication String (SAS) verification
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue