Instead of trying to do partial checks to validate the interface name
in accordance with `pve-iface` in pve-common, just copy the regular
expression. This comes at the expense of a longer and unified
error-message for different errors, but I'd consider this acceptable.
The length of {1,20} is also copied from the pve-iface validation
regex to make this a literal copy. The kernel restricts it to 15 bytes
(16 with terminating \0) - but we check for the actual length
boundaries before anyways.
Fixes: fc9e720 ("sys: net: fix error-message for interface names first
character")
Reported-by: Thomas Lamprecht <[email protected]>
Signed-off-by: Stoiko Ivanov <[email protected]>
---
Proxmox/Sys/Net.pm | 15 +++------------
test/validate-link-pin-map.pl | 12 ++++++++----
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/Proxmox/Sys/Net.pm b/Proxmox/Sys/Net.pm
index 37feee1..e3b3b56 100644
--- a/Proxmox/Sys/Net.pm
+++ b/Proxmox/Sys/Net.pm
@@ -335,18 +335,9 @@ sub validate_link_pin_map : prototype($) {
. " characters\n";
}
- if ($name =~ m/^[0-9]+$/) {
- die "interface name '$name' for '$mac' is invalid: "
- . "name must not be fully numeric\n";
- }
-
- if ($name !~ m/^[a-z]/) {
- die "interface name '$name' for '$mac' is invalid: name must start
with a lower-case letter\n";
- }
-
- if ($name !~ m/^[a-zA-Z_][a-zA-Z0-9_]*$/) {
- die "interface name '$name' for '$mac' is invalid: "
- . "name must only consist of alphanumeric characters and
underscores\n";
+ if ($name !~ m/^[a-z][a-z0-9_]{1,20}([:\.]\d+)?$/i) {
+ die "interface name '$name' for '$mac' is invalid: name must start
with a letter and "
+ . "contain only ascii characters, digits and underscores\n";
}
if ($reverse_mapping->{$name}) {
diff --git a/test/validate-link-pin-map.pl b/test/validate-link-pin-map.pl
index 3fbd0e4..2cb8a90 100755
--- a/test/validate-link-pin-map.pl
+++ b/test/validate-link-pin-map.pl
@@ -38,28 +38,32 @@ like($@, qr/12:34:56:ab:cd:ef/, "duplicate error message
contains expected mac a
eval { validate_link_pin_map({ 'ab:cd:ef:12:34:56' => 'nic-' }) };
is(
$@,
- "interface name 'nic-' for 'ab:cd:ef:12:34:56' is invalid: name must only
consist of alphanumeric characters and underscores\n",
+ "interface name 'nic-' for 'ab:cd:ef:12:34:56' is invalid: name must start
with a letter and "
+ . "contain only ascii characters, digits and underscores\n",
"name with dash is rejected",
);
eval { validate_link_pin_map({ 'ab:cd:ef:12:34:56' => '0nic' }) };
is(
$@,
- "interface name '0nic' for 'ab:cd:ef:12:34:56' is invalid: name must start
with a lower-case letter\n",
+ "interface name '0nic' for 'ab:cd:ef:12:34:56' is invalid: name must start
with a letter and "
+ . "contain only ascii characters, digits and underscores\n",
"name starting with number is rejected",
);
eval { validate_link_pin_map({ 'ab:cd:ef:12:34:56' => '_a' }) };
is(
$@,
- "interface name '_a' for 'ab:cd:ef:12:34:56' is invalid: name must start
with a lower-case letter\n",
+ "interface name '_a' for 'ab:cd:ef:12:34:56' is invalid: name must start
with a letter and "
+ . "contain only ascii characters, digits and underscores\n",
"name starting with underscore is rejected",
);
eval { validate_link_pin_map({ 'ab:cd:ef:12:34:56' => '12345' }) };
is(
$@,
- "interface name '12345' for 'ab:cd:ef:12:34:56' is invalid: name must not
be fully numeric\n",
+ "interface name '12345' for 'ab:cd:ef:12:34:56' is invalid: name must
start with a letter and "
+ . "contain only ascii characters, digits and underscores\n",
"fully numeric name is rejected",
);
--
2.47.3
_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
