X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=2270ad73eb159bb36699c3e9215c0d632c4cbab4;hp=f2f533164969c36dd587fc3c3d7ab3b75958032a;hb=30150dca3cfc435c08d84022b9c4214b603a6522;hpb=b7ab6989be1cfbb4a170d1af3d2684dd0753da0b

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index f2f5331..2270ad7 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -19,7 +19,8 @@ use PVE::Tools qw(run_command lock_file dir_glob_foreach);
 use Encode;
 
 my $hostfw_conf_filename = "/etc/pve/local/host.fw";
-my $clusterfw_conf_filename = "/etc/pve/firewall/cluster.fw";
+my $pvefw_conf_dir = "/etc/pve/firewall";
+my $clusterfw_conf_filename = "$pvefw_conf_dir/cluster.fw";
 
 # dynamically include PVE::QemuServer and PVE::OpenVZ
 # to avoid dependency problems
@@ -35,6 +36,14 @@ eval {
     $have_pve_manager = 1;
 };
 
+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\-\_]+';
+
+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 {
     my ($cidr, $noerr) = @_;
@@ -48,20 +57,35 @@ 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 {
+    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";
+}
+
 PVE::JSONSchema::register_standard_option('ipset-name', {
     description => "IP set name.",
     type => 'string',
-    pattern => '[A-Za-z][A-Za-z0-9\-\_]+',
+    pattern => $ipset_name_pattern,
     minLength => 2,
-    maxLength => 20,
+    maxLength => $max_ipset_name_length,
 });
 
 PVE::JSONSchema::register_standard_option('pve-fw-alias', {
     description => "Alias name.",
     type => 'string',
-    pattern => '[A-Za-z][A-Za-z0-9\-\_]+',
+    pattern => $ip_alias_pattern,
     minLength => 2,
-    maxLength => 20,
+    maxLength => $max_alias_name_length,
 });
 
 PVE::JSONSchema::register_standard_option('pve-fw-loglevel' => {
@@ -71,15 +95,12 @@ PVE::JSONSchema::register_standard_option('pve-fw-loglevel' => {
     optional => 1,
 });
 
-my $security_group_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+';
-my $ip_alias_pattern = '[A-Za-z][A-Za-z0-9\-\_]+';
-
 PVE::JSONSchema::register_standard_option('pve-security-group-name', {
     description => "Security Group name.",
     type => 'string',
     pattern => $security_group_name_pattern,
     minLength => 2,
-    maxLength => 20,
+    maxLength => $max_group_name_length,
 });
 
 my $feature_ipset_nomatch = 0;
@@ -720,7 +741,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,11 +760,44 @@ 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
+
+my $max_iptables_ipset_name_length = 31 - length("_swap");
+
+sub compute_ipset_chain_name {
+    my ($vmid, $ipset_name) = @_;
+
+    $vmid = 0 if !defined($vmid);
+
+    my $id = "$vmid-${ipset_name}";
+
+   
+    if ((length($id) + 6) > $max_iptables_ipset_name_length) {
+	$id = PVE::Tools::fnv31a_hex($id);
+    }
+
+    return "PVEFW-$id";
+}
+
+sub compute_ipfilter_ipset_name {
+    my ($iface) = @_;
+
+    return "ipfilter-$iface";
+}
+
 sub parse_address_list {
     my ($str) = @_;
 
-    return if $str =~ m/^(\+)(\S+)$/; # ipset ref
-    return if $str =~ m/^${ip_alias_pattern}$/;
+    if ($str =~ m/^(\+)(\S+)$/) { # ipset ref
+	die "ipset name too long\n" if length($str) > ($max_ipset_name_length + 1);
+	return;
+    }
+
+    if ($str =~ m/^${ip_alias_pattern}$/) {
+	die "alias name too long\n" if length($str) > $max_alias_name_length;
+	return;
+    }
 
     my $count = 0;
     my $iprange = 0;
@@ -1016,7 +1070,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
 
@@ -1037,16 +1091,16 @@ 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'") 
+		if ($value =~ m/^\+(${ipset_name_pattern})$/) {
+		    &$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'");
+		    &$add_error($name, "invalid ipset 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 +1108,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 +1127,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 $@;
@@ -1160,6 +1214,46 @@ sub copy_rule_data {
     return $rule;
 }
 
+sub rules_modify_permissions {
+    my ($rule_env) = @_;
+
+    if ($rule_env eq 'host') {
+	return {
+	    check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]],
+	};
+    } elsif ($rule_env eq 'cluster' || $rule_env eq 'group') {
+	return {
+	    check => ['perm', '/', [ 'Sys.Modify' ]],
+	};
+    } elsif ($rule_env eq 'vm' ||   $rule_env eq 'ct') {
+	return {
+	    check => ['perm', '/vms/{vmid}', [ 'VM.Config.Network' ]],
+	}
+    }
+
+    return undef;
+}
+
+sub rules_audit_permissions {
+    my ($rule_env) = @_;
+
+    if ($rule_env eq 'host') {
+	return {
+	    check => ['perm', '/nodes/{node}', [ 'Sys.Audit' ]],
+	};
+    } elsif ($rule_env eq 'cluster' || $rule_env eq 'group') {
+	return {
+	    check => ['perm', '/', [ 'Sys.Audit' ]],
+	};
+    } elsif ($rule_env eq 'vm' ||   $rule_env eq 'ct') {
+	return {
+	    check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
+	}
+    }
+
+    return undef;
+}
+
 # core functions
 my $bridge_firewall_enabled = 0;
 
@@ -1300,7 +1394,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};
@@ -1320,20 +1414,28 @@ 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";
+	    if ($source =~ m/^\+(${ipset_name_pattern})$/) {
+		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";
         }
@@ -1341,20 +1443,28 @@ 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";
+	    if ($dest =~ m/^\+(${ipset_name_pattern})$/) {
+		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} dst";
+		} 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 +1524,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 +1538,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 +1654,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)) {
@@ -1558,7 +1673,7 @@ sub ruleset_chain_add_input_filters {
 }
 
 sub ruleset_create_vm_chain {
-    my ($ruleset, $chain, $options, $macaddr, $direction) = @_;
+    my ($ruleset, $chain, $options, $macaddr, $ipfilter_ipset, $direction) = @_;
 
     ruleset_create_chain($ruleset, $chain);
     my $accept = generate_nfqueue($options);
@@ -1577,6 +1692,9 @@ sub ruleset_create_vm_chain {
 	if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
 	    ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP");
 	}
+	if ($ipfilter_ipset) {
+	    ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src -j DROP");
+	}
 	ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
     }
 }
@@ -1589,7 +1707,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 +1720,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 +1738,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 $@;
@@ -1677,9 +1795,9 @@ sub generate_venet_rules_direction {
 
     my $chain = "venet0-$vmid-$direction";
 
-    ruleset_create_vm_chain($ruleset, $chain, $options, undef, $direction);
+    ruleset_create_vm_chain($ruleset, $chain, $options, undef, 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;
@@ -1719,24 +1837,34 @@ sub generate_tap_rules_direction {
 
     my $tapchain = "$iface-$direction";
 
-    ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction);
+    my $ipfilter_name = compute_ipfilter_ipset_name($netid);
+    my $ipfilter_ipset = compute_ipset_chain_name($vmid, $ipfilter_name)
+	if $vmfw_conf->{ipset}->{$ipfilter_name};	
 
-    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $tapchain, $netid, $direction, $options);
+    # create chain with mac and ip filter
+    ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $ipfilter_ipset, $direction);
 
-    ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface);
+    if ($options->{enable}) {
+	ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $tapchain, $netid, $direction, $options);
 
-    # implement policy
-    my $policy;
+	ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface);
 
-    if ($direction eq 'OUT') {
-	$policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default
-    } else {
+	# implement policy
+	my $policy;
+
+	if ($direction eq 'OUT') {
+	    $policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default
+	} else {
 	$policy = $options->{policy_in} || 'DROP'; # allow nothing by default
-    }
+	}
 
-    my $accept = generate_nfqueue($options);
-    my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept;
-    ruleset_add_chain_policy($ruleset, $tapchain, $vmid, $policy, $loglevel, $accept_action);
+	my $accept = generate_nfqueue($options);
+	my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept;
+	ruleset_add_chain_policy($ruleset, $tapchain, $vmid, $policy, $loglevel, $accept_action);
+    } else {
+	my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : 'ACCEPT';
+	ruleset_add_chain_policy($ruleset, $tapchain, $vmid, 'ACCEPT', $loglevel, $accept_action);
+    }
 
     # plug the tap chain to bridge chain
     if ($direction eq 'IN') {
@@ -1774,13 +1902,16 @@ 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 $@;
@@ -1788,12 +1919,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
@@ -1824,13 +1956,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_out} = $rule->{iface} if $rule->{iface};
 	eval {
 	    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 $@;
@@ -1841,9 +1975,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");
@@ -1900,8 +2034,6 @@ for (my $i = 0; $i < $MAX_NETS; $i++)  {
 sub parse_fw_rule {
     my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env, $verbose) = @_;
 
-    chomp $line;
-
     my $orig_line = $line;
 
     my $rule = {};
@@ -1995,7 +2127,6 @@ sub parse_vmfw_option {
 	$opt = lc($1);
 	$value = $2;
     } else {
-	chomp $line;
 	die "can't parse option '$line'\n"
     }
 
@@ -2019,7 +2150,6 @@ sub parse_hostfw_option {
 	$opt = lc($1);
 	$value = int($2);
     } else {
-	chomp $line;
 	die "can't parse option '$line'\n"
     }
 
@@ -2038,13 +2168,27 @@ sub parse_clusterfw_option {
 	$opt = lc($1);
 	$value = uc($3);
     } else {
-	chomp $line;
 	die "can't parse option '$line'\n"
     }
 
     return ($opt, $value);
 }
 
+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";
+    }
+
+    return $cidr;
+}
+
 sub parse_alias {
     my ($line) = @_;
 
@@ -2066,167 +2210,72 @@ 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_config_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/^#/;
 	next if $line =~ m/^\s*$/;
 
+	chomp $line;
+
 	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;
+	    eval {
+		die "security group name too long\n" if length($group) > $max_group_name_length;
+		die "invalid security group name '$group'\n" if $group !~ m/^${security_group_name_pattern}$/;
+	    };
+	    if (my $err = $@) {
+		($section, $group, $comment) = undef;
+		warn "$prefix: $err";
+		next;
+	    }
+	    
 	    $res->{$section}->{$group} = [];
 	    $res->{group_comments}->{$group} =  decode('utf8', $comment)
 		if $comment;
 	    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;
+	    eval {	
+		die "ipset name too long\n" if length($group) > $max_ipset_name_length;
+		die "invalid ipset name '$group'\n" if $group !~ m/^${ipset_name_pattern}$/;
+	    };
+	    if (my $err = $@) {
+		($section, $group, $comment) = undef;
+		warn "$prefix: $err";
+		next;
+	    }
+
 	    $res->{$section}->{$group} = [];
 	    $res->{ipset_comments}->{$group} = decode('utf8', $comment)
 		if $comment;
@@ -2240,7 +2289,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 $@;
@@ -2252,7 +2308,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;
@@ -2260,7 +2316,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;
@@ -2273,28 +2329,88 @@ sub parse_cluster_fw_rules {
 	    $line =~ m/^(\!)?\s*(\S+)\s*$/;
 	    my $nomatch = $1;
 	    my $cidr = $2;
+	    my $errors;
 
-	    if($cidr !~ m/^${ip_alias_pattern}$/) {
-		$cidr =~ s|/32$||;
+	    if ($nomatch && !$feature_ipset_nomatch) {
+		$errors->{nomatch} = "nomatch not supported by kernel";
+	    }
 
-		eval { pve_verify_ipv4_or_cidr($cidr); };
-		if (my $err = $@) {
-		    warn "$prefix: $cidr - $err";
-		    next;
+	    eval { 
+		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);
 		}
+	    };
+	    if (my $err = $@) {
+		chomp $err;
+		$errors->{cidr} = $err;
 	    }
 
 	    my $entry = { cidr => $cidr };
 	    $entry->{nomatch} = 1 if $nomatch;
 	    $entry->{comment} = $comment if $comment;
+	    $entry->{errors} =  $errors if $errors;
+
+	    if ($verbose && $errors) {
+		warn "$prefix - errors in ipset '$group': $line\n";
+		foreach my $p (keys %{$errors}) {
+		    warn "  $p: $errors->{$p}\n";
+		}
+	    }
 
 	    push @{$res->{$section}->{$group}}, $entry;
+	} else {
+	    warn "$prefix: skip line - unknown section\n";
+	    next;
 	}
     }
 
     return $res;
 }
 
+sub parse_hostfw_config {
+    my ($filename, $fh, $cluster_conf, $verbose) = @_;
+
+    my $empty_conf = { rules => [], options => {}};
+
+    return generic_fw_config_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, 'host');
+}
+
+sub parse_vmfw_config {
+    my ($filename, $fh, $cluster_conf, $rule_env, $verbose) = @_;
+
+    my $empty_conf = {
+	rules => [],
+	options => {},
+	aliases => {},
+	ipset => {} ,
+	ipset_comments => {},
+    };
+
+    return generic_fw_config_parser($filename, $fh, $verbose, $cluster_conf, $empty_conf, $rule_env);
+}
+
+sub parse_clusterfw_config {
+    my ($filename, $fh, $verbose) = @_;
+
+    my $section;
+    my $group;
+
+    my $empty_conf = {
+	rules => [],
+	options => {},
+	aliases => {},
+	groups => {},
+	group_comments => {},
+	ipset => {} ,
+	ipset_comments => {},
+    };
+
+    return generic_fw_config_parser($filename, $fh, $verbose, $empty_conf, $empty_conf, 'cluster');
+}
+
 sub run_locked {
     my ($code, @param) = @_;
 
@@ -2348,11 +2464,12 @@ sub load_vmfw_conf {
 
     my $vmfw_conf = {};
 
-    $dir = "/etc/pve/firewall" if !defined($dir);
+    $dir = $pvefw_conf_dir if !defined($dir);
 
     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 = parse_vmfw_config($filename, $fh, $cluster_conf, $rule_env, $verbose);
+	$vmfw_conf->{vmid} = $vmid;
     }
 
     return $vmfw_conf;
@@ -2427,23 +2544,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;
@@ -2455,19 +2584,23 @@ sub save_vmfw_conf {
     my $raw = '';
 
     my $options = $vmfw_conf->{options};
-    $raw .= &$format_options($options) if scalar(keys %$options);
+    $raw .= &$format_options($options) if $options && scalar(keys %$options);
 
     my $aliases = $vmfw_conf->{aliases};
-    $raw .= &$format_aliases($aliases) if scalar(keys %$aliases);
+    $raw .= &$format_aliases($aliases) if $aliases && scalar(keys %$aliases);
+
+    $raw .= &$format_ipsets($vmfw_conf) if $vmfw_conf->{ipset};
 
     my $rules = $vmfw_conf->{rules} || [];
-    if (scalar(@$rules)) {
+    if ($rules && scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
 	$raw .= &$format_rules($rules, 1);
 	$raw .= "\n";
     }
 
-    my $filename = "/etc/pve/firewall/$vmid.fw";
+    mkdir $pvefw_conf_dir;
+
+    my $filename = "$pvefw_conf_dir/$vmid.fw";
     PVE::Tools::file_set_contents($filename, $raw);
 }
 
@@ -2541,15 +2674,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) {
@@ -2558,23 +2694,17 @@ 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 = {};
     foreach my $entry (@$options) {
-	my $cidr = $entry->{cidr};
-	if ($cidr =~ m/^${ip_alias_pattern}$/) {
-	    my $alias = lc($cidr);
-	    if ($aliases->{$alias}) {
-		$entry->{cidr} = $aliases->{$alias}->{cidr};
-		$nethash->{$entry->{cidr}} = $entry;
-	    } else {
-		warn "no such alias '$cidr'\n" if !$aliases->{$alias};
-	    }
-	} else {
-	    $nethash->{$entry->{cidr}} = $entry;
-	}
+	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} };
+	};
+	warn $@ if $@;
     }
 
     foreach my $cidr (sort keys %$nethash) {
@@ -2608,7 +2738,7 @@ sub load_clusterfw_conf {
 
     my $cluster_conf = {};
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$cluster_conf = parse_cluster_fw_rules($filename, $fh, $verbose);
+	$cluster_conf = parse_clusterfw_config($filename, $fh, $verbose);
     }
 
     return $cluster_conf;
@@ -2620,43 +2750,36 @@ sub save_clusterfw_conf {
     my $raw = '';
 
     my $options = $cluster_conf->{options};
-    $raw .= &$format_options($options) if scalar(keys %$options);
+    $raw .= &$format_options($options) if $options && scalar(keys %$options);
 
     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_aliases($aliases) if $aliases && scalar(keys %$aliases);
 
+    $raw .= &$format_ipsets($cluster_conf) if $cluster_conf->{ipset};
+ 
     my $rules = $cluster_conf->{rules};
-    if (scalar(@$rules)) {
+    if ($rules && scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
 	$raw .= &$format_rules($rules, 1);
 	$raw .= "\n";
     }
 
-    foreach my $group (sort keys %{$cluster_conf->{groups}}) {
-	my $rules = $cluster_conf->{groups}->{$group};
-	if (my $comment = $cluster_conf->{group_comments}->{$group}) {
-	    my $utf8comment = encode('utf8', $comment);
-	    $raw .= "[group $group] # $utf8comment\n\n";
-	} else {
-	    $raw .= "[group $group]\n\n";
-	}
+    if ($cluster_conf->{groups}) {
+	foreach my $group (sort keys %{$cluster_conf->{groups}}) {
+	    my $rules = $cluster_conf->{groups}->{$group};
+	    if (my $comment = $cluster_conf->{group_comments}->{$group}) {
+		my $utf8comment = encode('utf8', $comment);
+		$raw .= "[group $group] # $utf8comment\n\n";
+	    } else {
+		$raw .= "[group $group]\n\n";
+	    }
 
-	$raw .= &$format_rules($rules, 0);
-	$raw .= "\n";
+	    $raw .= &$format_rules($rules, 0);
+	    $raw .= "\n";
+	}
     }
 
+    mkdir $pvefw_conf_dir;
     PVE::Tools::file_set_contents($clusterfw_conf_filename, $raw);
 }
 
@@ -2667,7 +2790,7 @@ sub load_hostfw_conf {
 
     my $hostfw_conf = {};
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$hostfw_conf = parse_host_fw_rules($filename, $fh, $cluster_conf, $verbose);
+	$hostfw_conf = parse_hostfw_config($filename, $fh, $cluster_conf, $verbose);
     }
     return $hostfw_conf;
 }
@@ -2678,10 +2801,10 @@ sub save_hostfw_conf {
     my $raw = '';
 
     my $options = $hostfw_conf->{options};
-    $raw .= &$format_options($options) if scalar(keys %$options);
+    $raw .= &$format_options($options) if $options && scalar(keys %$options);
 
     my $rules = $hostfw_conf->{rules};
-    if (scalar(@$rules)) {
+    if ($rules && scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
 	$raw .= &$format_rules($rules, 1);
 	$raw .= "\n";
@@ -2714,7 +2837,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};
@@ -2724,7 +2848,9 @@ sub compile {
     }
 
     push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet };
-   
+
+    return ({}, {}) if !$cluster_conf->{options}->{enable};
+
     my $ruleset = {};
 
     ruleset_create_chain($ruleset, "PVEFW-INPUT");
@@ -2739,9 +2865,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);
@@ -2754,18 +2881,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}}) {
@@ -2773,7 +2902,8 @@ sub compile {
 	    my $conf = $vmdata->{qemu}->{$vmid};
 	    my $vmfw_conf = $vmfw_configs->{$vmid};
 	    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+)$/;
@@ -2798,30 +2928,34 @@ sub compile {
 
 	    my $vmfw_conf = $vmfw_configs->{$vmid};
 	    return if !$vmfw_conf;
-	    return if !$vmfw_conf->{options}->{enable};
 
-	    if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
-		my $ip = $conf->{ip_address}->{value};
-		$ip =~ s/\s+/,/g;
-		parse_address_list($ip); # make sure we have a valid $ip list
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf);
 
-		my @ips = split(',', $ip);
+	    if ($vmfw_conf->{options}->{enable}) {
+		if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
+		    my $ip = $conf->{ip_address}->{value};
+		    $ip =~ s/\s+/,/g;
+		    parse_address_list($ip); # make sure we have a valid $ip list
 
-		foreach my $singleip (@ips) {
-		    my $venet0ipset = {};
-		    $venet0ipset->{cidr} = $singleip;
-		    push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset;
-		}
+		    my @ips = split(',', $ip);
+
+		    foreach my $singleip (@ips) {
+			my $venet0ipset = {};
+			$venet0ipset->{cidr} = $singleip;
+			push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset;
+		    }
 
-		generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'IN');
-		generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'OUT');
+		    generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'IN');
+		    generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'OUT');
+		}
 	    }
 
 	    if ($conf->{netif} && $conf->{netif}->{value}) {
 		my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value});
 		foreach my $netid (keys %$netif) {
 		    my $d = $netif->{$netid};
-
+		    my $bridge = $d->{bridge};
+		    next if !$bridge || $bridge !~ m/^vmbr\d+(v(\d+))?f$/; # firewall enabled ?
 		    my $macaddr = $d->{mac};
 		    my $iface = $d->{host_ifname};
 		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
@@ -2838,8 +2972,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);
 }
@@ -2907,8 +3040,9 @@ sub get_ruleset_cmdlist {
     }
 
     foreach my $h (qw(INPUT OUTPUT FORWARD)) {
-	if (!$hooks->{$h}) {
-	    $cmdlist .= "-A $h -j PVEFW-$h\n";
+	my $chain = "PVEFW-$h";
+	if ($ruleset->{$chain} && !$hooks->{$h}) {
+	    $cmdlist .= "-A $h -j $chain\n";
 	}
     }
 
@@ -3108,6 +3242,17 @@ sub remove_pvefw_chains {
     $cmdlist .= "COMMIT\n";
 
     iptables_restore_cmdlist($cmdlist);
+
+    my $ipset_chains = ipset_get_chains();
+
+    $cmdlist = "";
+ 
+    foreach my $chain (keys %$ipset_chains) {
+       $cmdlist .= "flush $chain\n";
+       $cmdlist .= "destroy $chain\n";
+    }
+
+    ipset_restore_cmdlist($cmdlist) if $cmdlist; 
 }
 
 sub init {
@@ -3126,11 +3271,7 @@ sub update {
 	my $cluster_conf = load_clusterfw_conf();
 	my $cluster_options = $cluster_conf->{options};
 
-	my $enable = $cluster_options->{enable};
-
-	die "Firewall is disabled - cannot start\n" if !$enable;
-
-	if (!$enable) {
+	if (!$cluster_options->{enable}) {
 	    PVE::Firewall::remove_pvefw_chains();
 	    return;
 	}