X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=e2cf5f8be125fb2bc215379857b8766d10ce6327;hp=3d4a36528d78c6b1cdaf76072218ac03f2718896;hb=6d959e3fe3150bb87a18b4bfbf846bd7b6da00ec;hpb=aedde2c2dffabda2b2f85772b3dc7f3b1b2e2728

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 3d4a365..e2cf5f8 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -5,12 +5,13 @@ use strict;
 use POSIX;
 use Data::Dumper;
 use Digest::SHA;
+use Socket qw(AF_INET6 inet_ntop inet_pton);
 use PVE::INotify;
 use PVE::Exception qw(raise raise_param_exc);
 use PVE::JSONSchema qw(register_standard_option get_standard_option);
 use PVE::Cluster;
 use PVE::ProcFSTools;
-use PVE::Tools qw($IPV4RE);
+use PVE::Tools qw($IPV4RE $IPV6RE);
 use File::Basename;
 use File::Path;
 use IO::File;
@@ -44,11 +45,11 @@ my $max_alias_name_length = 64;
 my $max_ipset_name_length = 64;
 my $max_group_name_length = 20;
 
-PVE::JSONSchema::register_format('IPv4orCIDR', \&pve_verify_ipv4_or_cidr);
-sub pve_verify_ipv4_or_cidr {
+PVE::JSONSchema::register_format('IPorCIDR', \&pve_verify_ip_or_cidr);
+sub pve_verify_ip_or_cidr {
     my ($cidr, $noerr) = @_;
 
-    if ($cidr =~ m!^(?:$IPV4RE)(/(\d+))?$!) {
+    if ($cidr =~ m!^(?:$IPV6RE|$IPV4RE)(/(\d+))?$!) {
 	return $cidr if Net::IP->new($cidr);
 	return undef if $noerr;
 	die Net::IP::Error() . "\n";
@@ -57,19 +58,13 @@ sub pve_verify_ipv4_or_cidr {
     die "value does not look like a valid IP address or CIDR network\n";
 }
 
-PVE::JSONSchema::register_format('IPv4orCIDRorAlias', \&pve_verify_ipv4_or_cidr_or_alias);
-sub pve_verify_ipv4_or_cidr_or_alias {
+PVE::JSONSchema::register_format('IPorCIDRorAlias', \&pve_verify_ip_or_cidr_or_alias);
+sub pve_verify_ip_or_cidr_or_alias {
     my ($cidr, $noerr) = @_;
 
     return if $cidr =~ m/^(?:$ip_alias_pattern)$/;
 
-    if ($cidr =~ m!^(?:$IPV4RE)(/(\d+))?$!) {
-	return $cidr if Net::IP->new($cidr);
-	return undef if $noerr;
-	die Net::IP::Error() . "\n";
-    }
-    return undef if $noerr;
-    die "value does not look like a valid IP address or CIDR network\n";
+    return pve_verify_ip_or_cidr($cidr, $noerr);
 }
 
 PVE::JSONSchema::register_standard_option('ipset-name', {
@@ -761,10 +756,12 @@ sub local_network {
     return $__local_network;
 }
 
-# ipset names are limited to 31 characters, and we use '_swap' 
-# suffix for atomic update, for example PVEFW-${VMID}-${ipset_name}_swap
+# ipset names are limited to 31 characters,
+# and we use '-v4' or '-v6' to indicate IP versions, 
+# and we use '_swap' suffix for atomic update, 
+# for example PVEFW-${VMID}-${ipset_name}_swap
 
-my $max_iptables_ipset_name_length = 31 - length("_swap");
+my $max_iptables_ipset_name_length = 31 - length("_swap") - length("-v4");
 
 sub compute_ipset_chain_name {
     my ($vmid, $ipset_name) = @_;
@@ -773,7 +770,6 @@ sub compute_ipset_chain_name {
 
     my $id = "$vmid-${ipset_name}";
 
-   
     if ((length($id) + 6) > $max_iptables_ipset_name_length) {
 	$id = PVE::Tools::fnv31a_hex($id);
     }
@@ -1100,7 +1096,7 @@ sub verify_rule {
     };
 
     my $check_ipset_or_alias_property = sub {
-	my ($name) = @_;
+	my ($name, $expected_ipversion) = @_;
 
 	if (my $value = $rule->{$name}) {
 	    if ($value =~ m/^\+/) {
@@ -1114,7 +1110,13 @@ sub verify_rule {
 	    } elsif ($value =~ m/^${ip_alias_pattern}$/){
 		my $alias = lc($value);
 		&$add_error($name, "no such alias '$value'")
-		    if !($cluster_conf->{aliases}->{$alias} || ($fw_conf && $fw_conf->{aliases}->{$alias}))
+		    if !($cluster_conf->{aliases}->{$alias} || ($fw_conf && $fw_conf->{aliases}->{$alias}));
+
+		my $e = $fw_conf->{aliases}->{$alias} if $fw_conf;
+		$e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf;
+
+		die "detected mixed ipv4/ipv6 adresses in rule\n"
+		    if $expected_ipversion && ($expected_ipversion != $e->{ipversion});
 	    }
 	}
     };
@@ -1185,18 +1187,18 @@ sub verify_rule {
     if ($rule->{source}) {
 	eval { $ipversion = parse_address_list($rule->{source}); };
 	&$add_error('source', $@) if $@;
-	&$check_ipset_or_alias_property('source');
+	&$check_ipset_or_alias_property('source', $ipversion);
     }
 
     if ($rule->{dest}) {
 	eval { 
 	    my $dest_ipversion = parse_address_list($rule->{dest}); 
 	    die "detected mixed ipv4/ipv6 adresses in rule\n"
-		if defined($ipversion) && ($dest_ipversion != $ipversion);
-	    $ipversion = $dest_ipversion;
+		if $ipversion && $dest_ipversion && ($dest_ipversion != $ipversion);
+	    $ipversion = $dest_ipversion if $dest_ipversion;
 	};
 	&$add_error('dest', $@) if $@;
-	&$check_ipset_or_alias_property('dest');
+	&$check_ipset_or_alias_property('dest', $ipversion);
     }
 
     if ($rule->{macro} && !$error_count) {
@@ -2202,16 +2204,31 @@ sub parse_clusterfw_option {
 sub resolve_alias {
     my ($clusterfw_conf, $fw_conf, $cidr) = @_;
 
-    if ($cidr !~ m/^\d/) {
-	my $alias = lc($cidr);
-	my $e = $fw_conf->{aliases}->{$alias} if $fw_conf;
-	$e = $clusterfw_conf->{aliases}->{$alias} if !$e && $clusterfw_conf;
-	return $e->{cidr} if $e;
-	
-	die "no such alias '$cidr'\n";
+    my $alias = lc($cidr);
+    my $e = $fw_conf->{aliases}->{$alias} if $fw_conf;
+    $e = $clusterfw_conf->{aliases}->{$alias} if !$e && $clusterfw_conf;
+
+    die "no such alias '$cidr'\n" if !$e;;
+
+    return wantarray ? ($e->{cidr}, $e->{ipversion}) : $e->{cidr};
+}
+
+sub parse_ip_or_cidr {
+    my ($cidr) = @_;
+
+    my $ipversion;
+    
+    if ($cidr =~ m!^(?:$IPV6RE)(/(\d+))?$!) {
+	$cidr =~ s|/128$||;
+	$ipversion = 6;
+    } elsif ($cidr =~ m!^(?:$IPV4RE)(/(\d+))?$!) {
+	$cidr =~ s|/32$||;
+	$ipversion = 4;
+    } else {
+	die "value does not look like a valid IP address or CIDR network\n";
     }
 
-    return $cidr;
+    return wantarray ? ($cidr, $ipversion) : $cidr;
 }
 
 sub parse_alias {
@@ -2222,11 +2239,14 @@ sub parse_alias {
 
     if ($line =~ m/^(\S+)\s(\S+)$/) {
 	my ($name, $cidr) = ($1, $2);
-	$cidr =~ s|/32$||;
-	pve_verify_ipv4_or_cidr($cidr);
+	my $ipversion;
+
+	($cidr, $ipversion) = parse_ip_or_cidr($cidr);
+
 	my $data = {
 	    name => $name,
 	    cidr => $cidr,
+	    ipversion => $ipversion,
 	};
 	$data->{comment} = $comment  if $comment;
 	return $data;
@@ -2364,8 +2384,7 @@ sub generic_fw_config_parser {
 		if ($cidr =~ m/^${ip_alias_pattern}$/) {
 		    resolve_alias($cluster_conf, $res, $cidr); # make sure alias exists
 		} else {
-		    $cidr =~ s|/32$||;
-		    pve_verify_ipv4_or_cidr_or_alias($cidr);
+		    $cidr = parse_ip_or_cidr($cidr);
 		}
 	    };
 	    if (my $err = $@) {
@@ -2718,39 +2737,64 @@ sub generate_ipset {
 
     die "duplicate ipset chain '$name'\n" if defined($ipset_ruleset->{$name});
 
-    my $hashsize = scalar(@$options);
-    if ($hashsize <= 64) {
-	$hashsize = 64;
-    } else {
-	$hashsize = round_powerof2($hashsize);
-    }
-
-    $ipset_ruleset->{$name} = ["create $name hash:net family inet hashsize $hashsize maxelem $hashsize"];
+    $ipset_ruleset->{$name} = ["create $name list:set size 4"];
 
     # remove duplicates
     my $nethash = {};
     foreach my $entry (@$options) {
 	next if $entry->{errors}; # skip entries with errors
 	eval {
-	    my $cidr = resolve_alias($clusterfw_conf, $fw_conf, $entry->{cidr});
-	    $nethash->{$cidr} = { cidr => $cidr, nomatch => $entry->{nomatch} };
+	    my ($cidr, $ipversion);
+	    if ($entry->{cidr} =~ m/^${ip_alias_pattern}$/) {
+		($cidr, $ipversion) = resolve_alias($clusterfw_conf, $fw_conf, $entry->{cidr});
+            } else {
+		($cidr, $ipversion) = parse_ip_or_cidr($entry->{cidr});
+	    }
+	    #http://backreference.org/2013/03/01/ipv6-address-normalization/
+	    if ($ipversion == 6) {
+		my $ipv6 = inet_pton(AF_INET6, lc($cidr));
+		$cidr = inet_ntop(AF_INET6, $ipv6);
+		$cidr =~ s|/128$||;
+	    } else {
+		$cidr =~ s|/32$||;
+	    }
+
+	    $nethash->{$ipversion}->{$cidr} = { cidr => $cidr, nomatch => $entry->{nomatch} };
 	};
 	warn $@ if $@;
     }
 
-    foreach my $cidr (sort keys %$nethash) {
-	my $entry = $nethash->{$cidr};
+    foreach my $ipversion (sort keys %$nethash) {
+	my $data = $nethash->{$ipversion};
+	my $subname = "$name-v$ipversion";
+
+	my $hashsize = scalar(@$options);
+	if ($hashsize <= 64) {
+	    $hashsize = 64;
+	} else {
+	    $hashsize = round_powerof2($hashsize);
+	}
+
+	my $family = $ipversion == "6" ? "inet6" : "inet";
+
+	$ipset_ruleset->{$subname} = ["create $subname hash:net family $family hashsize $hashsize maxelem $hashsize"];
+
+	foreach my $cidr (sort keys %$data) {
+	    my $entry = $data->{$cidr};
 
-	my $cmd = "add $name $cidr";
-	if ($entry->{nomatch}) {
-	    if ($feature_ipset_nomatch) {
-		push @{$ipset_ruleset->{$name}}, "$cmd nomatch";
+	    my $cmd = "add $subname $cidr";
+	    if ($entry->{nomatch}) {
+		if ($feature_ipset_nomatch) {
+		    push @{$ipset_ruleset->{$subname}}, "$cmd nomatch";
+		} else {
+		    warn "ignore !$cidr - nomatch not supported by kernel\n";
+		}
 	    } else {
-		warn "ignore !$cidr - nomatch not supported by kernel\n";
+		push @{$ipset_ruleset->{$subname}}, $cmd;
 	    }
-	} else {
-	    push @{$ipset_ruleset->{$name}}, $cmd;
 	}
+
+	push @{$ipset_ruleset->{$name}}, "add $name $subname";
     }
 }
 
@@ -3151,6 +3195,11 @@ sub get_ipset_cmdlist {
 		$cmdlist .= "$cmd\n";
 	    }
 	}
+    }
+
+    foreach my $chain (sort keys %$ruleset) {
+	my $stat = $statushash->{$chain};
+	die "internal error" if !$stat;
 
 	if ($stat->{action} eq 'update') {
 	    my $chain_swap = $chain."_swap";
@@ -3163,10 +3212,9 @@ sub get_ipset_cmdlist {
 	    $cmdlist .= "flush $chain_swap\n";
 	    $cmdlist .= "destroy $chain_swap\n";
 	}
-
     }
 
-    foreach my $chain (keys %$statushash) {
+    foreach my $chain (sort keys %$statushash) {
 	next if $statushash->{$chain}->{action} ne 'delete';
 
 	$delete_cmdlist .= "flush $chain\n";