aljaz/plugins
1
0
Fork 0
mirror of https://github.com/aljazceru/plugins.git synced 2025-12-19 14:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

backup: Add support for IPv6 addresses in socket backend

Browse Source 
Support the bracketed `socket:[::]:1234` syntax for IPv6 addresses.

Also, add factor out the socket URI parsing to a function and add
tests for it. As a forward compatibility measure, reject query strings
(`?a=b`) because I intend to use these for parameters such as SOCKS5
proxy (for Tor) in a future patch.
This commit is contained in:
Wladimir J. van der Laan
2021-02-04 18:10:37 +01:00
committed by Christian Decker
parent ca75d7e132
commit cdfcd5a2fe
3 changed files with 96 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
backup/test_backup.py
View File

@@ -1,5 +1,6 @@
from backend import Backend
from filebackend import FileBackend
import socketbackend
from flaky import flaky
from pyln.testing.fixtures import * # noqa: F401,F403
from pyln.testing.utils import sync_blockheight
@@ -279,3 +280,38 @@ def test_compact(bitcoind, directory, node_factory):
l1.rpc.backup_compact()
tmp = tempfile.TemporaryDirectory()
subprocess.check_call([cli_path, "restore", bdest, tmp.name])
def test_parse_socket_url():
with pytest.raises(ValueError):
# fail: invalid url scheme
socketbackend.parse_socket_url('none')
# fail: no port number
socketbackend.parse_socket_url('socket:127.0.0.1')
socketbackend.parse_socket_url('socket:127.0.0.1:')
# fail: unbracketed IPv6
socketbackend.parse_socket_url('socket:::1:1234')
# fail: no port number IPv6
socketbackend.parse_socket_url('socket:[::1]')
socketbackend.parse_socket_url('socket:[::1]:')
# fail: invalid port number
socketbackend.parse_socket_url('socket:127.0.0.1:12bla')
# fail: unrecognized query string key
socketbackend.parse_socket_url('socket:127.0.0.1:1234?dummy=value')
# IPv4
s = socketbackend.parse_socket_url('socket:127.0.0.1:1234')
assert(s.host == '127.0.0.1')
assert(s.port == 1234)
assert(s.addrtype == socketbackend.AddrType.IPv4)
# IPv6
s = socketbackend.parse_socket_url('socket:[::1]:1235')
assert(s.host == '::1')
assert(s.port == 1235)
assert(s.addrtype == socketbackend.AddrType.IPv6)
# Hostname
s = socketbackend.parse_socket_url('socket:backup.local:1236')
assert(s.host == 'backup.local')
assert(s.port == 1236)
assert(s.addrtype == socketbackend.AddrType.NAME)