summary refs log tree commit diff
path: root/synapse/config/sso.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-01-15 00:27:13 +0000
committerGitHub <noreply@github.com>2021-01-15 00:27:13 +0000
commit14950a45d6ff3a5ea737322af1096a49b079f2eb (patch)
tree7996db7cbf75bf5ce1204acda9f52e7409391b04 /synapse/config/sso.py
parentFix event chain bg update. (#9118) (diff)
parentAdd a test for wrong user returned by SSO (diff)
downloadsynapse-14950a45d6ff3a5ea737322af1096a49b079f2eb.tar.xz
Merge pull request #9091 from matrix-org/rav/error_on_bad_sso
Give the user a better error when they present bad SSO creds
Diffstat (limited to 'synapse/config/sso.py')
-rw-r--r--synapse/config/sso.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/sso.py b/synapse/config/sso.py
index 1aeb1c5c92..366f0d4698 100644
--- a/synapse/config/sso.py
+++ b/synapse/config/sso.py
@@ -37,6 +37,7 @@ class SSOConfig(Config):
             self.sso_error_template,
             sso_account_deactivated_template,
             sso_auth_success_template,
+            self.sso_auth_bad_user_template,
         ) = self.read_templates(
             [
                 "sso_login_idp_picker.html",
@@ -45,6 +46,7 @@ class SSOConfig(Config):
                 "sso_error.html",
                 "sso_account_deactivated.html",
                 "sso_auth_success.html",
+                "sso_auth_bad_user.html",
             ],
             template_dir,
         )
@@ -160,6 +162,14 @@ class SSOConfig(Config):
             #
             #   This template has no additional variables.
             #
+            # * HTML page shown after a user-interactive authentication session which
+            #   does not map correctly onto the expected user: 'sso_auth_bad_user.html'.
+            #
+            #   When rendering, this template is given the following variables:
+            #     * server_name: the homeserver's name.
+            #     * user_id_to_verify: the MXID of the user that we are trying to
+            #       validate.
+            #
             # * HTML page shown during single sign-on if a deactivated user (according to Synapse's database)
             #   attempts to login: 'sso_account_deactivated.html'.
             #