mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-20 02:24:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove different behaviour for fed vs. nonfed

Browse source
This commit is contained in:
Andrew Morgan 2019-05-02 16:53:51 -07:00
parent e1feb45f2b
commit 152d7a8eaf
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/http/client.py
View file

@ -76,7 +76,7 @@ class IPBlacklistingResolver(object):
addresses, preventing DNS rebinding attacks on URL preview. addresses, preventing DNS rebinding attacks on URL preview.
""" """
def __init__(self, reactor, ip_whitelist, ip_blacklist, federation=False): def __init__(self, reactor, ip_whitelist, ip_blacklist):
""" """
Args: Args:
reactor (twisted.internet.reactor) reactor (twisted.internet.reactor)
@ -87,7 +87,6 @@ class IPBlacklistingResolver(object):
self._reactor = reactor self._reactor = reactor
self._ip_whitelist = ip_whitelist self._ip_whitelist = ip_whitelist
self._ip_blacklist = ip_blacklist self._ip_blacklist = ip_blacklist
self._from_federation = federation
def resolveHostName(self, recv, hostname, portNumber=0): def resolveHostName(self, recv, hostname, portNumber=0):

1
synapse/http/matrixfederationclient.py
View file

@ -182,7 +182,6 @@ class MatrixFederationHttpClient(object):
# addresses, to prevent DNS rebinding. # addresses, to prevent DNS rebinding.
nameResolver = IPBlacklistingResolver( nameResolver = IPBlacklistingResolver(
real_reactor, None, hs.config.federation_ip_range_blacklist, real_reactor, None, hs.config.federation_ip_range_blacklist,
federation=True,
) )
@implementer(IReactorPluggableNameResolver) @implementer(IReactorPluggableNameResolver)

4
tests/http/test_fedclient.py
View file

@ -233,7 +233,7 @@ class FederationClientTests(HomeserverTestCase):
fetch_d = cl.get_json("internal:8008", "foo/bar") fetch_d = cl.get_json("internal:8008", "foo/bar")
# Nothing happened yet # Nothing happened yet
#self.assertNoResult(fetch_d) self.assertNoResult(fetch_d)
# should have reset logcontext to the sentinel # should have reset logcontext to the sentinel
check_logcontext(LoggingContext.sentinel) check_logcontext(LoggingContext.sentinel)
@ -249,7 +249,7 @@ class FederationClientTests(HomeserverTestCase):
self.pump() self.pump()
# Nothing has happened yet # Nothing has happened yet
self.failureResultOf(d, SynapseError) self.assertNoResult(d)
# Check that it was unable to resolve the address # Check that it was unable to resolve the address
clients = self.reactor.tcpClients clients = self.reactor.tcpClients