summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorTim Leung <tim95@hotmail.co.uk>2021-01-14 11:59:26 +0000
committerGitHub <noreply@github.com>2021-01-14 06:59:26 -0500
commit12702be951de37b0166827ef5f4ccf630a2a59c4 (patch)
tree36066e584221f13d8de8c7477772625e975918e7 /synapse/http
parentAdd a test for UI-Auth-via-SSO (#9082) (diff)
downloadsynapse-12702be951de37b0166827ef5f4ccf630a2a59c4.tar.xz
Fix wrong arguments being passed to BlacklistingAgentWrapper (#9098)
A reactor was being passed instead of a whitelist for the BlacklistingAgentWrapper
used by the WellyKnownResolver. This coulld cause exceptions when attempting to
connect to IP addresses that are blacklisted, but in reality this did not have any
observable affect since this code is not used for IP literals.
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/federation/matrix_federation_agent.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py
index 3b756a7dc2..4c06a117d3 100644
--- a/synapse/http/federation/matrix_federation_agent.py
+++ b/synapse/http/federation/matrix_federation_agent.py
@@ -102,7 +102,6 @@ class MatrixFederationAgent:
                         pool=self._pool,
                         contextFactory=tls_client_options_factory,
                     ),
-                    self._reactor,
                     ip_blacklist=ip_blacklist,
                 ),
                 user_agent=self.user_agent,