summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-16 15:06:06 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-16 15:06:06 +0100
commit22927d6ee8b1133928772924b69333ef2a1347af (patch)
tree487fd2645522980b4c181e22945f34eef4154967 /synapse/server.py
parentMerge commit 'f14428b25' into anoa/dinsic_release_1_31_0 (diff)
downloadsynapse-22927d6ee8b1133928772924b69333ef2a1347af.tar.xz
lint
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 2574f6786e..bd8ee0e34a 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -365,26 +365,6 @@ class HomeServer(metaclass=abc.ABCMeta): def get_proxied_blacklisted_http_client(self) -> SimpleHttpClient: """ An HTTP client that uses configured HTTP(S) proxies and blacklists IPs - based on the IP range blacklist. - """ - return SimpleHttpClient( - self, ip_blacklist=self.config.ip_range_blacklist, use_proxy=True, - ) - - @cache_in_self - def get_federation_http_client(self) -> MatrixFederationHttpClient: - """ - An HTTP client for federation. - """ - tls_client_options_factory = context_factory.FederationPolicyForHTTPS( - self.config - ) - return MatrixFederationHttpClient(self, tls_client_options_factory) - - @cache_in_self - def get_proxied_blacklisted_http_client(self) -> SimpleHttpClient: - """ - An HTTP client that uses configured HTTP(S) proxies and blacklists IPs based on the IP range blacklist/whitelist. """ return SimpleHttpClient(