summary refs log tree commit diff
path: root/tests/push/test_http.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-11-01 14:07:44 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-01 14:22:46 +0000
commit85f15ac59246b3fdbb914ca47b9f7c47d76a3b6b (patch)
tree909d8c7ca7b07f6e4e4fad081fadb1cc62f6d171 /tests/push/test_http.py
parentMerge pull request #9 from matrix-org/babolivier/ci (diff)
downloadsynapse-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 'tests/push/test_http.py')
-rw-r--r--tests/push/test_http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/push/test_http.py b/tests/push/test_http.py

index 22c3f73ef3..92ce32d448 100644 --- a/tests/push/test_http.py +++ b/tests/push/test_http.py
@@ -50,7 +50,7 @@ class HTTPPusherTests(HomeserverTestCase): config = self.default_config() config["start_pushers"] = True - hs = self.setup_test_homeserver(config=config, simple_http_client=m) + hs = self.setup_test_homeserver(config=config, proxied_http_client=m) return hs