diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-20 11:43:24 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-20 11:43:24 +0000 |
commit | e944b767d7cffdb65c96863b1ebba2cceb6d3166 (patch) | |
tree | 9d684e2f0e4dce58e295a0623392a29a5bd4a5e2 /synapse/rest/client/v1/register.py | |
parent | Update CHANGES.rst with missing changes (diff) | |
parent | Always allow AS to register (diff) | |
download | synapse-e944b767d7cffdb65c96863b1ebba2cceb6d3166.tar.xz |
Merge pull request #84 from matrix-org/disable_registration
Disable Registration Config Option
Diffstat (limited to 'synapse/rest/client/v1/register.py')
-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, |