diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
commit | 449739e6a364759a86f73417626af49d6a794e3d (patch) | |
tree | 04b2f39c91ec6098ffe3b380442787ac3ce2908f /synapse/rest/register.py | |
parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
parent | Check that we have auth headers and fail nicely (diff) | |
download | synapse-449739e6a364759a86f73417626af49d6a794e3d.tar.xz |
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
Diffstat (limited to '')
-rw-r--r-- | synapse/rest/register.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/synapse/rest/register.py b/synapse/rest/register.py index 4935e323d9..804117ee09 100644 --- a/synapse/rest/register.py +++ b/synapse/rest/register.py @@ -195,13 +195,7 @@ class RegisterRestServlet(RestServlet): raise SynapseError(400, "Captcha response is required", errcode=Codes.CAPTCHA_NEEDED) - # May be an X-Forwarding-For header depending on config - ip_addr = request.getClientIP() - if self.hs.config.captcha_ip_origin_is_x_forwarded: - # use the header - if request.requestHeaders.hasHeader("X-Forwarded-For"): - ip_addr = request.requestHeaders.getRawHeaders( - "X-Forwarded-For")[0] + ip_addr = self.hs.get_ip_from_request(request) handler = self.handlers.registration_handler yield handler.check_recaptcha( |