Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
ac6a8481
Commit
ac6a8481
authored
4 years ago
by
Andrew Morgan
Committed by
Andrew Morgan
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Only register devices edu handler on the master process (#7255)
parent
553c8a9b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/7255.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/7255.bugfix
synapse/handlers/e2e_keys.py
+11
-7
11 additions, 7 deletions
synapse/handlers/e2e_keys.py
with
12 additions
and
7 deletions
changelog.d/7255.bugfix
0 → 100644
+
1
−
0
View file @
ac6a8481
Fix a bug that prevented cross-signing with users on worker-mode synapses.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
synapse/handlers/e2e_keys.py
+
11
−
7
View file @
ac6a8481
...
@@ -54,19 +54,23 @@ class E2eKeysHandler(object):
...
@@ -54,19 +54,23 @@ class E2eKeysHandler(object):
self
.
_edu_updater
=
SigningKeyEduUpdater
(
hs
,
self
)
self
.
_edu_updater
=
SigningKeyEduUpdater
(
hs
,
self
)
federation_registry
=
hs
.
get_federation_registry
()
self
.
_is_master
=
hs
.
config
.
worker_app
is
None
self
.
_is_master
=
hs
.
config
.
worker_app
is
None
if
not
self
.
_is_master
:
if
not
self
.
_is_master
:
self
.
_user_device_resync_client
=
ReplicationUserDevicesResyncRestServlet
.
make_client
(
self
.
_user_device_resync_client
=
ReplicationUserDevicesResyncRestServlet
.
make_client
(
hs
hs
)
)
else
:
# Only register this edu handler on master as it requires writing
# device updates to the db
#
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
federation_registry
.
register_edu_handler
(
"
org.matrix.signing_key_update
"
,
self
.
_edu_updater
.
incoming_signing_key_update
,
)
federation_registry
=
hs
.
get_federation_registry
()
# FIXME: switch to m.signing_key_update when MSC1756 is merged into the spec
federation_registry
.
register_edu_handler
(
"
org.matrix.signing_key_update
"
,
self
.
_edu_updater
.
incoming_signing_key_update
,
)
# doesn't really work as part of the generic query API, because the
# doesn't really work as part of the generic query API, because the
# query request requires an object POST, but we abuse the
# query request requires an object POST, but we abuse the
# "query handler" interface.
# "query handler" interface.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment