Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Cross-signing [4/4] -- federation edition #5727

Merged
merged 18 commits into from
Nov 1, 2019

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Jul 19, 2019

Implements the federation bits of cross-signing.

ref: MSC1756

@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part2 branch from 9306355 to 9d38b5e Compare July 22, 2019 16:54
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part3 branch from 8a22a9e to 5ad0237 Compare July 22, 2019 17:05
@uhoreg uhoreg requested a review from a team July 22, 2019 21:07
@richvdh
Copy link
Member

richvdh commented Jul 23, 2019

going to await #4970 before reviewing this one

@richvdh richvdh removed the request for review from a team July 23, 2019 12:09
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part3 branch from 5ad0237 to 4f3bcc6 Compare August 7, 2019 22:05
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part2 branch from 47c5925 to 415d0a0 Compare September 6, 2019 20:55
@neilisfragile neilisfragile changed the title Cross-signing [3/3] -- federation edition Cross-signing [4/4] -- federation edition Oct 7, 2019
@dbkr dbkr added the z-cross-signing-sprint (Deprecated Label) label Oct 22, 2019
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part3 branch from 4f3bcc6 to 1fabf82 Compare October 23, 2019 01:48
@uhoreg uhoreg changed the base branch from uhoreg/e2e_cross-signing2-part2 to develop October 23, 2019 01:59
@@ -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):
Copy link
Member Author

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.

@uhoreg
Copy link
Member Author

uhoreg commented Oct 25, 2019

This should be ready for review now. The sytest failure is due to #6254

@uhoreg uhoreg requested a review from a team October 25, 2019 03:03
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/devices.py Show resolved Hide resolved
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
synapse/handlers/e2e_keys.py Outdated Show resolved Hide resolved
synapse/handlers/e2e_keys.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
synapse/handlers/e2e_keys.py Outdated Show resolved Hide resolved
@uhoreg
Copy link
Member Author

uhoreg commented Oct 30, 2019

Ready for re-review. Again, the sytest failure is due to #6254.

@uhoreg uhoreg requested a review from richvdh October 30, 2019 19:57
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢

synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
@uhoreg uhoreg merged commit 53d7680 into develop Nov 1, 2019
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
@DMRobertson DMRobertson deleted the uhoreg/e2e_cross-signing2-part3 branch June 28, 2022 11:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
z-cross-signing-sprint (Deprecated Label)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants