properly support verbatim ipv6 addresses

This commit is contained in:
Jörg Thalheim
2024-10-10 16:32:14 +02:00
parent 8e3ca40e0c
commit 91d5741c97
2 changed files with 10 additions and 0 deletions

View File

@@ -845,6 +845,10 @@ def parse_deployment_address(
meta = {} meta = {}
parts = host.split("@") parts = host.split("@")
user: str | None = None user: str | None = None
# count the number of : in the hostname
if host.count(":") > 1 and not host.startswith("["):
msg = f"Invalid hostname: {host}. IPv6 addresses must be enclosed in brackets , e.g. [::1]"
raise ClanError(msg)
if len(parts) > 1: if len(parts) > 1:
user = parts[0] user = parts[0]
hostname = parts[1] hostname = parts[1]

View File

@@ -1,5 +1,7 @@
import subprocess import subprocess
import pytest
from clan_cli.errors import ClanError
from clan_cli.ssh import Host, HostGroup, HostKeyCheck, parse_deployment_address from clan_cli.ssh import Host, HostGroup, HostKeyCheck, parse_deployment_address
@@ -11,6 +13,10 @@ def test_parse_ipv6() -> None:
assert host.host == "fe80::1%eth0" assert host.host == "fe80::1%eth0"
assert host.port is None assert host.port is None
with pytest.raises(ClanError):
# We instruct the user to use brackets for IPv6 addresses
host = parse_deployment_address("foo", "fe80::1%eth0", HostKeyCheck.STRICT)
def test_run(host_group: HostGroup) -> None: def test_run(host_group: HostGroup) -> None:
proc = host_group.run("echo hello", stdout=subprocess.PIPE) proc = host_group.run("echo hello", stdout=subprocess.PIPE)