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

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index ef54621..c9b6e1f 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -98,9 +98,8 @@ use Data::Dumper;
 my $nodename = PVE::INotify::nodename();
 
 my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
-my $pve_fw_status_filename = "/var/lib/pve-firewall/pvefw.status";
 
-my $default_log_level = 'info';
+my $default_log_level = 'nolog'; # avoid logs by default
 
 my $log_level_hash = {
     debug => 7,
@@ -158,9 +157,8 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'tcp', dport => '6277' },
     ],
     'DHCPfwd' => [
-	"Forwarded DHCP traffic (bidirectional)",
+	"Forwarded DHCP traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '67:68', sport => '67:68' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '67:68', sport => '67:68' },
     ],
     'DNS' => [
 	"Domain Name System traffic (upd and tcp)",
@@ -187,9 +185,8 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'udp', dport => '1080' },
     ],
     'GRE' => [
-	"Generic Routing Encapsulation tunneling protocol (bidirectional)",
+	"Generic Routing Encapsulation tunneling protocol",
 	{ action => 'PARAM', proto => '47' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' },
     ],
     'Git' => [
 	"Git distributed revision control traffic",
@@ -224,32 +221,24 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'tcp', dport => '993' },
     ],
     'IPIP' => [
-	"IPIP capsulation traffic (bidirectional)",
+	"IPIP capsulation traffic",
 	{ action => 'PARAM', proto => '94' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '94' },
     ],
     'IPsec' => [
-	"IPsec traffic (bidirectional)",
+	"IPsec traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '500', sport => '500' },
 	{ action => 'PARAM', proto => '50' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' },
     ],
     'IPsecah' => [
-	"IPsec authentication (AH) traffic (bidirectional)",
+	"IPsec authentication (AH) traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '500', sport => '500' },
 	{ action => 'PARAM', proto => '51' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '51' },
     ],
     'IPsecnat' => [
-	"IPsec traffic and Nat-Traversal (bidirectional)",
+	"IPsec traffic and Nat-Traversal",
 	{ action => 'PARAM', proto => 'udp', dport => '500' },
 	{ action => 'PARAM', proto => 'udp', dport => '4500' },
 	{ action => 'PARAM', proto => '50' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '4500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' },
     ],
     'IRC' => [
 	"Internet Relay Chat traffic",
@@ -262,7 +251,6 @@ my $pve_fw_macros = {
     'L2TP' => [
 	"Layer 2 Tunneling Protocol traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '1701' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1701' },
     ],
     'LDAP' => [
 	"Lightweight Directory Access Protocol traffic",
@@ -306,11 +294,6 @@ my $pve_fw_macros = {
 	"Network Time Protocol (ntpd)",
 	{ action => 'PARAM', proto => 'udp', dport => '123' },
     ],
-    'NTPbi' => [
-	"Bi-directional NTP (for NTP peers)",
-	{ action => 'PARAM', proto => 'udp', dport => '123' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '123' },
-    ],
     'OSPF' => [
 	"OSPF multicast traffic",
 	{ action => 'PARAM', proto => '89' },
@@ -335,7 +318,6 @@ my $pve_fw_macros = {
     'PPtP' => [
 	"Point-to-Point Tunneling Protocol",
 	{ action => 'PARAM', proto => '47' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' },
 	{ action => 'PARAM', proto => 'tcp', dport => '1723' },
     ],
     'Ping' => [
@@ -354,10 +336,9 @@ my $pve_fw_macros = {
 	"Microsoft Remote Desktop Protocol traffic",
 	{ action => 'PARAM', proto => 'tcp', dport => '3389' },
     ],
-    'RIPbi' => [
+    'RIP' => [
 	"Routing Information Protocol (bidirectional)",
 	{ action => 'PARAM', proto => 'udp', dport => '520' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '520' },
     ],
     'RNDC' => [
 	"BIND remote management protocol",
@@ -386,17 +367,6 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' },
 	{ action => 'PARAM', proto => 'tcp', dport => '135,139,445' },
     ],
-    'SMBBI' => [
-	"Microsoft SMB traffic (bidirectional)",
-	{ action => 'PARAM', proto => 'udp', dport => '135,445' },
-	{ action => 'PARAM', proto => 'udp', dport => '137:139' },
-	{ action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' },
-	{ action => 'PARAM', proto => 'tcp', dport => '135,139,445' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '135,445' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '137:139' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1024:65535', sport => '137' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'tcp', dport => '135,139,445' },
-    ],
     'SMBswat' => [
 	"Samba Web Administration Tool",
 	{ action => 'PARAM', proto => 'tcp', dport => '901' },
@@ -468,8 +438,8 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'icmp', dport => 'echo-request' },
     ],
     'VNC' => [
-	"VNC traffic for VNC display's 0 - 9",
-	{ action => 'PARAM', proto => 'tcp', dport => '5900:5909' },
+	"VNC traffic for VNC display's 0 - 99",
+	{ action => 'PARAM', proto => 'tcp', dport => '5900:5999' },
     ],
     'VNCL' => [
 	"VNC traffic from Vncservers to Vncviewers in listen mode",
@@ -717,6 +687,75 @@ sub get_etc_protocols {
     return $etc_protocols;
 }
 
+my $ipv4_mask_hash_localnet = {
+    '255.255.0.0' => 16,
+    '255.255.128.0' => 17,
+    '255.255.192.0' => 18,
+    '255.255.224.0' => 19,
+    '255.255.240.0' => 20,
+    '255.255.248.0' => 21,
+    '255.255.252.0' => 22,
+    '255.255.254.0' => 23,
+    '255.255.255.0' => 24,
+    '255.255.255.128' => 25,
+    '255.255.255.192' => 26,
+    '255.255.255.224' => 27,
+    '255.255.255.240' => 28,
+    '255.255.255.248' => 29,
+    '255.255.255.252' => 30,
+};
+
+my $__local_network;
+
+sub local_network {
+    my ($new_value) = @_;
+
+    $__local_network = $new_value if defined($new_value);
+
+    return $__local_network if defined($__local_network);
+
+    eval {
+	my $nodename = PVE::INotify::nodename();
+
+	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}};
+	    next if !defined($mask);
+	    return if $mask eq '0.0.0.0';
+	    my $cidr = "$entry->{dest}/$mask";
+	    my $testnet = Net::IP->new($cidr);
+	    if ($testnet->overlaps($testip)) {
+		$__local_network = $cidr;
+		return;
+	    }
+	}
+    };
+    warn $@ if $@;
+
+    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) = @_;
 
@@ -833,7 +872,8 @@ sub copy_list_with_digest {
 	    my $v = $entry->{$k};
 	    next if !defined($v);
 	    $data->{$k} = $v;
-	    $sha->add($k, ':', $v, "\n");
+	    # Note: digest ignores refs ($rule->{errors})
+	    $sha->add($k, ':', $v, "\n") if !ref($v); ;
 	}
 	push @$res, $data;
     }
@@ -981,58 +1021,143 @@ my $apply_macro = sub {
     return $rules;
 };
 
+my $rule_env_iface_lookup = {
+    'ct' => 1,
+    'vm' => 1,
+    'group' => 0,
+    'cluster' => 1,
+    'host' => 1,
+};
+
 sub verify_rule {
-    my ($rule, $allow_groups) = @_;
+    my ($rule, $cluster_conf, $fw_conf, $rule_env, $noerr) = @_;
 
-    my $type = $rule->{type};
+    my $allow_groups = $rule_env eq 'group' ? 0 : 1;
 
-    raise_param_exc({ type => "missing property"}) if !$type;
-    raise_param_exc({ action => "missing property"}) if !$rule->{action};
-
-    if ($type eq  'in' || $type eq 'out') {
-	raise_param_exc({ action => "unknown action '$rule->{action}'"})
-	    if $rule->{action} !~ m/^(ACCEPT|DROP|REJECT)$/;
-    } elsif ($type eq 'group') {
-	raise_param_exc({ type => "security groups not allowed"})
-	    if !$allow_groups;
-	raise_param_exc({ action => "invalid characters in security group name"})
-	    if $rule->{action} !~ m/^${security_group_name_pattern}$/;
-    } else {
-	raise_param_exc({ type => "unknown rule type '$type'"});
+    my $allow_iface = $rule_env_iface_lookup->{$rule_env};
+    die "unknown rule_env '$rule_env'\n" if !defined($allow_iface); # should not happen
+
+    my $errors = $rule->{errors} || {};
+
+    my $error_count = 0;
+
+    my $add_error = sub {
+	my ($param, $msg)  = @_;
+	chomp $msg;
+	raise_param_exc({ $param => $msg }) if !$noerr;
+	$error_count++;
+	$errors->{$param} = $msg if !$errors->{$param};
+    };
+
+    my $check_ipset_or_alias_property = sub {
+	my ($name) = @_;
+
+	if (my $value = $rule->{$name}) {
+	    if ($value =~ m/^\+/) {
+		if ($value =~ m/^\+(${security_group_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'");
+		}
+	    } 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}))
+	    }
+	}
+    };
+
+    my $type = $rule->{type};
+    my $action = $rule->{action};
+
+    &$add_error('type', "missing property") if !$type;
+    &$add_error('action', "missing property") if !$action;
+
+    if ($type) {
+	if ($type eq  'in' || $type eq 'out') {
+	    &$add_error('action', "unknown action '$action'")
+		if $action && ($action !~ m/^(ACCEPT|DROP|REJECT)$/);
+	} elsif ($type eq 'group') {
+	    &$add_error('type', "security groups not allowed")
+		if !$allow_groups;
+	    &$add_error('action', "invalid characters in security group name")
+		if $action && ($action !~ m/^${security_group_name_pattern}$/);
+	} else {
+	    &$add_error('type', "unknown rule type '$type'");
+	}
     }
 
-    # fixme: verify $rule->{iface}?
+    if ($rule->{iface}) {
+	&$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 $@;
+    	if ($rule_env eq 'vm') {
+	    &$add_error('iface', "value does not match the regex pattern 'net\\d+'")
+		if $rule->{iface} !~  m/^net(\d+)$/;
+	} elsif ($rule_env eq 'ct') {
+	    &$add_error('iface', "value does not match the regex pattern '(venet|eth\\d+)'")
+		if $rule->{iface} !~  m/^(venet|eth(\d+))$/;
+	}
+    }
 
     if ($rule->{macro}) {
-	my $preferred_name = $pve_fw_preferred_macro_names->{lc($rule->{macro})};
-	raise_param_exc({ macro => "unknown macro '$rule->{macro}'"}) if !$preferred_name;
-	$rule->{macro} = $preferred_name;
+	if (my $preferred_name = $pve_fw_preferred_macro_names->{lc($rule->{macro})}) {
+	    $rule->{macro} = $preferred_name;
+	} else {
+	    &$add_error('macro', "unknown macro '$rule->{macro}'");
+	}
+    }
+
+    if ($rule->{proto}) {
+	eval { pve_fw_verify_protocol_spec($rule->{proto}); };
+	&$add_error('proto', $@) if $@;
     }
 
     if ($rule->{dport}) {
 	eval { parse_port_name_number_or_range($rule->{dport}); };
-	raise_param_exc({ dport => $@ }) if $@;
+	&$add_error('dport', $@) if $@;
+	&$add_error('proto', "missing property - 'dport' requires this property")
+	    if !$rule->{proto};
     }
 
     if ($rule->{sport}) {
 	eval { parse_port_name_number_or_range($rule->{sport}); };
-	raise_param_exc({ sport => $@ }) if $@;
+	&$add_error('sport', $@) if $@;
+	&$add_error('proto', "missing property - 'sport' requires this property")
+	    if !$rule->{proto};
     }
 
     if ($rule->{source}) {
 	eval { parse_address_list($rule->{source}); };
-	raise_param_exc({ source => $@ }) if $@;
+	&$add_error('source', $@) if $@;
+	&$check_ipset_or_alias_property('source');
     }
 
     if ($rule->{dest}) {
 	eval { parse_address_list($rule->{dest}); };
-	raise_param_exc({ dest => $@ }) if $@;
+	&$add_error('dest', $@) if $@;
+	&$check_ipset_or_alias_property('dest');
     }
 
-    if ($rule->{macro}) {
-	&$apply_macro($rule->{macro}, $rule, 1);
+    if ($rule->{macro} && !$error_count) {
+	eval { &$apply_macro($rule->{macro}, $rule, 1); };
+	if (my $err = $@) {
+	    if (ref($err) eq "PVE::Exception" && $err->{errors}) {
+		my $eh = $err->{errors};
+		foreach my $p (keys %$eh) {
+		    &$add_error($p, $eh->{$p});
+		}
+	    } else {
+		&$add_error('macro', "$err");
+	    }
+	}
     }
 
+    $rule->{errors} = $errors if $error_count;
+
     return $rule;
 }
 
@@ -1046,13 +1171,9 @@ sub copy_rule_data {
 	    } else {
 		$rule->{$k} = $v;
 	    }
-	} else {
-	    delete $rule->{$k};
 	}
     }
 
-    # verify rule now
-
     return $rule;
 }
 
@@ -1196,9 +1317,10 @@ 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};
 
     die "unable to emit macro - internal error" if $rule->{macro}; # should not happen
 
@@ -1216,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";
         }
@@ -1237,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($source);
-	    my $e = $cluster_conf->{aliases}->{$alias};
-	    die "no such alias $dest" if !$e;
+	    my $alias = lc($dest);
+	    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";
         }
@@ -1293,8 +1431,8 @@ sub ruleset_generate_cmdstr {
 	    }
 	}
     } elsif ($rule->{dport} || $rule->{sport}) {
-	warn "ignoring destination port '$rule->{dport}' - no protocol specified\n" if $rule->{dport};
-	warn "ignoring source port '$rule->{sport}' - no protocol specified\n" if $rule->{sport};
+	die "destination port '$rule->{dport}', but no protocol specified\n" if $rule->{dport};
+	die "source port '$rule->{sport}', but no protocol specified\n" if $rule->{sport};
     }
 
     push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
@@ -1309,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;
 
@@ -1323,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;
 	}
     }
@@ -1439,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)) {
@@ -1453,7 +1596,7 @@ sub ruleset_chain_add_input_filters {
 }
 
 sub ruleset_create_vm_chain {
-    my ($ruleset, $chain, $options, $host_options, $macaddr, $direction) = @_;
+    my ($ruleset, $chain, $options, $macaddr, $direction) = @_;
 
     ruleset_create_chain($ruleset, $chain);
     my $accept = generate_nfqueue($options);
@@ -1476,8 +1619,28 @@ sub ruleset_create_vm_chain {
     }
 }
 
+sub ruleset_add_group_rule {
+    my ($ruleset, $cluster_conf, $chain, $rule, $direction, $action) = @_;
+
+    my $group = $rule->{action};
+    my $group_chain = "GROUP-$group-$direction";
+    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}) {
+	ruleset_addrule($ruleset, $chain, "-i $rule->{iface_in} -j $group_chain");
+    } else {
+	ruleset_addrule($ruleset, $chain, "-j $group_chain");
+    }
+
+    ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $action");
+}
+
 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);
 
@@ -1485,31 +1648,21 @@ sub ruleset_generate_vm_rules {
 
     foreach my $rule (@$rules) {
 	next if $rule->{iface} && $rule->{iface} ne $netid;
-	next if !$rule->{enable};
+	next if !$rule->{enable} || $rule->{errors};
 	if ($rule->{type} eq 'group') {
-	    my $group_chain = "GROUP-$rule->{action}-$direction";
-	    if(!ruleset_chain_exist($ruleset, $group_chain)){
-		generate_group_rules($ruleset, $cluster_conf, $rule->{action});
-	    }
-	    ruleset_addrule($ruleset, $chain, "-j $group_chain");
-	    if ($direction eq 'OUT'){
-		ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j RETURN");
-	    }else{
-		my $accept = generate_nfqueue($options);
-		ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $accept");
-	    }
-
+	    ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, $direction,
+				   $direction eq 'OUT' ? 'RETURN' : $in_accept);
 	} else {
 	    next if $rule->{type} ne $lc_direction;
 	    eval {
 		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 $@;
@@ -1551,23 +1704,20 @@ sub ruleset_generate_vm_ipsrules {
 }
 
 sub generate_venet_rules_direction {
-    my ($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, $direction) = @_;
-
-    parse_address_list($ip); # make sure we have a valid $ip list
+    my ($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, $direction) = @_;
 
     my $lc_direction = lc($direction);
 
     my $rules = $vmfw_conf->{rules};
 
     my $options = $vmfw_conf->{options};
-    my $hostfw_options = $vmfw_conf->{options};
     my $loglevel = get_option_log_level($options, "log_level_${lc_direction}");
 
     my $chain = "venet0-$vmid-$direction";
 
-    ruleset_create_vm_chain($ruleset, $chain, $options, $hostfw_options, undef, $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;
@@ -1596,21 +1746,20 @@ sub generate_venet_rules_direction {
 }
 
 sub generate_tap_rules_direction {
-    my ($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $direction) = @_;
+    my ($ruleset, $cluster_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $direction) = @_;
 
     my $lc_direction = lc($direction);
 
     my $rules = $vmfw_conf->{rules};
 
     my $options = $vmfw_conf->{options};
-    my $hostfw_options = $hostfw_conf->{options};
     my $loglevel = get_option_log_level($options, "log_level_${lc_direction}");
 
     my $tapchain = "$iface-$direction";
 
-    ruleset_create_vm_chain($ruleset, $tapchain, $options, $hostfw_options, $macaddr, $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);
 
@@ -1656,18 +1805,44 @@ sub enable_host_firewall {
     ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
     ruleset_chain_add_input_filters($ruleset, $chain, $options, $cluster_conf, $loglevel);
 
-    ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW --dport 5404:5405 -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT");  #corosync
-
     # we use RETURN because we need to check also tap rules
     my $accept_action = 'RETURN';
 
+    ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
-	next if $rule->{type} ne 'in';
+	next if !$rule->{enable} || $rule->{errors};
+
 	$rule->{iface_in} = $rule->{iface} if $rule->{iface};
-	ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
+
+	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, $hostfw_conf);
+	    }
+	};
+	warn $@ if $@;
+	delete $rule->{iface_in};
+    }
+
+    # allow standard traffic for management ipset (includes cluster network)
+    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 3128 -j $accept_action");  # SPICE Proxy
+    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 22 -j $accept_action");  # SSH
+
+    my $localnet = local_network();
+
+    # corosync
+    if ($localnet) {
+	my $corosync_rule = "-p udp --dport 5404:5405 -j $accept_action";
+	ruleset_addrule($ruleset, $chain, "-s $localnet -d $localnet $corosync_rule");
+	ruleset_addrule($ruleset, $chain, "-s $localnet -m addrtype --dst-type MULTICAST $corosync_rule");
     }
 
     # implement input policy
@@ -1684,18 +1859,38 @@ sub enable_host_firewall {
 
     ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
 
-    ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW --dport 5404:5405 -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT"); #corosync
-
     # we use RETURN because we may want to check other thigs later
     $accept_action = 'RETURN';
 
+    ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
-	next if $rule->{type} ne 'out';
+	next if !$rule->{enable} || $rule->{errors};
+
 	$rule->{iface_out} = $rule->{iface} if $rule->{iface};
-	ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
+	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, $hostfw_conf);
+	    }
+	};
+	warn $@ if $@;
+	delete $rule->{iface_out};
+    }
+
+    # allow standard traffic on cluster network
+    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 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");
     }
 
     # implement output policy
@@ -1708,10 +1903,14 @@ sub enable_host_firewall {
 
 sub generate_group_rules {
     my ($ruleset, $cluster_conf, $group) = @_;
-    die "no such security group '$group'\n" if !$cluster_conf->{groups}->{$group};
 
     my $rules = $cluster_conf->{groups}->{$group};
 
+    if (!$rules) {
+	warn "no such security group '$group'\n";
+	$rules = []; # create empty chain
+    }
+
     my $chain = "GROUP-${group}-IN";
 
     ruleset_create_chain($ruleset, $chain);
@@ -1743,87 +1942,81 @@ for (my $i = 0; $i < $MAX_NETS; $i++)  {
 }
 
 sub parse_fw_rule {
-    my ($line, $need_iface, $allow_groups) = @_;
+    my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env, $verbose) = @_;
+
+    chomp $line;
+
+    my $orig_line = $line;
 
-    my ($type, $action, $iface, $source, $dest, $proto, $dport, $sport);
+    my $rule = {};
 
     # we can add single line comments to the end of the rule
-    my $comment = decode('utf8', $1) if $line =~ s/#\s*(.*?)\s*$//;
+    if ($line =~ s/#\s*(.*?)\s*$//) {
+	$rule->{comment} = decode('utf8', $1);
+    }
 
     # we can disable a rule when prefixed with '|'
-    my $enable = 1;
 
-    $enable = 0 if $line =~ s/^\|//;
+    $rule->{enable} = $line =~ s/^\|// ? 0 : 1;
 
-    my @data = split(/\s+/, $line);
-    my $expected_elements = $need_iface ? 8 : 7;
+    $line =~ s/^(\S+)\s+(\S+)\s*// ||
+ 	die "unable to parse rule: $line\n";
 
-    die "wrong number of rule elements\n" if scalar(@data) > $expected_elements;
+    $rule->{type} = lc($1);
+    $rule->{action} = $2;
 
-    if ($need_iface) {
-	($type, $action, $iface, $source, $dest, $proto, $dport, $sport) = @data
-    } else {
-	($type, $action, $source, $dest, $proto, $dport, $sport) =  @data;
+    if ($rule->{type} eq  'in' || $rule->{type} eq 'out') {
+	if ($rule->{action} =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
+	    $rule->{macro} = $1;
+	    $rule->{action} = $2;
+	}
     }
 
-    die "incomplete rule\n" if ! ($type && $action);
+    while (length($line)) {
+	if ($line =~ s/^-i (\S+)\s*//) {
+	    $rule->{iface} = $1;
+	    next;
+	}
 
-    my $macro;
+	last if $rule->{type} eq 'group';
 
-    $type = lc($type);
+	if ($line =~ s/^-p (\S+)\s*//) {
+	    $rule->{proto} = $1;
+	    next;
+	}
 
-    if ($type eq  'in' || $type eq 'out') {
-	if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
-	    # OK
-	} elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
-	    $action = $2;
-	    my $preferred_name = $pve_fw_preferred_macro_names->{lc($1)};
-	    die "unknown macro '$1'\n" if !$preferred_name;
-	    $macro = $preferred_name;
-	} else {
-	    die "unknown action '$action'\n";
+	if ($line =~ s/^-dport (\S+)\s*//) {
+	    $rule->{dport} = $1;
+	    next;
 	}
-    } elsif ($type eq 'group') {
-	die "wrong number of rule elements\n" if scalar(@data) > 3;
-	die "groups disabled\n" if !$allow_groups;
 
-	die "invalid characters in group name\n" if $action !~ m/^${security_group_name_pattern}$/;
-    } else {
-	die "unknown rule type '$type'\n";
-    }
+	if ($line =~ s/^-sport (\S+)\s*//) {
+	    $rule->{sport} = $1;
+	    next;
+	}
+	if ($line =~ s/^-source (\S+)\s*//) {
+	    $rule->{source} = $1;
+	    next;
+	}
+	if ($line =~ s/^-dest (\S+)\s*//) {
+	    $rule->{dest} = $1;
+	    next;
+	}
 
-    if ($need_iface) {
-	$iface = undef if $iface && $iface eq '-';
+	last;
     }
 
-    $proto = undef if $proto && $proto eq '-';
-    pve_fw_verify_protocol_spec($proto) if $proto;
-
-    $source = undef if $source && $source eq '-';
-    $dest = undef if $dest && $dest eq '-';
+    die "unable to parse rule parameters: $line\n" if length($line);
 
-    $dport = undef if $dport && $dport eq '-';
-    $sport = undef if $sport && $sport eq '-';
-
-    parse_port_name_number_or_range($dport) if defined($dport);
-    parse_port_name_number_or_range($sport) if defined($sport);
-
-    parse_address_list($source) if $source;
-    parse_address_list($dest) if $dest;
+    $rule = verify_rule($rule, $cluster_conf, $fw_conf, $rule_env, 1);
+    if ($verbose && $rule->{errors}) {
+	warn "$prefix - errors in rule parameters: $orig_line\n";
+	foreach my $p (keys %{$rule->{errors}}) {
+	    warn "  $p: $rule->{errors}->{$p}\n";
+	}
+    }
 
-    return {
-	type => $type,
-	enable => $enable,
-	comment => $comment,
-	action => $action,
-	macro => $macro,
-	iface => $iface,
-	source => $source,
-	dest => $dest,
-	proto => $proto,
-	dport => $dport,
-	sport => $sport,
-    };
+    return $rule;
 }
 
 sub parse_vmfw_option {
@@ -1896,7 +2089,7 @@ sub parse_clusterfw_option {
     return ($opt, $value);
 }
 
-sub parse_clusterfw_alias {
+sub parse_alias {
     my ($line) = @_;
 
     # we can add single line comments to the end of the line
@@ -1917,117 +2110,13 @@ sub parse_clusterfw_alias {
     return undef;
 }
 
-sub parse_vm_fw_rules {
-    my ($filename, $fh) = @_;
-
-    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_vmfw_option($line);
-		$res->{options}->{$opt} = $value;
-	    };
-	    warn "$prefix: $@" if $@;
-	    next;
-	}
-
-	my $rule;
-	eval { $rule = parse_fw_rule($line, 1, 1); };
-	if (my $err = $@) {
-	    warn "$prefix: $err";
-	    next;
-	}
-
-	push @{$res->{$section}}, $rule;
-    }
-
-    return $res;
-}
-
-sub parse_host_fw_rules {
-    my ($filename, $fh) = @_;
-
-    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($line, 1, 1); };
-	if (my $err = $@) {
-	    warn "$prefix: $err";
-	    next;
-	}
-
-	push @{$res->{$section}}, $rule;
-    }
-
-    return $res;
-}
-
-sub parse_cluster_fw_rules {
-    my ($filename, $fh) = @_;
+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/^#/;
@@ -2036,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;
@@ -2056,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;
@@ -2078,19 +2167,26 @@ 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 $@;
 	} elsif ($section eq 'aliases') {
 	    eval {
-		my $data = parse_clusterfw_alias($line);
+		my $data = parse_alias($line);
 		$res->{aliases}->{lc($data->{name})} = $data;
 	    };
 	    warn "$prefix: $@" if $@;
 	} elsif ($section eq 'rules') {
 	    my $rule;
-	    eval { $rule = parse_fw_rule($line, 1, 1); };
+	    eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env, $verbose); };
 	    if (my $err = $@) {
 		warn "$prefix: $err";
 		next;
@@ -2098,7 +2194,7 @@ sub parse_cluster_fw_rules {
 	    push @{$res->{$section}}, $rule;
 	} elsif ($section eq 'groups') {
 	    my $rule;
-	    eval { $rule = parse_fw_rule($line, 0, 0); };
+	    eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, undef, 'group', $verbose); };
 	    if (my $err = $@) {
 		warn "$prefix: $err";
 		next;
@@ -2127,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) = @_;
 
@@ -2182,7 +2322,7 @@ sub read_local_vm_config {
 };
 
 sub load_vmfw_conf {
-    my ($vmid, $dir) = @_;
+    my ($cluster_conf, $rule_env, $vmid, $dir, $verbose) = @_;
 
     my $vmfw_conf = {};
 
@@ -2190,14 +2330,15 @@ 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);
+	$vmfw_conf = parse_vm_fw_rules($filename, $fh, $cluster_conf, $rule_env, $verbose);
+	$vmfw_conf->{vmid} = $vmid;
     }
 
     return $vmfw_conf;
 }
 
 my $format_rules = sub {
-    my ($rules, $need_iface) = @_;
+    my ($rules, $allow_iface) = @_;
 
     my $raw = '';
 
@@ -2210,14 +2351,16 @@ my $format_rules = sub {
 	    } else {
 		$raw .= " " . $rule->{action};
 	    }
-	    $raw .= " " . ($rule->{iface} || '-') if $need_iface;
+	    if ($allow_iface && $rule->{iface}) {
+		$raw .= " -i $rule->{iface}";
+	    }
 
 	    if ($rule->{type} ne  'group')  {
-		$raw .= " " . ($rule->{source} || '-');
-		$raw .= " " . ($rule->{dest} || '-');
-		$raw .= " " . ($rule->{proto} || '-');
-		$raw .= " " . ($rule->{dport} || '-');
-		$raw .= " " . ($rule->{sport} || '-');
+		$raw .= " -source $rule->{source}" if $rule->{source};
+		$raw .= " -dest $rule->{dest}" if $rule->{dest};
+		$raw .= " -p $rule->{proto}" if $rule->{proto};
+		$raw .= " -dport $rule->{dport}" if $rule->{dport};
+		$raw .= " -sport $rule->{sport}" if $rule->{sport};
 	    }
 
 	    $raw .= " # " . encode('utf8', $rule->{comment})
@@ -2263,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;
@@ -2293,6 +2448,11 @@ sub save_vmfw_conf {
     my $options = $vmfw_conf->{options};
     $raw .= &$format_options($options) if scalar(keys %$options);
 
+    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";
@@ -2305,12 +2465,17 @@ sub save_vmfw_conf {
 }
 
 sub read_vm_firewall_configs {
-    my ($vmdata, $dir) = @_;
+    my ($cluster_conf, $vmdata, $dir, $verbose) = @_;
 
     my $vmfw_configs = {};
 
-    foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) {
-	my $vmfw_conf = load_vmfw_conf($vmid, $dir);
+    foreach my $vmid (keys %{$vmdata->{qemu}}) {
+	my $vmfw_conf = load_vmfw_conf($cluster_conf, 'vm', $vmid, $dir, $verbose);
+	next if !$vmfw_conf->{options}; # skip if file does not exists
+	$vmfw_configs->{$vmid} = $vmfw_conf;
+    }
+    foreach my $vmid (keys %{$vmdata->{openvz}}) {
+	my $vmfw_conf = load_vmfw_conf($cluster_conf, 'ct', $vmid, $dir, $verbose);
 	next if !$vmfw_conf->{options}; # skip if file does not exists
 	$vmfw_configs->{$vmid} = $vmfw_conf;
     }
@@ -2369,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) {
@@ -2386,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 = {};
@@ -2394,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;
@@ -2429,38 +2599,14 @@ sub round_powerof2 {
     return ++$int;
 }
 
-sub save_pvefw_status {
-    my ($status) = @_;
-
-    die "unknown status '$status' - internal error"
-	if $status !~ m/^(stopped|active)$/;
-
-    mkdir dirname($pve_fw_status_filename);
-    PVE::Tools::file_set_contents($pve_fw_status_filename, $status);
-}
-
-sub read_pvefw_status {
-
-    my $status = 'unknown';
-
-    return 'stopped' if ! -f $pve_fw_status_filename;
-
-    eval {
-	$status = PVE::Tools::file_get_contents($pve_fw_status_filename);
-    };
-    warn $@ if $@;
-
-    return $status;
-}
-
 sub load_clusterfw_conf {
-    my ($filename) = @_;
+    my ($filename, $verbose) = @_;
 
     $filename = $clusterfw_conf_filename if !defined($filename);
 
     my $cluster_conf = {};
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$cluster_conf = parse_cluster_fw_rules($filename, $fh);
+	$cluster_conf = parse_cluster_fw_rules($filename, $fh, $verbose);
     }
 
     return $cluster_conf;
@@ -2477,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";
@@ -2513,13 +2649,13 @@ sub save_clusterfw_conf {
 }
 
 sub load_hostfw_conf {
-    my ($filename) = @_;
+    my ($cluster_conf, $filename, $verbose) = @_;
 
     $filename = $hostfw_conf_filename if !defined($filename);
 
     my $hostfw_conf = {};
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$hostfw_conf = parse_host_fw_rules($filename, $fh);
+	$hostfw_conf = parse_host_fw_rules($filename, $fh, $cluster_conf, $verbose);
     }
     return $hostfw_conf;
 }
@@ -2543,33 +2679,40 @@ sub save_hostfw_conf {
 }
 
 sub compile {
-    my ($cluster_conf, $hostfw_conf, $vmdata) = @_;
+    my ($cluster_conf, $hostfw_conf, $vmdata, $verbose) = @_;
 
     my $vmfw_configs;
 
     if ($vmdata) { # test mode
 	my $testdir = $vmdata->{testdir} || die "no test directory specified";
 	my $filename = "$testdir/cluster.fw";
-	die "missing test file '$filename'\n" if ! -f $filename;
-	$cluster_conf = load_clusterfw_conf($filename);
+	$cluster_conf = load_clusterfw_conf($filename, $verbose);
 
 	$filename = "$testdir/host.fw";
-	die "missing test file '$filename'\n" if ! -f $filename;
-	$hostfw_conf = load_hostfw_conf($filename);
+	$hostfw_conf = load_hostfw_conf($cluster_conf, $filename, $verbose);
 
-	$vmfw_configs = read_vm_firewall_configs($vmdata, $testdir);
+	$vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, $testdir, $verbose);
     } else { # normal operation
-	$cluster_conf = load_clusterfw_conf() if !$cluster_conf;
+	$cluster_conf = load_clusterfw_conf(undef, $verbose) if !$cluster_conf;
 
-	$hostfw_conf = load_hostfw_conf() if !$hostfw_conf;
+	$hostfw_conf = load_hostfw_conf($cluster_conf, undef, $verbose) if !$hostfw_conf;
 
 	$vmdata = read_local_vm_config();
-	$vmfw_configs = read_vm_firewall_configs($vmdata);
+	$vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, undef, $verbose);
     }
 
+    $cluster_conf->{ipset}->{venet0} = [];
+    my $venet0_ipset_chain = compute_ipset_chain_name(0, 'venet0');
 
-    my $ipset_ruleset = {};
-    generate_ipset_chains($ipset_ruleset, $cluster_conf);
+    my $localnet;
+    if ($cluster_conf->{aliases}->{local_network}) {
+	$localnet = $cluster_conf->{aliases}->{local_network}->{cidr};
+    } else {
+	$localnet = local_network() || '127.0.0.0/8';
+	$cluster_conf->{aliases}->{local_network} = { cidr => $localnet };
+    }
+
+    push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet };
 
     my $ruleset = {};
 
@@ -2585,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 -j PVEFW-VENET-OUT");
-    ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -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);
@@ -2600,71 +2744,98 @@ 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 -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));
 
-    enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf) if $hostfw_enable;
+    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 -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}}) {
-	my $conf = $vmdata->{qemu}->{$vmid};
-	my $vmfw_conf = $vmfw_configs->{$vmid};
-	next if !$vmfw_conf;
-	next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);
-
-	foreach my $netid (keys %$conf) {
-	    next if $netid !~ m/^net(\d+)$/;
-	    my $net = PVE::QemuServer::parse_net($conf->{$netid});
-	    next if !$net->{firewall};
-	    my $iface = "tap${vmid}i$1";
-
-	    my $macaddr = $net->{macaddr};
-	    generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					 $vmfw_conf, $vmid, 'IN');
-	    generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					 $vmfw_conf, $vmid, 'OUT');
-	}
+	eval {
+	    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+)$/;
+		my $net = PVE::QemuServer::parse_net($conf->{$netid});
+		next if !$net->{firewall};
+		my $iface = "tap${vmid}i$1";
+
+		my $macaddr = $net->{macaddr};
+		generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+					     $vmfw_conf, $vmid, 'IN');
+		generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+					     $vmfw_conf, $vmid, 'OUT');
+	    }
+	};
+	warn $@ if $@; # just to be sure - should not happen
     }
 
     # generate firewall rules for OpenVZ containers
     foreach my $vmid (keys %{$vmdata->{openvz}}) {
-	my $conf = $vmdata->{openvz}->{$vmid};
+	eval {
+	    my $conf = $vmdata->{openvz}->{$vmid};
 
-	my $vmfw_conf = $vmfw_configs->{$vmid};
-	next if !$vmfw_conf;
-	next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);
+	    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;
-	    generate_venet_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, 'IN');
-	    generate_venet_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, 'OUT');
-	}
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf);
 
-	if ($conf->{netif} && $conf->{netif}->{value}) {
-	    my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value});
-	    foreach my $netid (keys %$netif) {
-		my $d = $netif->{$netid};
+	    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
 
-		my $macaddr = $d->{mac};
-		my $iface = $d->{host_ifname};
-		generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					     $vmfw_conf, $vmid, 'IN');
-		generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					     $vmfw_conf, $vmid, 'OUT');
+		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');
 	    }
-	}
+
+	    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 $macaddr = $d->{mac};
+		    my $iface = $d->{host_ifname};
+		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+						 $vmfw_conf, $vmid, 'IN');
+		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+						 $vmfw_conf, $vmid, 'OUT');
+		}
+	    }
+	};
+	warn $@ if $@; # just to be sure - should not happen
     }
 
     if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){
 	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
     }
 
+    generate_ipset_chains($ipset_ruleset, undef, $cluster_conf);
+
     return ($ruleset, $ipset_ruleset);
 }
 
@@ -2934,9 +3105,17 @@ sub remove_pvefw_chains {
     iptables_restore_cmdlist($cmdlist);
 }
 
-sub update {
-    my ($start, $verbose) = @_;
+sub init {
+    my $cluster_conf = load_clusterfw_conf();
+    my $cluster_options = $cluster_conf->{options};
+    my $enable = $cluster_options->{enable};
 
+    return if !$enable;
+
+    # load required modules here
+}
+
+sub update {
     my $code = sub {
 
 	my $cluster_conf = load_clusterfw_conf();
@@ -2944,13 +3123,10 @@ sub update {
 
 	my $enable = $cluster_options->{enable};
 
-	my $status = read_pvefw_status();
-
-	die "Firewall is disabled - cannot start\n" if !$enable && $start;
+	die "Firewall is disabled - cannot start\n" if !$enable;
 
 	if (!$enable) {
 	    PVE::Firewall::remove_pvefw_chains();
-	    print "Firewall disabled\n" if $verbose;
 	    return;
 	}
 
@@ -2958,18 +3134,10 @@ sub update {
 
 	my ($ruleset, $ipset_ruleset) = compile($cluster_conf, $hostfw_conf);
 
-	if ($start || $status eq 'active') {
-
-	    save_pvefw_status('active')	if ($status ne 'active');
-
-	    apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose);
-	} else {
-	    print "Firewall not active (status = $status)\n" if $verbose;
-	}
+	apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset);
     };
 
     run_locked($code);
 }
 
-
 1;