Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 23:39:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle IP literals explicitly

Browse Source 
We don't want to be doing .well-known lookups on these guys.
This commit is contained in:
Richard van der Hoff 2019-01-26 21:48:50 +00:00
parent 51958df766
commit 0fd5b3b53e
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/http/federation/matrix_federation_agent.py
View File

@ -15,6 +15,7 @@
import logging import logging
import attr import attr
from netaddr import IPAddress
from zope.interface import implementer from zope.interface import implementer
from twisted.internet import defer from twisted.internet import defer
@ -137,6 +138,24 @@ class MatrixFederationAgent(object):
Returns: Returns:
Deferred[_RoutingResult] Deferred[_RoutingResult]
""" """
# check for an IP literal
try:
ip_address = IPAddress(parsed_uri.host.decode("ascii"))
except Exception:
# not an IP address
ip_address = None
if ip_address:
port = parsed_uri.port
if port == -1:
port = 8448
defer.returnValue(_RoutingResult(
host_header=parsed_uri.netloc,
tls_server_name=parsed_uri.host,
target_host=parsed_uri.host,
target_port=port,
))
if parsed_uri.port != -1: if parsed_uri.port != -1:
# there is an explicit port # there is an explicit port
defer.returnValue(_RoutingResult( defer.returnValue(_RoutingResult(

19
tests/http/federation/test_matrix_federation_agent.py
View File

@ -166,11 +166,7 @@ class MatrixFederationAgentTests(TestCase):
""" """
Test the behaviour when the server name contains an explicit IP (with no port) Test the behaviour when the server name contains an explicit IP (with no port)
""" """
# there will be a getaddrinfo on the IP
# the SRV lookup will return an empty list (XXX: why do we even do an SRV lookup?)
self.mock_resolver.resolve_service.side_effect = lambda _: []
# then there will be a getaddrinfo on the IP
self.reactor.lookups["1.2.3.4"] = "1.2.3.4" self.reactor.lookups["1.2.3.4"] = "1.2.3.4"
test_d = self._make_get_request(b"matrix://1.2.3.4/foo/bar") test_d = self._make_get_request(b"matrix://1.2.3.4/foo/bar")
@ -178,10 +174,6 @@ class MatrixFederationAgentTests(TestCase):
# Nothing happened yet # Nothing happened yet
self.assertNoResult(test_d) self.assertNoResult(test_d)
self.mock_resolver.resolve_service.assert_called_once_with(
b"_matrix._tcp.1.2.3.4",
)
# Make sure treq is trying to connect # Make sure treq is trying to connect
clients = self.reactor.tcpClients clients = self.reactor.tcpClients
self.assertEqual(len(clients), 1) self.assertEqual(len(clients), 1)
@ -215,10 +207,7 @@ class MatrixFederationAgentTests(TestCase):
(with no port) (with no port)
""" """
# the SRV lookup will return an empty list (XXX: why do we even do an SRV lookup?) # there will be a getaddrinfo on the IP
self.mock_resolver.resolve_service.side_effect = lambda _: []
# then there will be a getaddrinfo on the IP
self.reactor.lookups["::1"] = "::1" self.reactor.lookups["::1"] = "::1"
test_d = self._make_get_request(b"matrix://[::1]/foo/bar") test_d = self._make_get_request(b"matrix://[::1]/foo/bar")
@ -226,10 +215,6 @@ class MatrixFederationAgentTests(TestCase):
# Nothing happened yet # Nothing happened yet
self.assertNoResult(test_d) self.assertNoResult(test_d)
self.mock_resolver.resolve_service.assert_called_once_with(
b"_matrix._tcp.::1",
)
# Make sure treq is trying to connect # Make sure treq is trying to connect
clients = self.reactor.tcpClients clients = self.reactor.tcpClients
self.assertEqual(len(clients), 1) self.assertEqual(len(clients), 1)