summary refs log tree commit diff
path: root/synapse/config/sso.py
diff options
context:
space:
mode:
authorDan Callahan <danc@element.io>2021-01-26 15:38:22 +0000
committerDan Callahan <danc@element.io>2021-01-26 15:38:22 +0000
commita06dd1d6b5a36a473ad58c186cac61ba929dc154 (patch)
tree5a8d355e61b47803acbc8cfabf391b4059b29dcf /synapse/config/sso.py
parentFix state endpoint to be faster (diff)
parentTweak changes. (diff)
downloadsynapse-github/travis/fosdem/hotfixes.tar.xz
Merge tag 'v1.26.0rc2' into travis/fosdem/hotfixes github/travis/fosdem/hotfixes travis/fosdem/hotfixes
Diffstat (limited to 'synapse/config/sso.py')
-rw-r--r--synapse/config/sso.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/synapse/config/sso.py b/synapse/config/sso.py

index 366f0d4698..59be825532 100644 --- a/synapse/config/sso.py +++ b/synapse/config/sso.py
@@ -64,11 +64,8 @@ class SSOConfig(Config): # 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) + 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 """\ @@ -86,9 +83,9 @@ 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. + # The login fallback page (used by clients that don't natively support the + # required login flows) is automatically whitelisted in addition to any URLs + # in this list. # # By default, this list is empty. #