From f9792937408668c6b145989ec49695fd162e230d Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 17 Nov 2014 12:41:03 +0100 Subject: [PATCH] API2::Firewall::IPSet: fix alias check for ipv6 addresses --- src/PVE/API2/Firewall/IPSet.pm | 3 ++- src/PVE/Firewall.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/Firewall/IPSet.pm b/src/PVE/API2/Firewall/IPSet.pm index 60f7105..1266fd1 100644 --- a/src/PVE/API2/Firewall/IPSet.pm +++ b/src/PVE/API2/Firewall/IPSet.pm @@ -188,7 +188,8 @@ sub register_create_ip { } # make sure alias exists (if $cidr is an alias) - PVE::Firewall::resolve_alias($cluster_conf, $fw_conf, $cidr); + PVE::Firewall::resolve_alias($cluster_conf, $fw_conf, $cidr) + if $cidr =~ m/^${PVE::Firewall::ip_alias_pattern}$/; my $data = { cidr => $cidr }; diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 4935be8..fcbac36 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -39,7 +39,7 @@ eval { my $security_group_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; my $ipset_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; -my $ip_alias_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; +our $ip_alias_pattern = '[A-Za-z][A-Za-z0-9\-\_]+'; my $max_alias_name_length = 64; my $max_ipset_name_length = 64; -- 2.39.2