This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Cross-signing [4/4] -- federation edition #5727
Merged
Merged
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
uhoreg
force-pushed
the
uhoreg/e2e_cross-signing2-part2
branch
from
July 22, 2019 16:54
9306355
to
9d38b5e
Compare
uhoreg
force-pushed
the
uhoreg/e2e_cross-signing2-part3
branch
from
July 22, 2019 17:05
8a22a9e
to
5ad0237
Compare
going to await #4970 before reviewing this one |
uhoreg
force-pushed
the
uhoreg/e2e_cross-signing2-part3
branch
from
August 7, 2019 22:05
5ad0237
to
4f3bcc6
Compare
uhoreg
force-pushed
the
uhoreg/e2e_cross-signing2-part2
branch
from
September 6, 2019 20:55
47c5925
to
415d0a0
Compare
neilisfragile
changed the title
Cross-signing [3/3] -- federation edition
Cross-signing [4/4] -- federation edition
Oct 7, 2019
uhoreg
force-pushed
the
uhoreg/e2e_cross-signing2-part3
branch
from
October 23, 2019 01:48
4f3bcc6
to
1fabf82
Compare
uhoreg
changed the base branch from
uhoreg/e2e_cross-signing2-part2
to
develop
October 23, 2019 01:59
uhoreg
commented
Oct 25, 2019
@@ -248,6 +248,73 @@ def _count_e2e_one_time_keys(txn): | |||
|
|||
return self.runInteraction("count_e2e_one_time_keys", _count_e2e_one_time_keys) | |||
|
|||
def _get_e2e_cross_signing_key_txn(self, txn, user_id, key_type, from_user_id=None): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just moving these functions from EndToEndKeyStore
to EndToEndKeyWorkerStore
so that it works with workers.
This should be ready for review now. The sytest failure is due to #6254 |
richvdh
suggested changes
Oct 29, 2019
Ready for re-review. Again, the sytest failure is due to #6254. |
richvdh
approved these changes
Oct 31, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚢
Co-Authored-By: Richard van der Hoff <[email protected]>
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit '53d7680e3': Update synapse/storage/data_stores/main/devices.py rename get_devices_by_remote to get_device_updates_by_remote black apply changes as a result of PR review don't error if federation query doesn't have cross-signing keys move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with workers black vendor-prefix the EDU name until MSC1756 is merged into the spec fix unit test add news file update to work with newer code, and fix formatting add missing param make black happy don't crash if the user doesn't have cross-signing keys implement federation parts of cross-signing
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Implements the federation bits of cross-signing.
ref: MSC1756