saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix parsing of IPv4 mapped IPv6 addresses

Browse source
This commit is contained in:
twangboy 2024-08-26 15:05:12 -06:00 • committed by Daniel Wozniak
parent 676945eec7
commit 8b16003cab
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog/66837.fixed.md Normal file
View file

@ -0,0 +1,3 @@
Issue 66837: Fixes an issue with the `network.local_port_tcp` function
where it was not parsing the IPv4 mapped IPv6 address correctly. The
``::ffff:`` is now removed and only the IP address is returned.

8
salt/utils/network.py
View file

@ -1740,7 +1740,13 @@ def _netlink_tool_remote_on(port, which_end):
continue
if which_end == "local_port" and int(local_port) != int(port):
continue
remotes.add(remote_host.strip("[]"))
# Interpret IPv4-mapped IPv6 addresses as IPv4 (strip prefix)
remote_host = remote_host.strip("[]").lower()
if remote_host.startswith("::ffff:"):
remote_host = remote_host[7:]
remotes.add(remote_host)
if valid is False:
remotes = None

12
tests/pytests/unit/utils/test_network.py
View file

@ -11,7 +11,7 @@ from salt._compat import ipaddress
from tests.support.mock import MagicMock, create_autospec, mock_open, patch
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.windows_whitelisted,
]
@ -722,13 +722,13 @@ def test_netlink_tool_remote_on_a():
with patch("salt.utils.platform.is_linux", return_value=True):
with patch("subprocess.check_output", return_value=LINUX_NETLINK_SS_OUTPUT):
remotes = network._netlink_tool_remote_on("4506", "local_port")
assert remotes == {"192.168.122.177", "::ffff:127.0.0.1"}
assert remotes == {"192.168.122.177", "127.0.0.1"}
def test_netlink_tool_remote_on_b():
with patch("subprocess.check_output", return_value=LINUX_NETLINK_SS_OUTPUT):
remotes = network._netlink_tool_remote_on("4505", "remote_port")
assert remotes == {"127.0.0.1", "::ffff:1.2.3.4"}
assert remotes == {"127.0.0.1", "1.2.3.4"}
def test_openbsd_remotes_on():
@ -1430,6 +1430,7 @@ def test_isportopen_false():
assert ret is False
@pytest.mark.skip_on_windows(reason="Do not run on Windows")
def test_isportopen():
ret = network.isportopen("127.0.0.1", "22")
assert ret == 0
@ -1445,6 +1446,7 @@ def test_get_socket():
assert ret.type == socket.SOCK_STREAM
@pytest.mark.skip_on_windows(reason="Do not run on Windows")
def test_ip_to_host(grains):
ret = network.ip_to_host("127.0.0.1")
if grains["oscodename"] == "Photon":
@ -1506,6 +1508,7 @@ def test_rpad_ipv4_network(addr, expected):
assert network.rpad_ipv4_network(addr) == expected
@pytest.mark.skip_on_windows(reason="Do not run on Windows")
def test_hw_addr(linux_interfaces_dict, freebsd_interfaces_dict):
with patch(
@ -1531,6 +1534,7 @@ def test_hw_addr(linux_interfaces_dict, freebsd_interfaces_dict):
)
@pytest.mark.skip_on_windows(reason="Do not run on Windows")
def test_interface_and_ip(linux_interfaces_dict):
with patch(
@ -1557,6 +1561,7 @@ def test_interface_and_ip(linux_interfaces_dict):
assert ret == 'Interface "dog" not in available interfaces: "eth0", "lo"'
@pytest.mark.skip_on_windows(reason="Do not run on Windows")
def test_subnets(linux_interfaces_dict):
with patch(
@ -1581,6 +1586,7 @@ def test_in_subnet(caplog):
assert not ret
@pytest.mark.skip_on_windows(reason="Do not run on Windows")
def test_ip_addrs(linux_interfaces_dict):
with patch(
"salt.utils.network.linux_interfaces",