diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
| commit | 697f6714a4c65cec6019231a7bac84e1b544c42d (patch) | |
| tree | 8693ec59f906c076abb534f01c32573619bf7c8c /synapse/config/captcha.py | |
| parent | Bump versions and changelog (diff) | |
| parent | Just use a yaml list for turn servers (diff) | |
| download | synapse-697f6714a4c65cec6019231a7bac84e1b544c42d.tar.xz | |
Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4
Diffstat (limited to 'synapse/config/captcha.py')
| -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." + ) |