Element-R: await /keys/query during Verification requests
#3932
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
andybalaam
approved these changes
Dec 4, 2023
| @@ -322,6 +333,10 @@ export class RustVerificationRequest | |||
| throw new Error(`Unsupported verification method ${method}`); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Is this the critical part that causes us to avoid the race? If so, can we have a comment here explaining that?
There was a problem hiding this comment.
yes, sorry. Have added a comment.
richvdh
commented
Dec 4, 2023
richvdh
added a commit
to matrix-org/matrix-react-sdk
that referenced
this pull request
Dec 5, 2023
This should now be fixed, thanks to matrix-org/matrix-js-sdk#3932.
This was referenced Dec 5, 2023
github-merge-queue bot
pushed a commit
to matrix-org/matrix-react-sdk
that referenced
this pull request
Dec 5, 2023
This should now be fixed, thanks to matrix-org/matrix-js-sdk#3932.
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.
If the acceptance of an incoming verification request races with a
/keys/queryfor the other user, then subsequent operations can fail (see matrix-org/matrix-rust-sdk#2896).This is a slightly hacky workaround that means we wait for the devicelist to arrive for the relevant operations.
Required for a fix to element-hq/element-web#26420.
This change is marked as an internal change (Task), so will not be included in the changelog.