From 08d386a37a9dee73f2f7301f9c59a77acf487413 Mon Sep 17 00:00:00 2001 From: Azrenbeth <7782548+Azrenbeth@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:48:47 +0100 Subject: no longer assert default was loaded, and better test for if using default --- synapse/handlers/saml.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/saml.py b/synapse/handlers/saml.py index d21d0b327f..9fe33dfd8e 100644 --- a/synapse/handlers/saml.py +++ b/synapse/handlers/saml.py @@ -65,7 +65,9 @@ class SamlHandler(BaseHandler): # At this point either a module will have registered user mapping provider # callbacks or the default will have been registered. - assert self._user_mapping_provider.module_has_registered + # however if for some reason that hasn't happened (e.g. testing) load the default + if not self._user_mapping_provider.module_has_registered: + load_default_or_legacy_saml2_mapping_provider(hs) # Merge the required and optional saml_attributes registered by the mapping # provider with the base sp config. NOTE: If there are conflicts then the @@ -549,7 +551,7 @@ def load_default_or_legacy_saml2_mapping_provider(hs: "HomeServer"): # if we were loading the default provider, then it has already registered its callbacks! # so we can stop here - if module == DEFAULT_USER_MAPPING_PROVIDER: + if module.__module__ + "." + module.__qualname__ == DEFAULT_USER_MAPPING_PROVIDER: return # The required hooks. If a custom module doesn't implement all of these then raise an error -- cgit 1.5.1