diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
| commit | bd84755e64a5fd086738a43e049885604ea53927 (patch) | |
| tree | 39b3bf10a5b074c82e48a723670a539b9149a8ee /synapse/rest/client/v1 | |
| parent | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz | |
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/register.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py index 8d2115082b..f5acfb945f 100644 --- a/synapse/rest/client/v1/register.py +++ b/synapse/rest/client/v1/register.py @@ -59,6 +59,7 @@ class RegisterRestServlet(ClientV1RestServlet): # } # TODO: persistent storage self.sessions = {} + self.disable_registration = hs.config.disable_registration def on_GET(self, request): if self.hs.config.enable_registration_captcha: @@ -107,6 +108,11 @@ class RegisterRestServlet(ClientV1RestServlet): try: login_type = register_json["type"] + + is_application_server = login_type == LoginType.APPLICATION_SERVICE + if self.disable_registration and not is_application_server: + raise SynapseError(403, "Registration has been disabled") + stages = { LoginType.RECAPTCHA: self._do_recaptcha, LoginType.PASSWORD: self._do_password, |