Skip to content
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 [1/4] -- hidden devices #5759

Merged

Conversation

@uhoreg
Copy link
Member

uhoreg commented Jul 25, 2019

This is a prerequisite for cross-signing, as it allows us to create other things
that live within the device namespace, so they can be used for signatures.

(This is split off from #4970)

This is a prerequisite for cross-signing, as it allows us to create other things
that live within the device namespace, so they can be used for signatures.
@uhoreg uhoreg requested a review from matrix-org/synapse-core Jul 25, 2019
Copy link
Member

richvdh left a comment

lgtm. can you give it a changelog file (probably a .misc for now) so that the CI passes, and fix the merge conflict?

Might also be worth adding something to the docstrings of the storage functions to clarify that they exclude hidden devices?

@richvdh richvdh referenced this pull request Jul 30, 2019
)
sql = """
DELETE FROM devices
WHERE user_id = ? AND device_id = ? AND NOT COALESCE(hidden, ?)

This comment has been minimized.

Copy link
@richvdh

richvdh Jul 30, 2019

Member

having looked at how this works out, I'm really sorry but I think I'm going to revise my original comments here; it's just too awkward. I think the 30s or so it's going to take to add a NOT NULL column to the table will be worth it for not jumping through these hoops and having to manage a tristate.

Really sorry for vacillating on this.

@@ -0,0 +1,18 @@
/* Copyright 2019 New Vector Ltd

This comment has been minimized.

Copy link
@richvdh

richvdh Jul 30, 2019

Member

can you give this delta file a different name?

@codecov

This comment has been minimized.

Copy link

codecov bot commented Jul 31, 2019

Codecov Report

Merging #5759 into develop will decrease coverage by 0.01%.
The diff coverage is 14.28%.

@@             Coverage Diff             @@
##           develop    #5759      +/-   ##
===========================================
- Coverage    63.44%   63.42%   -0.02%     
===========================================
  Files          331      331              
  Lines        36515    36520       +5     
  Branches      6035     6038       +3     
===========================================
- Hits         23167    23164       -3     
- Misses       11704    11710       +6     
- Partials      1644     1646       +2
@uhoreg uhoreg force-pushed the uhoreg/e2e_cross-signing2-part0 branch from 095524e to c1f0a56 Jul 31, 2019
uhoreg added 4 commits Jul 31, 2019
(by going back to not using SQL directly)
@uhoreg uhoreg requested a review from matrix-org/synapse-core Aug 1, 2019
@uhoreg uhoreg changed the base branch from develop to uhoreg/e2e_cross-signing_merged Aug 12, 2019
@uhoreg uhoreg merged commit f63ba7a into uhoreg/e2e_cross-signing_merged Aug 12, 2019
19 checks passed
19 checks passed
buildkite/synapse Build #3237 passed (17 minutes, 13 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 18 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 22 seconds)
Details
buildkite/synapse/isort Passed (22 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (38 seconds)
Details
buildkite/synapse/packaging Passed (37 seconds)
Details
buildkite/synapse/pipeline Passed (12 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (11 minutes, 25 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (4 minutes, 31 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (6 minutes, 14 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (4 minutes, 37 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (11 minutes, 10 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (14 minutes, 6 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (4 minutes, 53 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (6 minutes, 4 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (6 minutes, 58 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (4 minutes, 43 seconds)
Details
codecov/patch 14.28% of diff hit (target 0%)
Details
codecov/project 63.42% (target 0%)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.