Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 17:09:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Factor out module loading to a separate place

Browse Source 
So it can be reused
This commit is contained in:
David Baker 2017-09-26 17:51:26 +01:00
parent 1a398b19fd
commit 4824a33c31
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/config/password_auth_providers.py
View File

@ -15,13 +15,15 @@
from ._base import Config, ConfigError from ._base import Config, ConfigError
import importlib from synapse.util.module_loader import load_module
class PasswordAuthProviderConfig(Config): class PasswordAuthProviderConfig(Config):
def read_config(self, config): def read_config(self, config):
self.password_providers = [] self.password_providers = []
provider_config = None
# We want to be backwards compatible with the old `ldap_config` # We want to be backwards compatible with the old `ldap_config`
# param. # param.
ldap_config = config.get("ldap_config", {}) ldap_config = config.get("ldap_config", {})
@ -38,19 +40,15 @@ class PasswordAuthProviderConfig(Config):
if provider['module'] == "synapse.util.ldap_auth_provider.LdapAuthProvider": if provider['module'] == "synapse.util.ldap_auth_provider.LdapAuthProvider":
from ldap_auth_provider import LdapAuthProvider from ldap_auth_provider import LdapAuthProvider
provider_class = LdapAuthProvider provider_class = LdapAuthProvider
else:
# We need to import the module, and then pick the class out of
# that, so we split based on the last dot.
module, clz = provider['module'].rsplit(".", 1)
module = importlib.import_module(module)
provider_class = getattr(module, clz)
try: try:
provider_config = provider_class.parse_config(provider["config"]) provider_config = provider_class.parse_config(provider["config"])
except Exception as e: except Exception as e:
raise ConfigError( raise ConfigError(
"Failed to parse config for %r: %r" % (provider['module'], e) "Failed to parse config for %r: %r" % (provider['module'], e)
) )
else:
(provider_class, provider_config) = load_module(provider)
self.password_providers.append((provider_class, provider_config)) self.password_providers.append((provider_class, provider_config))
def default_config(self, **kwargs): def default_config(self, **kwargs):