diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-01-20 12:30:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 12:30:41 +0000 |
| commit | fa50e4bf4ddcb8e98d44700513a28c490f80f02b (patch) | |
| tree | 2f2647326c36624c91c5aaf8a350d6fba47a541a /synapse/config/sso.py | |
| parent | Use the account handler in additional places. (#9166) (diff) | |
| download | synapse-fa50e4bf4ddcb8e98d44700513a28c490f80f02b.tar.xz | |
Give `public_baseurl` a default value (#9159)
Diffstat (limited to 'synapse/config/sso.py')
| -rw-r--r-- | synapse/config/sso.py | 13 |
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. # |