X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=176239518c110c7d50f747d0fbcff5614f366c8e;hp=73005ab7bced11f6d5bb37b4de3066e7fecc87ed;hb=e523d2bb40d64ca33bb48b66cab1228ecc6c3bb8;hpb=56f313f75c4e204a687073079b5682ab4ab622f4

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 73005ab..1762395 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -438,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",
@@ -687,6 +687,58 @@ 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;
+}
+
 sub parse_address_list {
     my ($str) = @_;
 
@@ -803,7 +855,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;
     }
@@ -951,61 +1004,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;
+    
+    my $allow_iface = $rule_env_iface_lookup->{$rule_env};
+    die "unknown rule_env '$rule_env'\n" if !defined($allow_iface); # should not happen
 
-    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 $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'");
+	}
     }
 
     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}); };
-	raise_param_exc({ iface => $@ }) if $@;
-    }	
+	&$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;
 }
 
@@ -1019,13 +1154,9 @@ sub copy_rule_data {
 	    } else {
 		$rule->{$k} = $v;
 	    }
-	} else {
-	    delete $rule->{$k};
 	}
     }
 
-    # verify rule now
-
     return $rule;
 }
 
@@ -1169,9 +1300,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
 
@@ -1189,19 +1321,25 @@ 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}) {
+		    die "implement me";
+		} elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
+		    push @cmd, "-m set --match-set PVEFW-$1 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";
         }
@@ -1210,15 +1348,22 @@ 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}) {
+		    die "implement me";
+		} elsif ($cluster_conf && $cluster_conf->{ipset}->{$name}) {
+		    push @cmd, "-m set --match-set PVEFW-$1 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";
@@ -1266,8 +1411,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};
@@ -1282,7 +1427,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;
 
@@ -1296,7 +1441,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;
 	}
     }
@@ -1412,8 +1557,12 @@ 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");
+	}
+	ruleset_addrule($ruleset, $chain, "-m set --match-set PVEFW-blacklist src -j PVEFW-blacklist");
     }
 
     if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
@@ -1470,7 +1619,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);
 
@@ -1478,7 +1627,7 @@ 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') {
 	    ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, $direction,
 				   $direction eq 'OUT' ? 'RETURN' : $in_accept);
@@ -1488,11 +1637,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 $@;
@@ -1547,7 +1696,7 @@ sub generate_venet_rules_direction {
 
     ruleset_create_vm_chain($ruleset, $chain, $options, undef, $direction);
 
-    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $chain, 'venet', $direction);
+    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, 'venet', $direction);
 
     # implement policy
     my $policy;
@@ -1589,7 +1738,7 @@ sub generate_tap_rules_direction {
 
     ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction);
 
-    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $tapchain, $netid, $direction, $options);
+    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $tapchain, $netid, $direction, $options);
 
     ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface);
 
@@ -1635,25 +1784,45 @@ 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->{enable} || $rule->{errors};
+	
 	$rule->{iface_in} = $rule->{iface} if $rule->{iface};
-	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);
-	}
+
+	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 $mngmntsrc = "-m set --match-set PVEFW-management 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
     my $policy = $cluster_options->{policy_in} || 'DROP'; # allow nothing by default
     ruleset_add_chain_policy($ruleset, $chain, 0, $policy, $loglevel, $accept_action);
@@ -1668,25 +1837,40 @@ 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->{enable} || $rule->{errors};
+
 	$rule->{iface_out} = $rule->{iface} if $rule->{iface};
-	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);
-	}
+	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
     $policy = $cluster_options->{policy_out} || 'ACCEPT'; # allow everything by default
     ruleset_add_chain_policy($ruleset, $chain, 0, $policy, $loglevel, $accept_action);
@@ -1736,77 +1920,64 @@ for (my $i = 0; $i < $MAX_NETS; $i++)  {
 }
 
 sub parse_fw_rule {
-    my ($line, $allow_iface, $allow_groups) = @_;
-
-    my ($type, $action, $macro, $iface, $source, $dest, $proto, $dport, $sport);
+    my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env, $verbose) = @_;
 
     chomp $line;
 
+    my $orig_line = $line;
+
+    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;
 
     $line =~ s/^(\S+)\s+(\S+)\s*// ||
  	die "unable to parse rule: $line\n";
-    
-    $type = lc($1);
-    $action = $2;
-
-    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";
+
+    $rule->{type} = lc($1);
+    $rule->{action} = $2;
+
+    if ($rule->{type} eq  'in' || $rule->{type} eq 'out') {
+	if ($rule->{action} =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
+	    $rule->{macro} = $1;
+	    $rule->{action} = $2;
 	}
-    } elsif ($type eq 'group') {
-	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";
     }
 
     while (length($line)) {
 	if ($line =~ s/^-i (\S+)\s*//) {
-	    die "parameter -i not allowed\n" if !$allow_iface;
-	    $iface = $1;
-	    PVE::JSONSchema::pve_verify_iface($iface);
+	    $rule->{iface} = $1;
 	    next;
 	}
 
-	last if $type eq 'group';
+	last if $rule->{type} eq 'group';
 
 	if ($line =~ s/^-p (\S+)\s*//) {
-	    $proto = $1;
-	    pve_fw_verify_protocol_spec($proto);
+	    $rule->{proto} = $1;
 	    next;
 	}
+
 	if ($line =~ s/^-dport (\S+)\s*//) {
-	    $dport = $1;
-	    parse_port_name_number_or_range($dport);
+	    $rule->{dport} = $1;
 	    next;
 	}
+
 	if ($line =~ s/^-sport (\S+)\s*//) {
-	    $sport = $1;
-	    parse_port_name_number_or_range($sport);
+	    $rule->{sport} = $1;
 	    next;
 	}
 	if ($line =~ s/^-source (\S+)\s*//) {
-	    $source = $1;
-	    parse_address_list($source);
+	    $rule->{source} = $1;
 	    next;
 	}
 	if ($line =~ s/^-dest (\S+)\s*//) {
-	    $dest = $1;
-	    parse_address_list($dest);
+	    $rule->{dest} = $1;
 	    next;
 	}
 
@@ -1815,19 +1986,15 @@ sub parse_fw_rule {
 
     die "unable to parse rule parameters: $line\n" if length($line);
 
-    return {
-	type => $type,
-	enable => $enable,
-	comment => $comment,
-	action => $action,
-	macro => $macro,
-	iface => $iface,
-	source => $source,
-	dest => $dest,
-	proto => $proto,
-	dport => $dport,
-	sport => $sport,
-    };
+    $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 $rule;
 }
 
 sub parse_vmfw_option {
@@ -1900,7 +2067,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
@@ -1922,9 +2089,13 @@ sub parse_clusterfw_alias {
 }
 
 sub parse_vm_fw_rules {
-    my ($filename, $fh) = @_;
+    my ($filename, $fh, $cluster_conf, $rule_env, $verbose) = @_;
 
-    my $res = { rules => [], options => {}};
+    my $res = { 
+	rules => [], 
+	options => {},
+	aliases => {},
+    };
 
     my $section;
 
@@ -1956,8 +2127,17 @@ sub parse_vm_fw_rules {
 	    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($line, 1, 1); };
+	eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, $rule_env, $verbose); };
 	if (my $err = $@) {
 	    warn "$prefix: $err";
 	    next;
@@ -1970,7 +2150,7 @@ sub parse_vm_fw_rules {
 }
 
 sub parse_host_fw_rules {
-    my ($filename, $fh) = @_;
+    my ($filename, $fh, $cluster_conf, $verbose) = @_;
 
     my $res = { rules => [], options => {}};
 
@@ -2005,7 +2185,7 @@ sub parse_host_fw_rules {
 	}
 
 	my $rule;
-	eval { $rule = parse_fw_rule($line, 1, 1); };
+	eval { $rule = parse_fw_rule($prefix, $line, $cluster_conf, $res, 'host', $verbose); };
 	if (my $err = $@) {
 	    warn "$prefix: $err";
 	    next;
@@ -2018,7 +2198,7 @@ sub parse_host_fw_rules {
 }
 
 sub parse_cluster_fw_rules {
-    my ($filename, $fh) = @_;
+    my ($filename, $fh, $verbose) = @_;
 
     my $section;
     my $group;
@@ -2088,13 +2268,13 @@ sub parse_cluster_fw_rules {
 	    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, $res, undef, 'cluster', $verbose); };
 	    if (my $err = $@) {
 		warn "$prefix: $err";
 		next;
@@ -2102,7 +2282,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, $res, undef, 'group', $verbose); };
 	    if (my $err = $@) {
 		warn "$prefix: $err";
 		next;
@@ -2186,7 +2366,7 @@ sub read_local_vm_config {
 };
 
 sub load_vmfw_conf {
-    my ($vmid, $dir) = @_;
+    my ($cluster_conf, $rule_env, $vmid, $dir, $verbose) = @_;
 
     my $vmfw_conf = {};
 
@@ -2194,7 +2374,7 @@ sub load_vmfw_conf {
 
     my $filename = "$dir/$vmid.fw";
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$vmfw_conf = parse_vm_fw_rules($filename, $fh);
+	$vmfw_conf = parse_vm_fw_rules($filename, $fh, $cluster_conf, $rule_env, $verbose);
     }
 
     return $vmfw_conf;
@@ -2299,6 +2479,9 @@ 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);
+
     my $rules = $vmfw_conf->{rules} || [];
     if (scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
@@ -2311,12 +2494,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;
     }
@@ -2436,13 +2624,13 @@ sub round_powerof2 {
 }
 
 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;
@@ -2495,13 +2683,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;
 }
@@ -2525,33 +2713,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 $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 = {};
 
     ruleset_create_chain($ruleset, "PVEFW-INPUT");
@@ -2587,69 +2782,78 @@ sub compile {
 
     my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0));
 
-    enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf) if $hostfw_enable;
+    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");
 
     # 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, $iface, $netid, $macaddr,
-					 $vmfw_conf, $vmid, 'IN');
-	    generate_tap_rules_direction($ruleset, $cluster_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};
+
+	    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;
-	    parse_address_list($ip); # make sure we have a valid $ip list
+	    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 @ips = split(',', $ip);
-
-	    foreach my $singleip (@ips) {
-		my $venet0ipset = {};
-		$venet0ipset->{cidr} = $singleip;
-		push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset;
-	    }
+		my @ips = split(',', $ip);
 
-	    generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'IN');
-	    generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'OUT');
-	}
+		foreach my $singleip (@ips) {
+		    my $venet0ipset = {};
+		    $venet0ipset->{cidr} = $singleip;
+		    push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset;
+		}
 
-	if ($conf->{netif} && $conf->{netif}->{value}) {
-	    my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value});
-	    foreach my $netid (keys %$netif) {
-		my $d = $netif->{$netid};
+		generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'IN');
+		generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'OUT');
+	    }
 
-		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');
+	    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")){
@@ -2928,9 +3132,17 @@ sub remove_pvefw_chains {
     iptables_restore_cmdlist($cmdlist);
 }
 
-sub update {
-    my ($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();
@@ -2942,7 +3154,6 @@ sub update {
 
 	if (!$enable) {
 	    PVE::Firewall::remove_pvefw_chains();
-	    print "Firewall disabled\n" if $verbose;
 	    return;
 	}
 
@@ -2950,11 +3161,10 @@ sub update {
 
 	my ($ruleset, $ipset_ruleset) = compile($cluster_conf, $hostfw_conf);
 
-	apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose);
+	apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset);
     };
 
     run_locked($code);
 }
 
-
 1;