AaronFiore/electrum
1
0
Fork 0
Code Activity

interface.deserialize_server: better ipv6 handling

Browse Source
This commit is contained in:
SomberNight
2019-11-26 00:17:00 +01:00
parent 13d6997355
commit d430ec4bfc
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/interface.py
View File

@@ -31,7 +31,7 @@ import asyncio
import socket import socket
from typing import Tuple, Union, List, TYPE_CHECKING, Optional from typing import Tuple, Union, List, TYPE_CHECKING, Optional
from collections import defaultdict from collections import defaultdict
from ipaddress import IPv4Network, IPv6Network, ip_address from ipaddress import IPv4Network, IPv6Network, ip_address, IPv6Address
import itertools import itertools
import logging import logging
@@ -193,11 +193,12 @@ def deserialize_server(server_str: str) -> Tuple[str, str, str]:
host, port, protocol = str(server_str).rsplit(':', 2) host, port, protocol = str(server_str).rsplit(':', 2)
if not host: if not host:
raise ValueError('host must not be empty') raise ValueError('host must not be empty')
if host[0] == '[' and host[-1] == ']': # IPv6
host = host[1:-1]
if protocol not in ('s', 't'): if protocol not in ('s', 't'):
raise ValueError('invalid network protocol: {}'.format(protocol)) raise ValueError('invalid network protocol: {}'.format(protocol))
int(port) # Throw if cannot be converted to int net_addr = NetAddress(host, port) # this validates host and port
if not (0 < int(port) < 2**16): host = str(net_addr.host) # canonical form (if e.g. IPv6 address)
raise ValueError('port {} is out of valid range'.format(port))
return host, port, protocol return host, port, protocol
@@ -218,11 +219,11 @@ class Interface(Logger):
Logger.__init__(self) Logger.__init__(self)
assert network.config.path assert network.config.path
self.cert_path = os.path.join(network.config.path, 'certs', self.host) self.cert_path = os.path.join(network.config.path, 'certs', self.host)
self.blockchain = None self.blockchain = None # type: Optional[Blockchain]
self._requested_chunks = set() self._requested_chunks = set()
self.network = network self.network = network
self._set_proxy(proxy) self._set_proxy(proxy)
self.session = None # type: NotificationSession self.session = None # type: Optional[NotificationSession]
self._ipaddr_bucket = None self._ipaddr_bucket = None
self.tip_header = None self.tip_header = None
@@ -236,7 +237,7 @@ class Interface(Logger):
self.group = SilentTaskGroup() self.group = SilentTaskGroup()
def diagnostic_name(self): def diagnostic_name(self):
return f"{self.host}:{self.port}" return str(NetAddress(self.host, self.port))
def _set_proxy(self, proxy: dict): def _set_proxy(self, proxy: dict):
if proxy: if proxy: