summary refs log tree commit diff
path: root/synapse/config/captcha.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-06-01 10:56:05 +0100
committerMark Haines <mark.haines@matrix.org>2015-06-01 10:56:05 +0100
commitb8d49be5a1d8719ec47a44547d043874c8bfaddc (patch)
tree52e58244f968f10176f8624eac19452d3337f810 /synapse/config/captcha.py
parentUse Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... (diff)
parentMerge pull request #172 from intelfx/contrib-systemd (diff)
downloadsynapse-b8d49be5a1d8719ec47a44547d043874c8bfaddc.tar.xz
Merge branch 'develop' into markjh/twisted-15
Conflicts:
	synapse/python_dependencies.py
Diffstat (limited to 'synapse/config/captcha.py')
-rw-r--r--synapse/config/captcha.py4
1 files changed, 4 insertions, 0 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"
         """