Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-26 17:45:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback"

Browse source 
This was incorrectly merged to master.

This reverts commit 319c41f573, reversing
changes made to 229eb81498.
This commit is contained in:
Richard van der Hoff 2020-03-27 20:21:09 +00:00
parent 8d4cbdeaa9
commit 0122ef1037
4 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
synapse/config/sso.py
View file

@ -39,17 +39,6 @@ class SSOConfig(Config):
self.sso_client_whitelist = sso_config.get("client_whitelist") or []
# Attempt to also whitelist the server's login fallback, since that fallback sets
# the redirect URL to itself (so it can process the login token then return
# gracefully to the client). This would make it pointless to ask the user for
# confirmation, since the URL the confirmation page would be showing wouldn't be
# the client's.
# public_baseurl is an optional setting, so we only add the fallback's URL to the
# list if it's provided (because we can't figure out what that URL is otherwise).
if self.public_baseurl:
login_fallback_url = self.public_baseurl + "_matrix/static/client/login"
self.sso_client_whitelist.append(login_fallback_url)
def generate_config_section(self, **kwargs):
return """\
# Additional settings to use with single-sign on systems such as SAML2 and CAS.
@ -65,10 +54,6 @@ class SSOConfig(Config):
# phishing attacks from evil.site. To avoid this, include a slash after the
# hostname: "https://my.client/".
#
# If public_baseurl is set, then the login fallback page (used by clients
# that don't natively support the required login flows) is whitelisted in
# addition to any URLs in this list.
#
# By default, this list is empty.
#
#client_whitelist: