From 5f16439752fa6ff9b452cac86fbbb07a12ae44f7 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Tue, 23 Sep 2014 15:16:47 +0100 Subject: Make sure the config actually /has/ a captcha_bypass_secret set before trying to compare it --- synapse/rest/register.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'synapse') diff --git a/synapse/rest/register.py b/synapse/rest/register.py index f1354e4b71..3b07a127a6 100644 --- 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", -- cgit 1.4.1