Make sure the config actually /has/ a captcha_bypass_secret set before trying to compare it

2014-09-23 15:16:47 +01:00 · 2014-09-23 15:16:47 +01:00 · 5f16439752
parent 3a8a94448a
commit 5f16439752
1 changed files with 3 additions and 2 deletions
--- a/synapse/rest/register.py
+++ b/synapse/rest/register.py
@ -153,8 +153,9 @@ class RegisterRestServlet(RestServlet):
    @defer.inlineCallbacks
    def _check_recaptcha(self, request, register_json):
        if "captcha_bypass_secret" in register_json:
-            if (register_json["captcha_bypass_secret"] ==
-                    self.hs.config.captcha_bypass_secret):
+            if (self.hs.config.captcha_bypass_secret is not None and
+                    register_json["captcha_bypass_secret"] ==
+                        self.hs.config.captcha_bypass_secret):
                defer.returnValue(None)
            else:
                raise SynapseError(400, "Captcha bypass secret incorrect",