summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2020-11-23 13:45:23 +0000
committerGitHub <noreply@github.com>2020-11-23 08:45:23 -0500
commit59a995f38dab8d83aee09ed7eb3858390ed53a65 (patch)
tree34473a422eeca82cfb2a02d9a3ae96a3f5949f87
parentINSTALL: Fix setting content-type on well-known (#8793) (diff)
downloadsynapse-59a995f38dab8d83aee09ed7eb3858390ed53a65.tar.xz
Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)
-rw-r--r--changelog.d/8773.misc1
-rw-r--r--synapse/handlers/saml_handler.py5
-rw-r--r--synapse/handlers/sso.py12
3 files changed, 13 insertions, 5 deletions
diff --git a/changelog.d/8773.misc b/changelog.d/8773.misc
new file mode 100644
index 0000000000..62778ba410
--- /dev/null
+++ b/changelog.d/8773.misc
@@ -0,0 +1 @@
+Minor log line improvements for the SSO mapping code used to generate Matrix IDs from SSO IDs.
diff --git a/synapse/handlers/saml_handler.py b/synapse/handlers/saml_handler.py
index 5d9b555b13..f4e8cbeac8 100644
--- a/synapse/handlers/saml_handler.py
+++ b/synapse/handlers/saml_handler.py
@@ -268,7 +268,8 @@ class SamlHandler(BaseHandler):
                 user_id = UserID(
                     map_username_to_mxid_localpart(attrval), self.server_name
                 ).to_string()
-                logger.info(
+
+                logger.debug(
                     "Looking for existing account based on mapped %s %s",
                     self._grandfathered_mxid_source_attribute,
                     user_id,
@@ -324,7 +325,7 @@ class SamlHandler(BaseHandler):
             if contains_invalid_mxid_characters(localpart):
                 raise MappingException("localpart is invalid: %s" % (localpart,))
 
-            logger.info("Mapped SAML user to local part %s", localpart)
+            logger.debug("Mapped SAML user to local part %s", localpart)
             registered_user_id = await self._registration_handler.register_user(
                 localpart=localpart,
                 default_display_name=displayname,
diff --git a/synapse/handlers/sso.py b/synapse/handlers/sso.py
index 9cb1866a71..cf7cb7754a 100644
--- a/synapse/handlers/sso.py
+++ b/synapse/handlers/sso.py
@@ -71,19 +71,25 @@ class SsoHandler(BaseHandler):
         Returns:
             The mxid of a previously seen user.
         """
-        # Check if we already have a mapping for this user.
-        logger.info(
+        logger.debug(
             "Looking for existing mapping for user %s:%s",
             auth_provider_id,
             remote_user_id,
         )
+
+        # Check if we already have a mapping for this user.
         previously_registered_user_id = await self.store.get_user_by_external_id(
             auth_provider_id, remote_user_id,
         )
 
         # A match was found, return the user ID.
         if previously_registered_user_id is not None:
-            logger.info("Found existing mapping %s", previously_registered_user_id)
+            logger.info(
+                "Found existing mapping for IdP '%s' and remote_user_id '%s': %s",
+                auth_provider_id,
+                remote_user_id,
+                previously_registered_user_id,
+            )
             return previously_registered_user_id
 
         # No match.