X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=ad592676d0a9b30f4bcf1b9e4a4e255f105b122c;hp=9aa9be177f928f04d9dacafdf93983a4af5c0cff;hb=7f7930f8cf5558659e0664737f9b03811f84f3f1;hpb=7831e1e329a4300aa9cbc341882f18362615107b

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 9aa9be1..ad59267 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -13,6 +13,7 @@ use PVE::Cluster;
 use PVE::ProcFSTools;
 use PVE::Tools qw($IPV4RE $IPV6RE);
 use PVE::Network;
+use PVE::SafeSyslog;
 use File::Basename;
 use File::Path;
 use IO::File;
@@ -52,6 +53,14 @@ my $max_alias_name_length = 64;
 my $max_ipset_name_length = 64;
 my $max_group_name_length = 18;
 
+my $PROTOCOLS_WITH_PORTS = {
+    udp => 1,     17 => 1,
+    udplite => 1, 136 => 1,
+    tcp => 1,     6 => 1,
+    dccp => 1,    33 => 1,
+    sctp => 1,    132 => 1,
+};
+
 PVE::JSONSchema::register_format('IPorCIDR', \&pve_verify_ip_or_cidr);
 sub pve_verify_ip_or_cidr {
     my ($cidr, $noerr) = @_;
@@ -903,13 +912,17 @@ sub local_network {
 	    my $mask;
 	    if ($isv6) {
 		$mask = $entry->{prefix};
+		next if !$mask; # skip the default route...
 	    } else {
 		$mask = $PVE::Network::ipv4_mask_hash_localnet->{$entry->{mask}};
 		next if !defined($mask);
 	    }
 	    my $cidr = "$entry->{dest}/$mask";
 	    my $testnet = Net::IP->new($cidr);
-	    if ($testnet->overlaps($testip) == $Net::IP::IP_B_IN_A_OVERLAP) {
+	    my $overlap = $testnet->overlaps($testip);
+	    if ($overlap == $Net::IP::IP_B_IN_A_OVERLAP ||
+	        $overlap == $Net::IP::IP_IDENTICAL)
+	    {
 		$__local_network = $cidr;
 		return;
 	    }
@@ -964,7 +977,9 @@ sub parse_address_list {
     my $iprange = 0;
     my $ipversion;
 
-    foreach my $elem (split(/,/, $str)) {
+    my @elements = split(/,/, $str);
+    die "extraneous commas in list\n" if $str ne join(',', @elements);
+    foreach my $elem (@elements) {
 	$count++;
 	my $ip = Net::IP->new($elem);
 	if (!$ip) {
@@ -993,7 +1008,9 @@ sub parse_port_name_number_or_range {
     my $count = 0;
     my $icmp_port = 0;
 
-    foreach my $item (split(/,/, $str)) {
+    my @elements = split(/,/, $str);
+    die "extraneous commas in list\n" if $str ne join(',', @elements);
+    foreach my $item (@elements) {
 	$count++;
 	if ($item =~ m/^(\d+):(\d+)$/) {
 	    my ($port1, $port2) = ($1, $2);
@@ -1502,15 +1519,22 @@ sub verify_rule {
     if ($rule->{dport}) {
 	eval { parse_port_name_number_or_range($rule->{dport}, 1); };
 	&$add_error('dport', $@) if $@;
+	my $proto = $rule->{proto};
 	&$add_error('proto', "missing property - 'dport' requires this property")
-	    if !$rule->{proto};
+	    if !$proto;
+	&$add_error('dport', "protocol '$proto' does not support ports")
+	    if !$PROTOCOLS_WITH_PORTS->{$proto} &&
+		$proto ne 'icmp' && $proto ne 'icmpv6'; # special cases
     }
 
     if ($rule->{sport}) {
 	eval { parse_port_name_number_or_range($rule->{sport}, 0); };
 	&$add_error('sport', $@) if $@;
+	my $proto = $rule->{proto};
 	&$add_error('proto', "missing property - 'sport' requires this property")
-	    if !$rule->{proto};
+	    if !$proto;
+	&$add_error('sport', "protocol '$proto' does not support ports")
+	    if !$PROTOCOLS_WITH_PORTS->{$proto};
     }
 
     if ($rule->{source}) {
@@ -1624,8 +1648,6 @@ sub enable_bridge_firewall {
     $bridge_firewall_enabled = 1;
 }
 
-my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
-
 sub iptables_restore_cmdlist {
     my ($cmdlist) = @_;
 
@@ -1754,7 +1776,7 @@ sub ipset_get_chains {
     return $res;
 }
 
-sub ruleset_generate_cmdstr {
+sub ruleset_generate_match {
     my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
 
     return if defined($rule->{enable}) && !$rule->{enable};
@@ -1831,8 +1853,8 @@ sub ruleset_generate_cmdstr {
         }
     }
 
-    if ($rule->{proto}) {
-	push @cmd, "-p $rule->{proto}";
+    if (my $proto = $rule->{proto}) {
+	push @cmd, "-p $proto";
 
 	my $multiport = 0;
 	$multiport++ if $nbdport > 1;
@@ -1844,16 +1866,18 @@ sub ruleset_generate_cmdstr {
 	    if ($multiport == 2) && ($rule->{dport} ne $rule->{sport});
 
 	if ($rule->{dport}) {
-	    if ($rule->{proto} && $rule->{proto} eq 'icmp') {
+	    if ($proto eq 'icmp') {
 		# Note: we use dport to store --icmp-type
 		die "unknown icmp-type '$rule->{dport}'\n"
 		    if $rule->{dport} !~ /^\d+$/ && !defined($icmp_type_names->{$rule->{dport}});
 		push @cmd, "-m icmp --icmp-type $rule->{dport}";
-	    } elsif ($rule->{proto} && $rule->{proto} eq 'icmpv6') {
+	    } elsif ($proto eq 'icmpv6') {
 		# Note: we use dport to store --icmpv6-type
 		die "unknown icmpv6-type '$rule->{dport}'\n"
 		    if $rule->{dport} !~ /^\d+$/ && !defined($icmpv6_type_names->{$rule->{dport}});
 		push @cmd, "-m icmpv6 --icmpv6-type $rule->{dport}";
+	    } elsif (!$PROTOCOLS_WITH_PORTS->{$proto}) {
+		die "protocol $proto does not have ports\n";
 	    } else {
 		if ($nbdport > 1) {
 		    if ($multiport == 2) {
@@ -1868,6 +1892,8 @@ sub ruleset_generate_cmdstr {
 	}
 
 	if ($rule->{sport}) {
+	    die "protocol $proto does not have ports\n"
+		 if !$PROTOCOLS_WITH_PORTS->{$proto};
 	    if ($nbsport > 1) {
 		push @cmd, "--sports $rule->{sport}" if $multiport != 2;
 	    } else {
@@ -1881,6 +1907,14 @@ sub ruleset_generate_cmdstr {
 
     push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
 
+    return scalar(@cmd) ? join(' ', @cmd) : undef;
+}
+
+sub ruleset_generate_action {
+    my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+
+    my @cmd = ();
+
     if (my $action = $rule->{action}) {
 	$action = $actions->{$action} if defined($actions->{$action});
 	$goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
@@ -1890,6 +1924,17 @@ sub ruleset_generate_cmdstr {
     return scalar(@cmd) ? join(' ', @cmd) : undef;
 }
 
+sub ruleset_generate_cmdstr {
+    my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+    my $match = ruleset_generate_match($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf);
+    my $action = ruleset_generate_action($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf);
+
+    return undef if !(defined($match) or defined($action));
+    my $ret = defined($match) ? $match : "";
+    $ret = "$ret $action" if defined($action);
+    return $ret;
+}
+
 sub ruleset_generate_rule {
     my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
 
@@ -1903,15 +1948,19 @@ sub ruleset_generate_rule {
 
     # update all or nothing
 
-    my @cmds = ();
+    my @mstrs = ();
+    my @astrs = ();
     foreach my $tmp (@$rules) {
-	if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf)) {
-	    push @cmds, $cmdstr;
+	my $m = ruleset_generate_match($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf);
+	my $a = ruleset_generate_action($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf);
+	if (defined $m or defined $a) {
+	    push @mstrs, defined($m) ? $m : "";
+	    push @astrs, defined($a) ? $a : "";
 	}
     }
 
-    foreach my $cmdstr (@cmds) {
-	ruleset_addrule($ruleset, $chain, $cmdstr);
+    for my $i (0 .. $#mstrs) {
+	ruleset_addrule($ruleset, $chain, $mstrs[$i], $astrs[$i]);
     }
 }
 
@@ -1920,8 +1969,10 @@ sub ruleset_generate_rule_insert {
 
     die "implement me" if $rule->{macro}; # not implemented, because not needed so far
 
-    if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $ipversion, $rule, $actions, $goto)) {
-	ruleset_insertrule($ruleset, $chain, $cmdstr);
+    my $match = ruleset_generate_match($ruleset, $chain, $ipversion, $rule, $actions, $goto);
+    my $action = ruleset_generate_action($ruleset, $chain, $ipversion, $rule, $actions, $goto);
+    if (defined $match && defined $action) {
+	ruleset_insertrule($ruleset, $chain, $match, $action);
     }
 }
 
@@ -1942,7 +1993,7 @@ sub ruleset_chain_exist {
     return $ruleset->{$chain} ? 1 : undef;
 }
 
-sub ruleset_addrule {
+sub ruleset_addrule_old {
    my ($ruleset, $chain, $rule) = @_;
 
    die "no such chain '$chain'\n" if !$ruleset->{$chain};
@@ -1950,39 +2001,38 @@ sub ruleset_addrule {
    push @{$ruleset->{$chain}}, "-A $chain $rule";
 }
 
+sub ruleset_addrule {
+   my ($ruleset, $chain, $match, $action, $log, $logmsg, $vmid) = @_;
+
+   die "no such chain '$chain'\n" if !$ruleset->{$chain};
+
+   if (defined($log) && $log) {
+	my $logaction = get_log_rule_base($chain, $vmid, $logmsg, $log);
+	push @{$ruleset->{$chain}}, "-A $chain $match $logaction";
+   }
+   push @{$ruleset->{$chain}}, "-A $chain $match $action";
+}
+
 sub ruleset_insertrule {
-   my ($ruleset, $chain, $rule) = @_;
+   my ($ruleset, $chain, $match, $action, $log) = @_;
 
    die "no such chain '$chain'\n" if !$ruleset->{$chain};
 
-   unshift @{$ruleset->{$chain}}, "-A $chain $rule";
+   unshift @{$ruleset->{$chain}}, "-A $chain $match $action";
 }
 
 sub get_log_rule_base {
     my ($chain, $vmid, $msg, $loglevel) = @_;
 
-    die "internal error - no log level" if !defined($loglevel);
-
     $vmid = 0 if !defined($vmid);
+    $msg = "" if !defined($msg);
 
     # Note: we use special format for prefix to pass further
-    # info to log daemon (VMID, LOGVELEL and CHAIN)
+    # info to log daemon (VMID, LOGLEVEL and CHAIN)
 
     return "-j NFLOG --nflog-prefix \":$vmid:$loglevel:$chain: $msg\"";
 }
 
-sub ruleset_addlog {
-    my ($ruleset, $chain, $vmid, $msg, $loglevel, $rule) = @_;
-
-    return if !defined($loglevel);
-
-    my $logrule = get_log_rule_base($chain, $vmid, $msg, $loglevel);
-
-    $logrule = "$rule $logrule" if defined($rule);
-
-    ruleset_addrule($ruleset, $chain, $logrule);
-}
-
 sub ruleset_add_chain_policy {
     my ($ruleset, $chain, $ipversion, $vmid, $policy, $loglevel, $accept_action) = @_;
 
@@ -1993,17 +2043,13 @@ sub ruleset_add_chain_policy {
 
     } elsif ($policy eq 'DROP') {
 
-	ruleset_addrule($ruleset, $chain, "-j PVEFW-Drop");
+	ruleset_addrule($ruleset, $chain, "", "-j PVEFW-Drop");
 
-	ruleset_addlog($ruleset, $chain, $vmid, "policy $policy: ", $loglevel);
-
-	ruleset_addrule($ruleset, $chain, "-j DROP");
+	ruleset_addrule($ruleset, $chain, "", "-j DROP", $loglevel, "policy $policy: ", $vmid);
     } elsif ($policy eq 'REJECT') {
-	ruleset_addrule($ruleset, $chain, "-j PVEFW-Reject");
-
-	ruleset_addlog($ruleset, $chain, $vmid, "policy $policy: ", $loglevel);
+	ruleset_addrule($ruleset, $chain, "", "-j PVEFW-Reject");
 
-	ruleset_addrule($ruleset, $chain, "-g PVEFW-reject");
+	ruleset_addrule($ruleset, $chain, "", "-g PVEFW-reject", $loglevel, "policy $policy:", $vmid);
     } else {
 	# should not happen
 	die "internal error: unknown policy '$policy'";
@@ -2014,19 +2060,19 @@ sub ruleset_chain_add_ndp {
     my ($ruleset, $chain, $ipversion, $options, $direction, $accept) = @_;
     return if $ipversion != 6 || (defined($options->{ndp}) && !$options->{ndp});
 
-    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-solicitation $accept");
+    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-solicitation", $accept);
     if ($direction ne 'OUT' || $options->{radv}) {
-	ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement $accept");
+	ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement", $accept);
     }
-    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-solicitation $accept");
-    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-advertisement $accept");
+    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-solicitation", $accept);
+    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-advertisement", $accept);
 }
 
 sub ruleset_chain_add_conn_filters {
     my ($ruleset, $chain, $accept) = @_;
 
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
+    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID", "-j DROP");
+    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED", "-j $accept");
 }
 
 sub ruleset_chain_add_input_filters {
@@ -2035,21 +2081,20 @@ sub ruleset_chain_add_input_filters {
     if ($cluster_conf->{ipset}->{blacklist}){
 	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, "PVEFW-blacklist", "", "-j DROP", $loglevel, "DROP: ");
 	}
 	my $ipset_chain = compute_ipset_chain_name(0, 'blacklist', $ipversion);
-	ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src -j PVEFW-blacklist");
+	ruleset_addrule($ruleset, $chain, "-m set --match-set ${ipset_chain} src", "-j PVEFW-blacklist");
     }
 
     if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
 	if ($ipversion == 4) {
-	    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
+	    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW", "-j PVEFW-smurfs");
 	}
     }
 
     if ($options->{tcpflags}) {
-	ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags");
+	ruleset_addrule($ruleset, $chain, "-p tcp", "-j PVEFW-tcpflags");
     }
 }
 
@@ -2086,15 +2131,15 @@ sub ruleset_create_vm_chain {
 
     if ($direction eq 'OUT') {
 	if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
-	    ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP");
+	    ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr", "-j DROP");
 	}
 	if ($ipversion == 6 && !$options->{radv}) {
-	    ruleset_addrule($ruleset, $chain, '-p icmpv6 --icmpv6-type router-advertisement -j DROP');
+	    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement", "-j DROP");
 	}
 	if ($ipfilter_ipset) {
-	    ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src -j DROP");
+	    ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src", "-j DROP");
 	}
-	ruleset_addrule($ruleset, $chain, "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
+	ruleset_addrule($ruleset, $chain, "", "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
     }
 
     my $accept_action = $direction eq 'OUT' ? '-g PVEFW-SET-ACCEPT-MARK' : "-j $accept";
@@ -2111,14 +2156,14 @@ sub ruleset_add_group_rule {
     }
 
     if ($direction eq 'OUT' && $rule->{iface_out}) {
-	ruleset_addrule($ruleset, $chain, "-o $rule->{iface_out} -j $group_chain");
+	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");
+	ruleset_addrule($ruleset, $chain, "-i $rule->{iface_in}", "-j $group_chain");
     } else {
-	ruleset_addrule($ruleset, $chain, "-j $group_chain");
+	ruleset_addrule($ruleset, $chain, "", "-j $group_chain");
     }
 
-    ruleset_addrule($ruleset, $chain, "-m mark --mark $FWACCEPTMARK_ON -j $action");
+    ruleset_addrule($ruleset, $chain, "-m mark --mark $FWACCEPTMARK_ON", "-j $action");
 }
 
 sub ruleset_generate_vm_rules {
@@ -2183,7 +2228,7 @@ sub ruleset_generate_vm_ipsrules {
 	    ruleset_create_chain($ruleset, "PVEFW-IPS");
 	}
 
-        ruleset_addrule($ruleset, "PVEFW-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged -j $nfqueue");
+        ruleset_addrule($ruleset, "PVEFW-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged", "-j $nfqueue");
     }
 }
 
@@ -2231,10 +2276,10 @@ sub generate_tap_rules_direction {
     # plug the tap chain to bridge chain
     if ($direction eq 'IN') {
 	ruleset_addrule($ruleset, "PVEFW-FWBR-IN",
-			"-m physdev --physdev-is-bridged --physdev-out $iface -j $tapchain");
+			"-m physdev --physdev-is-bridged --physdev-out $iface", "-j $tapchain");
     } else {
 	ruleset_addrule($ruleset, "PVEFW-FWBR-OUT",
-			"-m physdev --physdev-is-bridged --physdev-in $iface -j $tapchain");
+			"-m physdev --physdev-is-bridged --physdev-in $iface", "-j $tapchain");
     }
 }
 
@@ -2252,7 +2297,7 @@ sub enable_host_firewall {
 
     my $loglevel = get_option_log_level($options, "log_level_in");
 
-    ruleset_addrule($ruleset, $chain, "-i lo -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-i lo", "-j ACCEPT");
 
     ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
     ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'IN', '-j RETURN');
@@ -2261,7 +2306,7 @@ sub enable_host_firewall {
     # 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
+    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) {
@@ -2286,19 +2331,19 @@ sub enable_host_firewall {
     # allow standard traffic for management ipset (includes cluster network)
     my $mngmnt_ipset_chain = compute_ipset_chain_name(0, "management", $ipversion);
     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
+    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 = $cluster_conf->{aliases}->{local_network}->{cidr};
     my $localnet_ver = $cluster_conf->{aliases}->{local_network}->{ipversion};
 
     # corosync
     if ($localnet && ($ipversion == $localnet_ver)) {
-	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");
+	my $corosync_rule = "-p udp --dport 5404:5405";
+	ruleset_addrule($ruleset, $chain, "-s $localnet -d $localnet $corosync_rule", "-j $accept_action");
+	ruleset_addrule($ruleset, $chain, "-s $localnet -m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action");
     }
 
     # implement input policy
@@ -2311,7 +2356,7 @@ sub enable_host_firewall {
 
     $loglevel = get_option_log_level($options, "log_level_out");
 
-    ruleset_addrule($ruleset, $chain, "-o lo -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-o lo", "-j ACCEPT");
 
     ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
 
@@ -2319,7 +2364,7 @@ sub enable_host_firewall {
     $accept_action = 'RETURN';
     ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'OUT', "-j $accept_action");
 
-    ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+    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) {
@@ -2342,22 +2387,22 @@ sub enable_host_firewall {
 
     # allow standard traffic on cluster network
     if ($localnet && ($ipversion == $localnet_ver)) {
-	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
+	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");
+	my $corosync_rule = "-p udp --dport 5404:5405";
+	ruleset_addrule($ruleset, $chain, "-d $localnet $corosync_rule", "-j $accept_action");
+	ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule", "-j $accept_action");
     }
 
     # implement output policy
     $policy = $cluster_options->{policy_out} || 'ACCEPT'; # allow everything by default
     ruleset_add_chain_policy($ruleset, $chain, $ipversion, 0, $policy, $loglevel, $accept_action);
 
-    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-j PVEFW-HOST-OUT");
-    ruleset_addrule($ruleset, "PVEFW-INPUT", "-j PVEFW-HOST-IN");
+    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "", "-j PVEFW-HOST-OUT");
+    ruleset_addrule($ruleset, "PVEFW-INPUT", "", "-j PVEFW-HOST-IN");
 }
 
 sub generate_group_rules {
@@ -2373,7 +2418,7 @@ sub generate_group_rules {
     my $chain = "GROUP-${group}-IN";
 
     ruleset_create_chain($ruleset, $chain);
-    ruleset_addrule($ruleset, $chain, "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
+    ruleset_addrule($ruleset, $chain, "", "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
 
     foreach my $rule (@$rules) {
 	next if $rule->{type} ne 'in';
@@ -2386,7 +2431,7 @@ sub generate_group_rules {
     $chain = "GROUP-${group}-OUT";
 
     ruleset_create_chain($ruleset, $chain);
-    ruleset_addrule($ruleset, $chain, "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
+    ruleset_addrule($ruleset, $chain, "", "-j MARK --set-mark $FWACCEPTMARK_OFF"); # clear mark
 
     foreach my $rule (@$rules) {
 	next if $rule->{type} ne 'out';
@@ -2479,10 +2524,14 @@ sub parse_fw_rule {
     die "unable to parse rule parameters: $line\n" if length($line);
 
     $rule = verify_rule($rule, $cluster_conf, $fw_conf, $rule_env, 1);
-    if ($verbose && $rule->{errors}) {
-	warn "$prefix - errors in rule parameters: $orig_line\n";
+    if ($rule->{errors}) {
+	# The verbose flag really means we're running from the CLI and want
+	# output on the console - in the other case we really want such errors
+	# to go into the syslog instead.
+	my $log = $verbose ? sub { warn @_ } : sub { syslog(err => @_) };
+	$log->("$prefix - errors in rule parameters: $orig_line\n");
 	foreach my $p (keys %{$rule->{errors}}) {
-	    warn "  $p: $rule->{errors}->{$p}\n";
+	    $log->("  $p: $rule->{errors}->{$p}\n");
 	}
     }
 
@@ -2750,6 +2799,10 @@ sub generic_fw_config_parser {
 		$errors->{cidr} = $err;
 	    }
 
+	    if ($cidr =~ m!/0+$!) {
+		$errors->{cidr} = "a zero prefix is not allowed in ipset entries\n";
+	    }
+
 	    my $entry = { cidr => $cidr };
 	    $entry->{nomatch} = 1 if $nomatch;
 	    $entry->{comment} = $comment if $comment;
@@ -3101,7 +3154,7 @@ sub generate_std_chains {
 	    if (ref($rule)) {
 		ruleset_generate_rule($ruleset, $chain, $ipversion, $rule);
 	    } else {
-		ruleset_addrule($ruleset, $chain, $rule);
+		ruleset_addrule_old($ruleset, $chain, $rule);
 	    }
 	}
     }
@@ -3344,10 +3397,10 @@ sub compile_iptables_filter {
     ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
     ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $ipversion, $hostfw_options, $cluster_conf, $loglevel);
 
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+ -j PVEFW-FWBR-IN");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+", "-j PVEFW-FWBR-IN");
 
     ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+", "-j PVEFW-FWBR-OUT");
 
     generate_std_chains($ruleset, $hostfw_options, $ipversion);
 
@@ -3406,7 +3459,7 @@ sub compile_iptables_filter {
     }
 
     if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){
-	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
+	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED", "-j PVEFW-IPS");
     }
 
     return $ruleset;