X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=c9b6e1f4ce578878a7036729eacdd1ed80f713ef;hp=aa7de7e2c1453fb759c15e653cd1f0e585f32d8e;hb=708ba7149c029d4916a3529e2d1997fc1e25bd0c;hpb=5383df39a0708988c43d2e62a5da3768e1432d0e

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index aa7de7e..c9b6e1f 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -720,7 +720,7 @@ sub local_network {
 	my $ip = PVE::Cluster::remote_node_ip($nodename);
 
 	my $testip = Net::IP->new($ip);
-   
+
 	my $routes = PVE::ProcFSTools::read_proc_net_route();
 	foreach my $entry (@$routes) {
 	    my $mask = $ipv4_mask_hash_localnet->{$entry->{mask}};
@@ -739,6 +739,23 @@ sub local_network {
     return $__local_network;
 }
 
+my $max_ipset_name_length = 27;
+
+sub compute_ipset_chain_name {
+    my ($vmid, $ipset_name) = @_;
+
+    $vmid = 0 if !defined($vmid);
+
+    my $id = "$vmid-${ipset_name}";
+
+   
+    if ((length($id) + 6) > $max_ipset_name_length) {
+	$id = PVE::Tools::fnv31a_hex($id);
+    }
+
+    return "PVEFW-$id";
+}
+
 sub parse_address_list {
     my ($str) = @_;
 
@@ -1016,7 +1033,7 @@ sub verify_rule {
     my ($rule, $cluster_conf, $fw_conf, $rule_env, $noerr) = @_;
 
     my $allow_groups = $rule_env eq 'group' ? 0 : 1;
-    
+
     my $allow_iface = $rule_env_iface_lookup->{$rule_env};
     die "unknown rule_env '$rule_env'\n" if !defined($allow_iface); # should not happen
 
@@ -1038,15 +1055,15 @@ sub verify_rule {
 	if (my $value = $rule->{$name}) {
 	    if ($value =~ m/^\+/) {
 		if ($value =~ m/^\+(${security_group_name_pattern})$/) {
-		    &$add_error($name, "no such ipset '$1'") 
+		    &$add_error($name, "no such ipset '$1'")
 			if !($cluster_conf->{ipset}->{$1} || ($fw_conf && $fw_conf->{ipset}->{$1}));
-				 
+
 		} else {
 		    &$add_error($name, "invalid security group name '$value'");
 		}
 	    } elsif ($value =~ m/^${ip_alias_pattern}$/){
 		my $alias = lc($value);
-		&$add_error($name, "no such alias '$value'") 
+		&$add_error($name, "no such alias '$value'")
 		    if !($cluster_conf->{aliases}->{$alias} || ($fw_conf && $fw_conf->{aliases}->{$alias}))
 	    }
 	}
@@ -1054,7 +1071,7 @@ sub verify_rule {
 
     my $type = $rule->{type};
     my $action = $rule->{action};
-    
+
     &$add_error('type', "missing property") if !$type;
     &$add_error('action', "missing property") if !$action;
 
@@ -1073,7 +1090,7 @@ sub verify_rule {
     }
 
     if ($rule->{iface}) {
-	&$add_error('type', "parameter -i not allowed for this rule type") 
+	&$add_error('type', "parameter -i not allowed for this rule type")
 	    if !$allow_iface;
 	eval { PVE::JSONSchema::pve_verify_iface($rule->{iface}); };
 	&$add_error('iface', $@) if $@;
@@ -1300,7 +1317,7 @@ sub ipset_get_chains {
 }
 
 sub ruleset_generate_cmdstr {
-    my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_;
+    my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
 
     return if defined($rule->{enable}) && !$rule->{enable};
     return if $rule->{errors};
@@ -1321,19 +1338,27 @@ sub ruleset_generate_cmdstr {
     if ($source) {
         if ($source =~ m/^\+/) {
 	    if ($source =~ m/^\+(${security_group_name_pattern})$/) {
-		die "no such ipset '$1'\n" if !$cluster_conf->{ipset}->{$1};
-		push @cmd, "-m set --match-set PVEFW-$1 src";
+		my $name = $1;
+		if ($fw_conf && $fw_conf->{ipset}->{$name}) {
+		    my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name);
+		    push @cmd, "-m set --match-set ${ipset_chain} src";
+		} elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
+		    my $ipset_chain = compute_ipset_chain_name(0, $name);
+		    push @cmd, "-m set --match-set ${ipset_chain} src";
+		} else {
+		    die "no such ipset '$name'\n";
+		}
 	    } else {
 		die "invalid security group name '$source'\n";
 	    }
 	} elsif ($source =~ m/^${ip_alias_pattern}$/){
 	    my $alias = lc($source);
-	    my $e = $cluster_conf->{aliases}->{$alias};
-	    die "no such alias $source\n" if !$e;
+	    my $e = $fw_conf->{aliases}->{$alias} if $fw_conf;
+	    $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf;
+	    die "no such alias '$source'\n" if !$e;
 	    push @cmd, "-s $e->{cidr}";
         } elsif ($source =~ m/\-/){
 	    push @cmd, "-m iprange --src-range $source";
-
 	} else {
 	    push @cmd, "-s $source";
         }
@@ -1342,19 +1367,27 @@ sub ruleset_generate_cmdstr {
     if ($dest) {
         if ($dest =~ m/^\+/) {
 	    if ($dest =~ m/^\+(${security_group_name_pattern})$/) {
-		die "no such ipset '$1'\n" if !$cluster_conf->{ipset}->{$1};
-		push @cmd, "-m set --match-set PVEFW-$1 dst";
+		my $name = $1;
+		if ($fw_conf && $fw_conf->{ipset}->{$name}) {
+		    my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $name);
+		    push @cmd, "-m set --match-set ${ipset_chain} src";
+		} elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
+		    my $ipset_chain = compute_ipset_chain_name(0, $name);
+		    push @cmd, "-m set --match-set ${ipset_chain} dst";
+		} else {
+		    die "no such ipset '$name'\n";
+		}
 	    } else {
 		die "invalid security group name '$dest'\n";
 	    }
 	} elsif ($dest =~ m/^${ip_alias_pattern}$/){
 	    my $alias = lc($dest);
-	    my $e = $cluster_conf->{aliases}->{$alias};
-	    die "no such alias $dest" if !$e;
+	    my $e = $fw_conf->{aliases}->{$alias} if $fw_conf;
+	    $e = $cluster_conf->{aliases}->{$alias} if !$e && $cluster_conf;
+	    die "no such alias '$dest'\n" if !$e;
 	    push @cmd, "-d $e->{cidr}";
         } elsif ($dest =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){
 	    push @cmd, "-m iprange --dst-range $dest";
-
 	} else {
 	    push @cmd, "-d $dest";
         }
@@ -1414,7 +1447,7 @@ sub ruleset_generate_cmdstr {
 }
 
 sub ruleset_generate_rule {
-    my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf) = @_;
+    my ($ruleset, $chain, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
 
     my $rules;
 
@@ -1428,7 +1461,7 @@ sub ruleset_generate_rule {
 
     my @cmds = ();
     foreach my $tmp (@$rules) {
-	if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf)) {
+	if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf, $fw_conf)) {
 	    push @cmds, $cmdstr;
 	}
     }
@@ -1544,8 +1577,13 @@ sub ruleset_chain_add_input_filters {
     my ($ruleset, $chain, $options, $cluster_conf, $loglevel) = @_;
 
     if ($cluster_conf->{ipset}->{blacklist}){
-	ruleset_addlog($ruleset, $chain, 0, "DROP: ", $loglevel, "-m set --match-set PVEFW-blacklist src");
-	ruleset_addrule($ruleset, $chain, "-m set --match-set PVEFW-blacklist src -j DROP");
+	if (!ruleset_chain_exist($ruleset, "PVEFW-blacklist")) {
+	    ruleset_create_chain($ruleset, "PVEFW-blacklist");
+	    ruleset_addlog($ruleset, "PVEFW-blacklist", 0, "DROP: ", $loglevel) if $loglevel;
+	    ruleset_addrule($ruleset, "PVEFW-blacklist", "-j DROP");
+	}
+	my $ipset_chain = compute_ipset_chain_name(0, 'blacklist');
+	ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src -j PVEFW-blacklist");
     }
 
     if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
@@ -1589,7 +1627,7 @@ sub ruleset_add_group_rule {
     if(!ruleset_chain_exist($ruleset, $group_chain)){
 	generate_group_rules($ruleset, $cluster_conf, $group);
     }
-	
+
     if ($direction eq 'OUT' && $rule->{iface_out}) {
 	ruleset_addrule($ruleset, $chain, "-o $rule->{iface_out} -j $group_chain");
     } elsif ($direction eq 'IN' && $rule->{iface_in}) {
@@ -1602,7 +1640,7 @@ sub ruleset_add_group_rule {
 }
 
 sub ruleset_generate_vm_rules {
-    my ($ruleset, $rules, $cluster_conf, $chain, $netid, $direction, $options) = @_;
+    my ($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, $netid, $direction, $options) = @_;
 
     my $lc_direction = lc($direction);
 
@@ -1620,11 +1658,11 @@ sub ruleset_generate_vm_rules {
 		if ($direction eq 'OUT') {
 		    ruleset_generate_rule($ruleset, $chain, $rule,
 					  { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" },
-					  undef, $cluster_conf);
+					  undef, $cluster_conf, $vmfw_conf);
 		} else {
 		    ruleset_generate_rule($ruleset, $chain, $rule,
 					  { ACCEPT => $in_accept , REJECT => "PVEFW-reject" },
-					  undef, $cluster_conf);
+					  undef, $cluster_conf, $vmfw_conf);
 		}
 	    };
 	    warn $@ if $@;
@@ -1679,7 +1717,7 @@ sub generate_venet_rules_direction {
 
     ruleset_create_vm_chain($ruleset, $chain, $options, undef, $direction);
 
-    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $chain, 'venet', $direction);
+    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, 'venet', $direction);
 
     # implement policy
     my $policy;
@@ -1721,7 +1759,7 @@ sub generate_tap_rules_direction {
 
     ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction);
 
-    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $tapchain, $netid, $direction, $options);
+    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $tapchain, $netid, $direction, $options);
 
     ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface);
 
@@ -1775,15 +1813,15 @@ sub enable_host_firewall {
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
 	next if !$rule->{enable} || $rule->{errors};
-	
+
 	$rule->{iface_in} = $rule->{iface} if $rule->{iface};
 
 	eval {
 	    if ($rule->{type} eq 'group') {
 		ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'IN', $accept_action);
 	    } elsif ($rule->{type} eq 'in') {
-		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, 
-				      undef, $cluster_conf);
+		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" },
+				      undef, $cluster_conf, $hostfw_conf);
 	    }
 	};
 	warn $@ if $@;
@@ -1791,12 +1829,13 @@ sub enable_host_firewall {
     }
 
     # allow standard traffic for management ipset (includes cluster network)
-    my $mngmntsrc = "-m set --match-set PVEFW-management src";
+    my $mngmnt_ipset_chain = compute_ipset_chain_name(0, "management");
+    my $mngmntsrc = "-m set --match-set ${mngmnt_ipset_chain} src";
     ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 8006 -j $accept_action");  # PVE API
-    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 5900:5999 -j $accept_action");  # PVE VNC Console 
+    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 5900:5999 -j $accept_action");  # PVE VNC Console
     ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 3128 -j $accept_action");  # SPICE Proxy
     ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 22 -j $accept_action");  # SSH
-   
+
     my $localnet = local_network();
 
     # corosync
@@ -1834,8 +1873,8 @@ sub enable_host_firewall {
 	    if ($rule->{type} eq 'group') {
 		ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'OUT', $accept_action);
 	    } elsif ($rule->{type} eq 'out') {
-		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, 
-				      undef, $cluster_conf);
+		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" },
+				      undef, $cluster_conf, $hostfw_conf);
 	    }
 	};
 	warn $@ if $@;
@@ -1846,9 +1885,9 @@ sub enable_host_firewall {
     if ($localnet) {
 	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 8006 -j $accept_action");  # PVE API
 	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 22 -j $accept_action");  # SSH
-	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 5900:5999 -j $accept_action");  # PVE VNC Console 
+	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 5900:5999 -j $accept_action");  # PVE VNC Console
 	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 3128 -j $accept_action");  # SPICE Proxy
- 
+
 	my $corosync_rule = "-p udp --dport 5404:5405 -j $accept_action";
 	ruleset_addrule($ruleset, $chain, "-d $localnet $corosync_rule");
 	ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule");
@@ -2071,130 +2110,13 @@ sub parse_alias {
     return undef;
 }
 
-sub parse_vm_fw_rules {
-    my ($filename, $fh, $cluster_conf, $rule_env, $verbose) = @_;
-
-    my $res = { 
-	rules => [], 
-	options => {},
-	aliases => {},
-    };
-
-    my $section;
-
-    while (defined(my $line = <$fh>)) {
-	next if $line =~ m/^#/;
-	next if $line =~ m/^\s*$/;
-
-	my $linenr = $fh->input_line_number();
-	my $prefix = "$filename (line $linenr)";
-
-	if ($line =~ m/^\[(\S+)\]\s*$/i) {
-	    $section = lc($1);
-	    warn "$prefix: ignore unknown section '$section'\n" if !$res->{$section};
-	    next;
-	}
-	if (!$section) {
-	    warn "$prefix: skip line - no section";
-	    next;
-	}
-
-	next if !$res->{$section}; # skip undefined section
-
-	if ($section eq 'options') {
-	    eval {
-		my ($opt, $value) = parse_vmfw_option($line);
-		$res->{options}->{$opt} = $value;
-	    };
-	    warn "$prefix: $@" if $@;
-	    next;
-	}
-
-	if ($section eq 'aliases') {
-	    eval {
-		my $data = parse_alias($line);
-		$res->{aliases}->{lc($data->{name})} = $data;
-	    };
-	    warn "$prefix: $@" if $@;
-	    next;
-	}
-
-	my $rule;
-	eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env, $verbose); };
-	if (my $err = $@) {
-	    warn "$prefix: $err";
-	    next;
-	}
-
-	push @{$res->{$section}}, $rule;
-    }
-
-    return $res;
-}
-
-sub parse_host_fw_rules {
-    my ($filename, $fh, $cluster_conf, $verbose) = @_;
-
-    my $res = { rules => [], options => {}};
-
-    my $section;
-
-    while (defined(my $line = <$fh>)) {
-	next if $line =~ m/^#/;
-	next if $line =~ m/^\s*$/;
-
-	my $linenr = $fh->input_line_number();
-	my $prefix = "$filename (line $linenr)";
-
-	if ($line =~ m/^\[(\S+)\]\s*$/i) {
-	    $section = lc($1);
-	    warn "$prefix: ignore unknown section '$section'\n" if !$res->{$section};
-	    next;
-	}
-	if (!$section) {
-	    warn "$prefix: skip line - no section";
-	    next;
-	}
-
-	next if !$res->{$section}; # skip undefined section
-
-	if ($section eq 'options') {
-	    eval {
-		my ($opt, $value) = parse_hostfw_option($line);
-		$res->{options}->{$opt} = $value;
-	    };
-	    warn "$prefix: $@" if $@;
-	    next;
-	}
-
-	my $rule;
-	eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, 'host', $verbose); };
-	if (my $err = $@) {
-	    warn "$prefix: $err";
-	    next;
-	}
-
-	push @{$res->{$section}}, $rule;
-    }
-
-    return $res;
-}
-
-sub parse_cluster_fw_rules {
-    my ($filename, $fh, $verbose) = @_;
+sub generic_fw_rules_parser {
+    my ($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env) = @_;
 
     my $section;
     my $group;
 
-    my $res = {
-	rules => [],
-	options => {},
-	aliases => {},
-	groups => {},
-	group_comments => {},
-	ipset => {} ,
-	ipset_comments => {},
-    };
+    my $res = $empty_conf;
 
     while (defined(my $line = <$fh>)) {
 	next if $line =~ m/^#/;
@@ -2203,17 +2125,17 @@ sub parse_cluster_fw_rules {
 	my $linenr = $fh->input_line_number();
 	my $prefix = "$filename (line $linenr)";
 
-	if ($line =~ m/^\[options\]$/i) {
+	if ($empty_conf->{options} && ($line =~ m/^\[options\]$/i)) {
 	    $section = 'options';
 	    next;
 	}
 
-	if ($line =~ m/^\[aliases\]$/i) {
+	if ($empty_conf->{aliases} && ($line =~ m/^\[aliases\]$/i)) {
 	    $section = 'aliases';
 	    next;
 	}
 
-	if ($line =~ m/^\[group\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i) {
+	if ($empty_conf->{groups} && ($line =~ m/^\[group\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i)) {
 	    $section = 'groups';
 	    $group = lc($1);
 	    my $comment = $2;
@@ -2223,12 +2145,12 @@ sub parse_cluster_fw_rules {
 	    next;
 	}
 
-	if ($line =~ m/^\[rules\]$/i) {
+	if ($empty_conf->{rules} && ($line =~ m/^\[rules\]$/i)) {
 	    $section = 'rules';
 	    next;
 	}
 
-	if ($line =~ m/^\[ipset\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i) {
+	if ($empty_conf->{ipset} && ($line =~ m/^\[ipset\s+(\S+)\]\s*(?:#\s*(.*?)\s*)?$/i)) {
 	    $section = 'ipset';
 	    $group = lc($1);
 	    my $comment = $2;
@@ -2245,7 +2167,14 @@ sub parse_cluster_fw_rules {
 
 	if ($section eq 'options') {
 	    eval {
-		my ($opt, $value) = parse_clusterfw_option($line);
+		my ($opt, $value);
+		if ($rule_env eq 'cluster') {
+		    ($opt, $value) = parse_clusterfw_option($line);
+		} elsif ($rule_env eq 'host') {
+		    ($opt, $value) = parse_hostfw_option($line);
+		} else {
+		    ($opt, $value) = parse_vmfw_option($line);
+		}
 		$res->{options}->{$opt} = $value;
 	    };
 	    warn "$prefix: $@" if $@;
@@ -2257,7 +2186,7 @@ sub parse_cluster_fw_rules {
 	    warn "$prefix: $@" if $@;
 	} elsif ($section eq 'rules') {
 	    my $rule;
-	    eval { $rule = parse_fw_rule($prefix, $line, $res, undef, 'cluster', $verbose); };
+	    eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env, $verbose); };
 	    if (my $err = $@) {
 		warn "$prefix: $err";
 		next;
@@ -2265,7 +2194,7 @@ sub parse_cluster_fw_rules {
 	    push @{$res->{$section}}, $rule;
 	} elsif ($section eq 'groups') {
 	    my $rule;
-	    eval { $rule = parse_fw_rule($prefix, $line, $res, undef, 'group', $verbose); };
+	    eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, undef, 'group', $verbose); };
 	    if (my $err = $@) {
 		warn "$prefix: $err";
 		next;
@@ -2294,12 +2223,56 @@ sub parse_cluster_fw_rules {
 	    $entry->{comment} = $comment if $comment;
 
 	    push @{$res->{$section}->{$group}}, $entry;
+	} else {
+	    warn "$prefix: skip line - unknown section\n";
+	    next;
 	}
     }
 
     return $res;
 }
 
+sub parse_host_fw_rules {
+    my ($filename, $fh, $cluster_conf, $verbose) = @_;
+
+    my $empty_conf = { rules => [], options => {}};
+
+    return generic_fw_rules_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, 'host');
+}
+
+sub parse_vm_fw_rules {
+    my ($filename, $fh, $cluster_conf, $rule_env, $verbose) = @_;
+
+    my $empty_conf = {
+	rules => [],
+	options => {},
+	aliases => {},
+	ipset => {} ,
+	ipset_comments => {},
+    };
+
+    return generic_fw_rules_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env);
+}
+
+sub parse_cluster_fw_rules {
+    my ($filename, $fh, $verbose) = @_;
+
+    my $section;
+    my $group;
+
+    my $empty_conf = {
+	rules => [],
+	options => {},
+	aliases => {},
+	groups => {},
+	group_comments => {},
+	ipset => {} ,
+	ipset_comments => {},
+    };
+
+    return generic_fw_rules_parser($filename, $fh, $verbose, $empty_conf, $empty_conf, 'cluster');
+}
+
 sub run_locked {
     my ($code, @param) = @_;
 
@@ -2358,6 +2331,7 @@ sub load_vmfw_conf {
     my $filename = "$dir/$vmid.fw";
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
 	$vmfw_conf = parse_vm_fw_rules($filename, $fh, $cluster_conf, $rule_env, $verbose);
+	$vmfw_conf->{vmid} = $vmid;
     }
 
     return $vmfw_conf;
@@ -2432,23 +2406,35 @@ my $format_aliases = sub {
     return $raw;
 };
 
-my $format_ipset = sub {
-    my ($options) = @_;
-
+my $format_ipsets = sub {
+    my ($fw_conf) = @_;
+    
     my $raw = '';
 
-    my $nethash = {};
-    foreach my $entry (@$options) {
-	$nethash->{$entry->{cidr}} = $entry;
-    }
+    foreach my $ipset (sort keys %{$fw_conf->{ipset}}) {
+	if (my $comment = $fw_conf->{ipset_comments}->{$ipset}) {
+	    my $utf8comment = encode('utf8', $comment);
+	    $raw .= "[IPSET $ipset] # $utf8comment\n\n";
+	} else {
+	    $raw .= "[IPSET $ipset]\n\n";
+	}
+	my $options = $fw_conf->{ipset}->{$ipset};
 
-    foreach my $cidr (sort keys %$nethash) {
-	my $entry = $nethash->{$cidr};
-	my $line = $entry->{nomatch} ? '!' : '';
-	$line .= $entry->{cidr};
-	$line .= " # " . encode('utf8', $entry->{comment})
-	    if $entry->{comment} && $entry->{comment} !~ m/^\s*$/;
-	$raw .= "$line\n";
+	my $nethash = {};
+	foreach my $entry (@$options) {
+	    $nethash->{$entry->{cidr}} = $entry;
+	}
+
+	foreach my $cidr (sort keys %$nethash) {
+	    my $entry = $nethash->{$cidr};
+	    my $line = $entry->{nomatch} ? '!' : '';
+	    $line .= $entry->{cidr};
+	    $line .= " # " . encode('utf8', $entry->{comment})
+		if $entry->{comment} && $entry->{comment} !~ m/^\s*$/;
+	    $raw .= "$line\n";
+	}
+
+	$raw .= "\n";
     }
 
     return $raw;
@@ -2465,6 +2451,8 @@ sub save_vmfw_conf {
     my $aliases = $vmfw_conf->{aliases};
     $raw .= &$format_aliases($aliases) if scalar(keys %$aliases);
 
+    $raw .= &$format_ipsets($vmfw_conf);
+
     my $rules = $vmfw_conf->{rules} || [];
     if (scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
@@ -2546,15 +2534,18 @@ sub generate_std_chains {
 }
 
 sub generate_ipset_chains {
-    my ($ipset_ruleset, $fw_conf) = @_;
+    my ($ipset_ruleset, $clusterfw_conf, $fw_conf) = @_;
 
     foreach my $ipset (keys %{$fw_conf->{ipset}}) {
-	generate_ipset($ipset_ruleset, "PVEFW-$ipset", $fw_conf->{ipset}->{$ipset}, $fw_conf->{aliases});
+	my $ipset_chain = compute_ipset_chain_name($fw_conf->{vmid}, $ipset);
+	generate_ipset($ipset_ruleset, $ipset_chain, $fw_conf->{ipset}->{$ipset}, $clusterfw_conf, $fw_conf);
     }
 }
 
 sub generate_ipset {
-    my ($ipset_ruleset, $name, $options, $aliases) = @_;
+    my ($ipset_ruleset, $name, $options, $clusterfw_conf, $fw_conf) = @_;
+
+    die "duplicate ipset chain '$name'\n" if defined($ipset_ruleset->{$name});
 
     my $hashsize = scalar(@$options);
     if ($hashsize <= 64) {
@@ -2563,7 +2554,7 @@ sub generate_ipset {
 	$hashsize = round_powerof2($hashsize);
     }
 
-    push @{$ipset_ruleset->{$name}}, "create $name hash:net family inet hashsize $hashsize maxelem $hashsize";
+    $ipset_ruleset->{$name} = ["create $name hash:net family inet hashsize $hashsize maxelem $hashsize"];
 
     # remove duplicates
     my $nethash = {};
@@ -2571,11 +2562,13 @@ sub generate_ipset {
 	my $cidr = $entry->{cidr};
 	if ($cidr =~ m/^${ip_alias_pattern}$/) {
 	    my $alias = lc($cidr);
-	    if ($aliases->{$alias}) {
-		$entry->{cidr} = $aliases->{$alias}->{cidr};
+	    my $e = $fw_conf->{aliases}->{$alias} if $fw_conf;
+	    $e = $clusterfw_conf->{aliases}->{$alias} if !$e && $clusterfw_conf;
+	    if ($e) {
+		$entry->{cidr} = $e->{cidr};
 		$nethash->{$entry->{cidr}} = $entry;
 	    } else {
-		warn "no such alias '$cidr'\n" if !$aliases->{$alias};
+		warn "no such alias '$cidr'\n";
 	    }
 	} else {
 	    $nethash->{$entry->{cidr}} = $entry;
@@ -2630,18 +2623,8 @@ sub save_clusterfw_conf {
     my $aliases = $cluster_conf->{aliases};
     $raw .= &$format_aliases($aliases) if scalar(keys %$aliases);
 
-    foreach my $ipset (sort keys %{$cluster_conf->{ipset}}) {
-	if (my $comment = $cluster_conf->{ipset_comments}->{$ipset}) {
-	    my $utf8comment = encode('utf8', $comment);
-	    $raw .= "[IPSET $ipset] # $utf8comment\n\n";
-	} else {
-	    $raw .= "[IPSET $ipset]\n\n";
-	}
-	my $options = $cluster_conf->{ipset}->{$ipset};
-	$raw .= &$format_ipset($options);
-	$raw .= "\n";
-    }
-
+    $raw .= &$format_ipsets($cluster_conf);
+ 
     my $rules = $cluster_conf->{rules};
     if (scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
@@ -2719,7 +2702,8 @@ sub compile {
     }
 
     $cluster_conf->{ipset}->{venet0} = [];
- 
+    my $venet0_ipset_chain = compute_ipset_chain_name(0, 'venet0');
+
     my $localnet;
     if ($cluster_conf->{aliases}->{local_network}) {
 	$localnet = $cluster_conf->{aliases}->{local_network}->{cidr};
@@ -2729,7 +2713,7 @@ sub compile {
     }
 
     push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet };
-   
+
     my $ruleset = {};
 
     ruleset_create_chain($ruleset, "PVEFW-INPUT");
@@ -2744,9 +2728,10 @@ sub compile {
 
     ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", "ACCEPT");
 
+
     ruleset_create_chain($ruleset, "PVEFW-VENET-OUT");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -m set --match-set PVEFW-venet0 src -j PVEFW-VENET-OUT");
-    ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -m set --match-set PVEFW-venet0 src -j PVEFW-VENET-OUT");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -m set --match-set ${venet0_ipset_chain} src -j PVEFW-VENET-OUT");
+    ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -m set --match-set ${venet0_ipset_chain} src -j PVEFW-VENET-OUT");
 
     ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
     ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $hostfw_options, $cluster_conf, $loglevel);
@@ -2759,18 +2744,20 @@ sub compile {
     ruleset_create_chain($ruleset, "PVEFW-VENET-IN");
     ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN", $hostfw_options, $cluster_conf, $loglevel);
 
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o venet0 -m set --match-set PVEFW-venet0 dst -j PVEFW-VENET-IN");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o venet0 -m set --match-set ${venet0_ipset_chain} dst -j PVEFW-VENET-IN");
 
     generate_std_chains($ruleset, $hostfw_options);
 
     my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0));
 
+    my $ipset_ruleset = {};
+
     if ($hostfw_enable) {
 	eval { enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf); };
 	warn $@ if $@; # just to be sure - should not happen
     }
 
-    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-o venet0 -m set --match-set PVEFW-venet0 dst -j PVEFW-VENET-IN");
+    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-o venet0 -m set --match-set ${venet0_ipset_chain} dst -j PVEFW-VENET-IN");
 
     # generate firewall rules for QEMU VMs
     foreach my $vmid (keys %{$vmdata->{qemu}}) {
@@ -2780,6 +2767,8 @@ sub compile {
 	    return if !$vmfw_conf;
 	    return if !$vmfw_conf->{options}->{enable};
 
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf);
+
 	    foreach my $netid (keys %$conf) {
 		next if $netid !~ m/^net(\d+)$/;
 		my $net = PVE::QemuServer::parse_net($conf->{$netid});
@@ -2805,6 +2794,8 @@ sub compile {
 	    return if !$vmfw_conf;
 	    return if !$vmfw_conf->{options}->{enable};
 
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf);
+
 	    if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
 		my $ip = $conf->{ip_address}->{value};
 		$ip =~ s/\s+/,/g;
@@ -2843,8 +2834,7 @@ sub compile {
 	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
     }
 
-    my $ipset_ruleset = {};
-    generate_ipset_chains($ipset_ruleset, $cluster_conf);
+    generate_ipset_chains($ipset_ruleset, undef, $cluster_conf);
 
     return ($ruleset, $ipset_ruleset);
 }