diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-23 16:15:54 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-23 16:15:54 +0100 |
| commit | c0673c50e6858444cbd21642a48cc45d4c80fe24 (patch) | |
| tree | badc832b2c968d6389bb01f2314506e9bab0c27f /synapse/config | |
| parent | remove old commented-out code (diff) | |
| parent | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather th... (diff) | |
| download | synapse-c0673c50e6858444cbd21642a48cc45d4c80fe24.tar.xz | |
Merge branch 'jira/SYN-60' into develop
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/captcha.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py index 8ebcfc3623..4ed9070b9e 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py @@ -24,6 +24,7 @@ class CaptchaConfig(Config): self.captcha_ip_origin_is_x_forwarded = ( args.captcha_ip_origin_is_x_forwarded ) + self.captcha_bypass_secret = args.captcha_bypass_secret @classmethod def add_arguments(cls, parser): @@ -43,4 +44,8 @@ class CaptchaConfig(Config): "--captcha_ip_origin_is_x_forwarded", type=bool, default=False, help="When checking captchas, use the X-Forwarded-For (XFF) header" + " as the client IP and not the actual client IP." - ) \ No newline at end of file + ) + group.add_argument( + "--captcha_bypass_secret", type=str, + help="A secret key used to bypass the captcha test entirely." + ) |