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

Import at the top

Browse source
This commit is contained in:
Andrew Morgan 2019-05-02 16:55:56 -07:00
parent 152d7a8eaf
commit 6592691f9f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/http/test_fedclient.py
View file

@ -21,6 +21,7 @@ from twisted.internet.error import ConnectingCancelledError, DNSLookupError
from twisted.test.proto_helpers import StringTransport from twisted.test.proto_helpers import StringTransport
from twisted.web.client import ResponseNeverReceived from twisted.web.client import ResponseNeverReceived
from twisted.web.http import HTTPChannel from twisted.web.http import HTTPChannel
from netaddr import IPSet
from synapse.api.errors import RequestSendFailed, SynapseError from synapse.api.errors import RequestSendFailed, SynapseError
from synapse.http.matrixfederationclient import ( from synapse.http.matrixfederationclient import (
@ -213,9 +214,8 @@ class FederationClientTests(HomeserverTestCase):
def test_client_ip_range_blacklist(self): def test_client_ip_range_blacklist(self):
"""Ensure that Synapse does not try to connect to blacklisted IPs""" """Ensure that Synapse does not try to connect to blacklisted IPs"""
# Set up the ip_range blacklist
from netaddr import IPSet
# Set up the ip_range blacklist
self.hs.config.federation_ip_range_blacklist = IPSet([ self.hs.config.federation_ip_range_blacklist = IPSet([
"127.0.0.0/8", "127.0.0.0/8",
"fe80::/64", "fe80::/64",