diff --git a/lbry/dht/peer.py b/lbry/dht/peer.py index afba9bc56..cf30b359e 100644 --- a/lbry/dht/peer.py +++ b/lbry/dht/peer.py @@ -155,9 +155,9 @@ class KademliaPeer: if self._node_id is not None: if not len(self._node_id) == constants.HASH_LENGTH: raise ValueError("invalid node_id: {}".format(hexlify(self._node_id).decode())) - if self.udp_port is not None and not 1 <= self.udp_port <= 65535: + if self.udp_port is not None and not 1024 <= self.udp_port <= 65535: raise ValueError("invalid udp port") - if self.tcp_port is not None and not 1 <= self.tcp_port <= 65535: + if self.tcp_port is not None and not 1024 <= self.tcp_port <= 65535: raise ValueError("invalid tcp port") if not is_valid_public_ipv4(self.address, self.allow_localhost): raise ValueError(f"invalid ip address: '{self.address}'") diff --git a/lbry/wallet/server/udp.py b/lbry/wallet/server/udp.py index fd043ebfa..2e44654d1 100644 --- a/lbry/wallet/server/udp.py +++ b/lbry/wallet/server/udp.py @@ -3,7 +3,7 @@ import struct from time import perf_counter import logging from typing import Optional, Tuple, NamedTuple -from lbry.utils import LRUCache +from lbry.utils import LRUCache, is_valid_public_ipv4 # from prometheus_client import Counter @@ -69,7 +69,8 @@ class SPVPong(NamedTuple): class SPVServerStatusProtocol(asyncio.DatagramProtocol): PROTOCOL_VERSION = 1 - def __init__(self, height: int, tip: bytes, throttle_cache_size: int = 1024, throttle_reqs_per_sec: int = 10): + def __init__(self, height: int, tip: bytes, throttle_cache_size: int = 1024, throttle_reqs_per_sec: int = 10, + allow_localhost: bool = False): super().__init__() self.transport: Optional[asyncio.transports.DatagramTransport] = None self._height = height @@ -80,6 +81,7 @@ class SPVServerStatusProtocol(asyncio.DatagramProtocol): self._throttle = LRUCache(throttle_cache_size) self._should_log = LRUCache(throttle_cache_size) self._min_delay = 1 / throttle_reqs_per_sec + self._allow_localhost = allow_localhost def update_cached_response(self): self._cached_response = SPVPong.make(self._height, self._tip, self._flags, self.PROTOCOL_VERSION) @@ -119,7 +121,10 @@ class SPVServerStatusProtocol(asyncio.DatagramProtocol): except (ValueError, struct.error, AttributeError, TypeError): # log.exception("derp") return - self.transport.sendto(self.make_pong(addr[0]), addr) + if is_valid_public_ipv4(addr[0], allow_localhost=self._allow_localhost) and addr[1] >= 1024: + self.transport.sendto(self.make_pong(addr[0]), addr) + else: + log.warning("odd packet from %s:%i", addr[0], addr[1]) # ping_count_metric.inc() def connection_made(self, transport) -> None: @@ -141,8 +146,8 @@ class StatusServer: if self.is_running: return loop = asyncio.get_event_loop() - self._protocol = SPVServerStatusProtocol(height, tip) interface = interface if interface.lower() != 'localhost' else '127.0.0.1' + self._protocol = SPVServerStatusProtocol(height, tip, allow_localhost=interface == '127.0.0.1') await loop.create_datagram_endpoint(lambda: self._protocol, (interface, port)) log.info("started udp status server on %s:%i", interface, port) diff --git a/tests/unit/dht/test_peer.py b/tests/unit/dht/test_peer.py index 8a61dad14..2659db012 100644 --- a/tests/unit/dht/test_peer.py +++ b/tests/unit/dht/test_peer.py @@ -10,8 +10,8 @@ class PeerTest(AsyncioTestCase): self.loop = asyncio.get_event_loop() self.peer_manager = PeerManager(self.loop) self.node_ids = [generate_id(), generate_id(), generate_id()] - self.first_contact = make_kademlia_peer(self.node_ids[1], '1.0.0.1', udp_port=1000) - self.second_contact = make_kademlia_peer(self.node_ids[0], '1.0.0.2', udp_port=1000) + self.first_contact = make_kademlia_peer(self.node_ids[1], '1.0.0.1', udp_port=1024) + self.second_contact = make_kademlia_peer(self.node_ids[0], '1.0.0.2', udp_port=1024) def test_peer_is_good_unknown_peer(self): # Scenario: peer replied, but caller doesn't know the node_id. @@ -25,36 +25,37 @@ class PeerTest(AsyncioTestCase): def test_make_contact_error_cases(self): self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4', 100000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4.5', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], 'this is not an ip', 1000) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4.5', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], 'this is not an ip', 1024) self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4', -1000) self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4', 0) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4', 1023) self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '1.2.3.4', 70000) - self.assertRaises(ValueError, make_kademlia_peer, b'not valid node id', '1.2.3.4', 1000) + self.assertRaises(ValueError, make_kademlia_peer, b'not valid node id', '1.2.3.4', 1024) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '0.0.0.0', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '10.0.0.1', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '100.64.0.1', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '127.0.0.1', 1000) - self.assertIsNotNone(make_kademlia_peer(self.node_ids[1], '127.0.0.1', 1000, allow_localhost=True)) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.168.0.1', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '172.16.0.1', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '169.254.1.1', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.0.0.2', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.0.2.2', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.88.99.2', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '198.18.1.1', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '198.51.100.2', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '198.51.100.2', 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '203.0.113.4', 1000) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '0.0.0.0', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '10.0.0.1', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '100.64.0.1', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '127.0.0.1', 1024) + self.assertIsNotNone(make_kademlia_peer(self.node_ids[1], '127.0.0.1', 1024, allow_localhost=True)) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.168.0.1', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '172.16.0.1', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '169.254.1.1', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.0.0.2', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.0.2.2', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '192.88.99.2', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '198.18.1.1', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '198.51.100.2', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '198.51.100.2', 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '203.0.113.4', 1024) for i in range(32): - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], f"{224 + i}.0.0.0", 1000) - self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '255.255.255.255', 1000) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], f"{224 + i}.0.0.0", 1024) + self.assertRaises(ValueError, make_kademlia_peer, self.node_ids[1], '255.255.255.255', 1024) self.assertRaises( - ValueError, make_kademlia_peer, self.node_ids[1], 'beee:eeee:eeee:eeee:eeee:eeee:eeee:eeef', 1000 + ValueError, make_kademlia_peer, self.node_ids[1], 'beee:eeee:eeee:eeee:eeee:eeee:eeee:eeef', 1024 ) self.assertRaises( - ValueError, make_kademlia_peer, self.node_ids[1], '2001:db8::ff00:42:8329', 1000 + ValueError, make_kademlia_peer, self.node_ids[1], '2001:db8::ff00:42:8329', 1024 ) def test_is_valid_ipv4(self): @@ -79,7 +80,7 @@ class PeerTest(AsyncioTestCase): def test_boolean(self): self.assertNotEqual(self.first_contact, self.second_contact) self.assertEqual( - self.second_contact, make_kademlia_peer(self.node_ids[0], '1.0.0.2', udp_port=1000) + self.second_contact, make_kademlia_peer(self.node_ids[0], '1.0.0.2', udp_port=1024) ) def test_compact_ip(self):