This repository was 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
Fix SSO on workers #9271
Merged
Merged
Fix SSO on workers #9271
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a83decf
Factor out build_synapse_client_resource_tree
richvdh 3fb8c08
Move sso init into build_synapse_client_resource_tree
richvdh 64f5b6c
Fix SSO-login-via-a-worker
richvdh e897ff1
Update workers config for new endpoints
richvdh d500d1c
remove submit_token from workers endpoints list
richvdh bf83a20
changelog
richvdh ca42754
Add a comment about the odd path for SAML2Resource
richvdh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -256,25 +256,28 @@ Additionally, the following endpoints should be included if Synapse is configure | |
to use SSO (you only need to include the ones for whichever SSO provider you're | ||
using): | ||
|
||
# for all SSO providers | ||
^/_matrix/client/(api/v1|r0|unstable)/login/sso/redirect | ||
^/_synapse/client/pick_idp$ | ||
^/_synapse/client/pick_username | ||
^/_synapse/client/sso_register$ | ||
|
||
# OpenID Connect requests. | ||
^/_matrix/client/(api/v1|r0|unstable)/login/sso/redirect$ | ||
^/_synapse/oidc/callback$ | ||
|
||
# SAML requests. | ||
^/_matrix/client/(api/v1|r0|unstable)/login/sso/redirect$ | ||
^/_matrix/saml2/authn_response$ | ||
|
||
# CAS requests. | ||
^/_matrix/client/(api/v1|r0|unstable)/login/(cas|sso)/redirect$ | ||
^/_matrix/client/(api/v1|r0|unstable)/login/cas/ticket$ | ||
|
||
Note that a HTTP listener with `client` and `federation` resources must be | ||
configured in the `worker_listeners` option in the worker config. | ||
|
||
Ensure that all SSO logins go to a single process (usually the main process). | ||
Ensure that all SSO logins go to a single process. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is probably true for the UI auth endpoints too? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure it is? afaik nothing is tracked in-memory for UIA (at least for CAS/OIDC; SAML has #7530) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right, the username mapping sessions and extra attributes only matter on login, not during UI auth. OK. |
||
For multiple workers not handling the SSO endpoints properly, see | ||
[#7530](https://github.com/matrix-org/synapse/issues/7530). | ||
|
||
Note that a HTTP listener with `client` and `federation` resources must be | ||
configured in the `worker_listeners` option in the worker config. | ||
|
||
#### Load balancing | ||
|
||
It is possible to run multiple instances of this worker app, with incoming requests | ||
|
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.
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.
Note that this one was slightly different in that it has
(cas|sso)
in it. Not sure if any clients still use thecas
path though.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.
yeahh, I'm hoping that's old enough that basically nobody will encounter it.