diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-11-01 14:07:44 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-11-01 14:22:46 +0000 |
| commit | 85f15ac59246b3fdbb914ca47b9f7c47d76a3b6b (patch) | |
| tree | 909d8c7ca7b07f6e4e4fad081fadb1cc62f6d171 /synapse/handlers/auth.py | |
| parent | Merge pull request #9 from matrix-org/babolivier/ci (diff) | |
| download | synapse-85f15ac59246b3fdbb914ca47b9f7c47d76a3b6b.tar.xz | |
Support for routing outbound HTTP requests via a proxy (#6239)
The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198.
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index a0cf37a9f9..9a2ff177a6 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -420,7 +420,7 @@ class AuthHandler(BaseHandler): # TODO: get this from the homeserver rather than creating a new one for # each request try: - client = self.hs.get_simple_http_client() + client = self.hs.get_proxied_http_client() resp_body = yield client.post_urlencoded_get_json( self.hs.config.recaptcha_siteverify_api, args={ |