summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-11-09 11:11:06 +0000
committerGitHub <noreply@github.com>2016-11-09 11:11:06 +0000
commit6cc4fcf25cab851bf8ac3d4d86c6b5ed645c51ff (patch)
treeeb1eb1890d909df2137ec352a62a77471854fd1f /synapse/config
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentDon't assume providers raise ConfigError's (diff)
downloadsynapse-6cc4fcf25cab851bf8ac3d4d86c6b5ed645c51ff.tar.xz
Merge pull request #1619 from matrix-org/erikj/pwd_provider_error
Don't assume providers raise ConfigError's
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/password_auth_providers.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/config/password_auth_providers.py b/synapse/config/password_auth_providers.py
index f6d9bb1c62..1f438d2bb3 100644
--- a/synapse/config/password_auth_providers.py
+++ b/synapse/config/password_auth_providers.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ._base import Config
+from ._base import Config, ConfigError
 
 import importlib
 
@@ -39,7 +39,12 @@ class PasswordAuthProviderConfig(Config):
             module = importlib.import_module(module)
             provider_class = getattr(module, clz)
 
-            provider_config = provider_class.parse_config(provider["config"])
+            try:
+                provider_config = provider_class.parse_config(provider["config"])
+            except Exception as e:
+                raise ConfigError(
+                    "Failed to parse config for %r: %r" % (provider['module'], e)
+                )
             self.password_providers.append((provider_class, provider_config))
 
     def default_config(self, **kwargs):