Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

parse-nm/wg: append the correct prefix to IPv6 addresses (LP: #2046158) #428

Merged
merged 1 commit into from
Jan 4, 2024
Merged

parse-nm/wg: append the correct prefix to IPv6 addresses (LP: #2046158) #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/parse-nm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,13 +543,16 @@ parse_tunnels(GKeyFile* kf, NetplanNetDefinition* nd)
/*
* NM doesn't care if the prefix was omitted.
* Even though the WG manual says it requires the prefix,
* if it's omitted in its config file it will default to /32
* so we should do the same here and append a /32 if it's not present,
* otherwise we will generate a YAML that will fail validation.
* if it's omitted in its config file it will default to /32 for IPv4
* and /128 for IPv6 so we should do the same here and append a /32 or /128
* if it's not present, otherwise we will generate a YAML that will fail validation.
*/
if (!g_strrstr(ip, "/"))
address = g_strdup_printf("%s/32", ip);
else
if (!g_strrstr(ip, "/")) {
if (is_ip4_address(ip))
address = g_strdup_printf("%s/32", ip);
else
address = g_strdup_printf("%s/128", ip);
} else
address = g_strdup(ip);
g_array_append_val(wireguard_peer->allowed_ips, address);
}
Expand Down
6 changes: 4 additions & 2 deletions tests/parser/test_keyfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,7 +1963,8 @@ def test_wireguard_with_empty_endpoint(self):

def test_wireguard_allowed_ips_without_prefix(self):
'''
When the IP prefix is not present we should default to /32
When the IP prefix is not present we should default to /32 for IPv4
and /128 for IPv6.
'''
self.generate_from_keyfile('''[connection]
id=wg0
Expand All @@ -1976,7 +1977,7 @@ def test_wireguard_allowed_ips_without_prefix(self):

[wireguard-peer.cwkb7k0xDgLSnunZpFIjLJw4u+mJDDr+aBR5DqzpmgI=]
endpoint=1.2.3.4:12345
allowed-ips=192.168.0.10
allowed-ips=192.168.0.10;2001::1;

[ipv4]
method=auto\n'''.format(UUID), regenerate=False)
Expand All @@ -1995,6 +1996,7 @@ def test_wireguard_allowed_ips_without_prefix(self):
public: "cwkb7k0xDgLSnunZpFIjLJw4u+mJDDr+aBR5DqzpmgI="
allowed-ips:
- "192.168.0.10/32"
- "2001::1/128"
networkmanager:
uuid: "{}"
name: "wg0"
Expand Down