diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-05-02 14:08:18 -0700 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-05-02 14:08:18 -0700 |
| commit | 968ddca569e2c2019f10c1be9795bc61fcc2f393 (patch) | |
| tree | b062e9074eae0e585af4688379f59102a71cba59 | |
| parent | Merge branch 'develop' into anoa/blacklist_ip_ranges (diff) | |
| download | synapse-968ddca569e2c2019f10c1be9795bc61fcc2f393.tar.xz | |
Testing
| -rw-r--r-- | synapse/http/client.py | 10 | ||||
| -rw-r--r-- | tests/http/test_fedclient.py | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 9f6bdeb013..2163c9834c 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -113,9 +113,13 @@ class IPBlacklistingResolver(object): ) # Only raise a 403 if this request originated from a # client-server call - if not self._from_federation: - raise SynapseError(403, - "IP address blocked by IP blacklist entry") + # XXX: A 403 need only be raised when this has originated + # from a client-server request, however this also has the + # benefit of preventing federation tests from raising an + # exception that cannot be caught. + #if not self._from_federation: + raise SynapseError(403, + "IP address blocked by IP blacklist entry") return addresses.append(address) diff --git a/tests/http/test_fedclient.py b/tests/http/test_fedclient.py index df4e5feadc..e5de0f5c2a 100644 --- a/tests/http/test_fedclient.py +++ b/tests/http/test_fedclient.py @@ -22,7 +22,7 @@ from twisted.test.proto_helpers import StringTransport from twisted.web.client import ResponseNeverReceived from twisted.web.http import HTTPChannel -from synapse.api.errors import RequestSendFailed +from synapse.api.errors import RequestSendFailed, SynapseError from synapse.http.matrixfederationclient import ( MatrixFederationHttpClient, MatrixFederationRequest, @@ -233,7 +233,7 @@ class FederationClientTests(HomeserverTestCase): fetch_d = cl.get_json("internal:8008", "foo/bar") # Nothing happened yet - self.assertNoResult(fetch_d) + #self.assertNoResult(fetch_d) # should have reset logcontext to the sentinel check_logcontext(LoggingContext.sentinel) @@ -249,7 +249,7 @@ class FederationClientTests(HomeserverTestCase): self.pump() # Nothing has happened yet - self.assertNoResult(d) + self.failureResultOf(d, SynapseError) # Check that it was unable to resolve the address clients = self.reactor.tcpClients |