Skip to content

/synapse

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 18 commits into from Nov 1, 2019
Merged

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

merged 18 commits into from Nov 1, 2019

Conversation

@uhoreg
Copy link
Member

uhoreg commented Jul 19, 2019 •
edited by richvdh

Implements the federation bits of cross-signing.

ref: MSC1756
@uhoreg uhoreg mentioned this pull request Jul 19, 2019
Closed
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part2 branch from 9306355 to 9d38b5e Jul 22, 2019
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part3 branch from 8a22a9e to 5ad0237 Jul 22, 2019
@uhoreg uhoreg requested a review from matrix-org/synapse-core Jul 22, 2019
@richvdh

This comment has been minimized.

Sign in to view
Copy link
Member

richvdh commented Jul 23, 2019

going to await #4970 before reviewing this one
@richvdh richvdh removed the request for review from matrix-org/synapse-core Jul 23, 2019
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part3 branch from 5ad0237 to 4f3bcc6 Aug 7, 2019
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part2 branch from 47c5925 to 415d0a0 Sep 6, 2019
@neilisfragile neilisfragile changed the title Cross-signing [3/3] -- federation edition Cross-signing [4/4] -- federation edition Oct 7, 2019
uhoreg added 5 commits May 22, 2019
@uhoreg
implement federation parts of cross-signing
8d3542a
@uhoreg
don't crash if the user doesn't have cross-signing keys
a1aaf3e
@uhoreg
make black happy
cfdb844
@uhoreg
add missing param
41ad35b
@uhoreg
update to work with newer code, and fix formatting
Loading status checks…
1fabf82
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part3 branch from 4f3bcc6 to 1fabf82 Oct 23, 2019
@uhoreg
add news file
Loading status checks…
0563839
@uhoreg uhoreg changed the base branch from uhoreg/e2e_cross-signing2-part2 to develop Oct 23, 2019
uhoreg added 6 commits Oct 23, 2019
@uhoreg
fix unit test
3e3f9b6
@uhoreg
vendor-prefix the EDU name until MSC1756 is merged into the spec
Loading status checks…
404e8c8
@uhoreg
black
Loading status checks…
480eac3
@uhoreg
move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works …
Loading status checks…
dc2cd6f 
…with workers
@uhoreg
don't error if federation query doesn't have cross-signing keys
Loading status checks…
ff05c9b
@uhoreg
Merge branch 'develop' into cross-signing_federation
Loading status checks…
c40d724
@uhoreg
uhoreg reviewed Oct 25, 2019
View changes
synapse/storage/data_stores/main/end_to_end_keys.py Outdated
@@ -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):

This comment has been minimized.

Sign in to view
Copy link
@uhoreg

uhoreg Oct 25, 2019

Author Member

This is just moving these functions from EndToEndKeyStore to EndToEndKeyWorkerStore so that it works with workers.
@uhoreg

This comment has been minimized.

Sign in to view
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 matrix-org/synapse-core Oct 25, 2019
@richvdh
richvdh requested changes Oct 29, 2019
View changes
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 added 2 commits Oct 30, 2019
@uhoreg
apply changes as a result of PR review
Loading status checks…
d78b1e3
@uhoreg
black
Loading status checks…
bc32f10
uhoreg added 2 commits Oct 30, 2019
@uhoreg
Merge branch 'develop' into cross-signing_federation
Loading status checks…
7d7eac6
@uhoreg
rename get_devices_by_remote to get_device_updates_by_remote
Loading status checks…
bb6cec2
@uhoreg

This comment has been minimized.

Sign in to view
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 Oct 30, 2019
@richvdh
richvdh approved these changes Oct 31, 2019
View changes
Copy link
Member

richvdh left a comment

🚢
synapse/storage/data_stores/main/devices.py Outdated Show resolved Hide resolved
uhoreg and others added 2 commits Nov 1, 2019
@uhoreg
Merge branch 'develop' into cross-signing_federation
Loading status checks…
6f4bc6d
@uhoreg @richvdh
Update synapse/storage/data_stores/main/devices.py
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c3fc176 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@uhoreg uhoreg merged commit 53d7680 into develop Nov 1, 2019
20 checks passed
20 checks passed
buildkite/synapse Build #5330 passed (1 hour, 8 minutes, 49 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 26 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 54 seconds)
Details
buildkite/synapse/isort Passed (18 seconds)
Details
buildkite/synapse/mypy Passed (26 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (17 seconds)
Details
buildkite/synapse/packaging Passed (33 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (18 minutes, 14 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (6 minutes, 15 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (8 minutes, 19 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (6 minutes, 53 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (17 minutes, 9 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (17 minutes, 7 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (6 minutes, 28 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (2 minutes, 36 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (2 minutes, 45 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (14 minutes, 7 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (13 minutes, 23 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (12 minutes, 48 seconds)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richvdh richvdh

Assignees
No one assigned
Labels
cross-signing-sprint
Projects
None yet
Milestone
No milestone
3 participants
@uhoreg @richvdh @dbkr
You can’t perform that action at this time.