summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-05-29 15:32:54 +0100
committerMark Haines <mjark@negativecurvature.net>2015-05-29 15:32:54 +0100
commitd70c847b4f783f6665b94989f70298a0858431ac (patch)
treecf9b2e03f549555bc255c44318830f3b1efec5d8 /synapse
parentRemove log line (diff)
parentMerge branch 'develop' into markjh/SYT-8-recaptcha (diff)
downloadsynapse-d70c847b4f783f6665b94989f70298a0858431ac.tar.xz
Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha
Allow endpoint for verifying recaptcha to be configured
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/captcha.py4
-rw-r--r--synapse/handlers/auth.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py
index d8fe577e34..ba221121cb 100644
--- a/synapse/config/captcha.py
+++ b/synapse/config/captcha.py
@@ -26,6 +26,7 @@ class CaptchaConfig(Config):
             config["captcha_ip_origin_is_x_forwarded"]
         )
         self.captcha_bypass_secret = config.get("captcha_bypass_secret")
+        self.recaptcha_siteverify_api = config["recaptcha_siteverify_api"]
 
     def default_config(self, config_dir_path, server_name):
         return """\
@@ -48,4 +49,7 @@ class CaptchaConfig(Config):
 
         # A secret key used to bypass the captcha test entirely.
         #captcha_bypass_secret: "YOUR_SECRET_HERE"
+
+        # The API endpoint to use for verifying m.login.recaptcha responses.
+        recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
         """
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 0cc28248a9..63071653a3 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -188,7 +188,7 @@ class AuthHandler(BaseHandler):
         try:
             client = SimpleHttpClient(self.hs)
             resp_body = yield client.post_urlencoded_get_json(
-                "https://www.google.com/recaptcha/api/siteverify",
+                self.hs.config.recaptcha_siteverify_api,
                 args={
                     'secret': self.hs.config.recaptcha_private_key,
                     'response': user_response,