diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-15 18:05:58 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-15 18:05:58 +0100 |
| commit | bc42ca121f2fe6e58c65f1c728cf78f9d9823dfa (patch) | |
| tree | 11897d4024d321800c24b105b57665d8db806f36 /synapse/config/captcha.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Remove redundant newline (diff) | |
| download | synapse-bc42ca121f2fe6e58c65f1c728cf78f9d9823dfa.tar.xz | |
Merge pull request #185 from matrix-org/erikj/listeners_config
Change listener config.
Diffstat (limited to 'synapse/config/captcha.py')
| -rw-r--r-- | synapse/config/captcha.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py index ba221121cb..cf72dc4340 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py @@ -21,10 +21,6 @@ class CaptchaConfig(Config): self.recaptcha_private_key = config["recaptcha_private_key"] self.recaptcha_public_key = config["recaptcha_public_key"] self.enable_registration_captcha = config["enable_registration_captcha"] - # XXX: This is used for more than just captcha - self.captcha_ip_origin_is_x_forwarded = ( - config["captcha_ip_origin_is_x_forwarded"] - ) self.captcha_bypass_secret = config.get("captcha_bypass_secret") self.recaptcha_siteverify_api = config["recaptcha_siteverify_api"] @@ -43,10 +39,6 @@ class CaptchaConfig(Config): # public/private key. enable_registration_captcha: False - # When checking captchas, use the X-Forwarded-For (XFF) header - # as the client IP and not the actual client IP. - captcha_ip_origin_is_x_forwarded: False - # A secret key used to bypass the captcha test entirely. #captcha_bypass_secret: "YOUR_SECRET_HERE" |