X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=78507fb48d8fc664b06b73dbe2e1572b807d2b41;hp=d18809a2ef8a417c276b87ccb5d27e60bd2894ef;hb=eba0fb64987d6f9193d11db6d0daad6e9503b10c;hpb=bb272dd311e39cd0d76a01d28c600363e95bc731

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index d18809a..78507fb 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -4,8 +4,12 @@ use warnings;
 use strict;
 use Data::Dumper;
 use Digest::SHA;
+use PVE::INotify;
+use PVE::Cluster;
+use PVE::ProcFSTools;
 use PVE::Tools;
 use PVE::QemuServer;
+use PVE::OpenVZ; # dependeny problem?!
 use File::Basename;
 use File::Path;
 use IO::File;
@@ -14,6 +18,8 @@ use PVE::Tools qw(run_command lock_file);
 
 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";
 
@@ -623,8 +629,11 @@ sub enable_bridge_firewall {
 
     return if $bridge_firewall_enabled; # only once
 
-    system("echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables");
-    system("echo 1 > /proc/sys/net/bridge/bridge-nf-call-ip6tables");
+    PVE::ProcFSTools::write_proc_entry("/proc/sys/net/bridge/bridge-nf-call-iptables", "1");
+    PVE::ProcFSTools::write_proc_entry("/proc/sys/net/bridge/bridge-nf-call-ip6tables", "1");
+
+    # make sure syncookies are enabled (which is default on newer 3.X kernels anyways)
+    PVE::ProcFSTools::write_proc_entry("/proc/sys/net/ipv4/tcp_syncookies", "1");
 
     $bridge_firewall_enabled = 1;
 }
@@ -654,6 +663,11 @@ sub iptables_get_chains {
 	return 1 if $name =~ m/^PVEFW-\S+$/;
 
 	return 1 if $name =~ m/^tap\d+i\d+-(:?IN|OUT)$/;
+
+	return 1 if $name =~ m/^veth\d+.\d+-(:?IN|OUT)$/; # fixme: dev name is configurable
+
+	return 1 if $name =~ m/^venet0-\d+-(:?IN|OUT)$/;
+
 	return 1 if $name =~ m/^vmbr\d+-(:?FW|IN|OUT)$/;
 	return 1 if $name =~ m/^GROUP-(:?[^\s\-]+)-(:?IN|OUT)$/;
 
@@ -716,26 +730,29 @@ sub iptables_rule_exist {
     return 1;
 }
 
-sub ruleset_generate_rule {
+sub ruleset_generate_cmdstr {
     my ($ruleset, $chain, $rule, $actions, $goto) = @_;
 
     return if $rule->{disable};
 
-    my $cmd = '';
+    my @cmd = ();
+
+    push @cmd, "-i $rule->{iface_in}" if $rule->{iface_in};
+    push @cmd, "-o $rule->{iface_out}" if $rule->{iface_out};
 
-    $cmd .= " -m iprange --src-range" if $rule->{nbsource} && $rule->{nbsource} > 1;
-    $cmd .= " -s $rule->{source}" if $rule->{source};
-    $cmd .= " -m iprange --dst-range" if $rule->{nbdest} && $rule->{nbdest} > 1;
-    $cmd .= " -d $rule->{dest}" if $rule->{dest};
+    push @cmd, "-m iprange --src-range" if $rule->{nbsource} && $rule->{nbsource} > 1;
+    push @cmd, "-s $rule->{source}" if $rule->{source};
+    push @cmd, "-m iprange --dst-range" if $rule->{nbdest} && $rule->{nbdest} > 1;
+    push @cmd, "-d $rule->{dest}" if $rule->{dest};
 
     if ($rule->{proto}) {
-	$cmd .= " -p $rule->{proto}";
+	push @cmd, "-p $rule->{proto}";
 
 	my $multiport = 0;
 	$multiport++ if $rule->{nbdport} && ($rule->{nbdport} > 1);
 	$multiport++ if $rule->{nbsport} && ($rule->{nbsport} > 1);
 
-	$cmd .= " --match multiport" if $multiport;
+	push @cmd, "--match multiport" if $multiport;
 
 	die "multiport: option '--sports' cannot be used together with '--dports'\n" 
 	    if ($multiport == 2) && ($rule->{dport} ne $rule->{sport});
@@ -744,25 +761,25 @@ sub ruleset_generate_rule {
 	    if ($rule->{proto} && $rule->{proto} eq 'icmp') {
 		# Note: we use dport to store --icmp-type
 		die "unknown icmp-type '$rule->{dport}'\n" if !defined($icmp_type_names->{$rule->{dport}});
-		$cmd .= " -m icmp --icmp-type $rule->{dport}";
+		push @cmd, "-m icmp --icmp-type $rule->{dport}";
 	    } else {
 		if ($rule->{nbdport} && $rule->{nbdport} > 1) {
 		    if ($multiport == 2) {
-			$cmd .= " --ports $rule->{dport}";
+			push @cmd,  "--ports $rule->{dport}";
 		    } else {
-			$cmd .= " --dports $rule->{dport}";
+			push @cmd, "--dports $rule->{dport}";
 		    }
 		} else {
-		    $cmd .= " --dport $rule->{dport}";
+		    push @cmd, "--dport $rule->{dport}";
 		}
 	    }
 	}
 
 	if ($rule->{sport}) {
 	    if ($rule->{nbsport} && $rule->{nbsport} > 1) {
-		$cmd .= " --sports $rule->{sport}" if $multiport != 2;
+		push @cmd, "--sports $rule->{sport}" if $multiport != 2;
 	    } else {
-		$cmd .= " --sport $rule->{sport}";
+		push @cmd, "--sport $rule->{sport}";
 	    }
 	}
     } elsif ($rule->{dport} || $rule->{sport}) {
@@ -770,15 +787,30 @@ sub ruleset_generate_rule {
 	warn "ignoring source port '$rule->{sport}' - no protocol specified\n" if $rule->{sport};
     }
 
-    $cmd .= " -m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
+    push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
 
     if (my $action = $rule->{action}) {
 	$action = $actions->{$action} if defined($actions->{$action}); 
 	$goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
-	$cmd .= $goto ? " -g $action" : " -j $action";
+	push @cmd, $goto ? "-g $action" : "-j $action";
     }
 
-    ruleset_addrule($ruleset, $chain, $cmd) if $cmd;
+    return scalar(@cmd) ? join(' ', @cmd) : undef;
+}
+
+sub ruleset_generate_rule {
+    my ($ruleset, $chain, $rule, $actions, $goto) = @_;
+
+    if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $rule, $actions, $goto)) {
+	ruleset_addrule($ruleset, $chain, $cmdstr);
+    }
+}
+sub ruleset_generate_rule_insert {
+    my ($ruleset, $chain, $rule, $actions, $goto) = @_;
+
+    if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $rule, $actions, $goto)) {
+	ruleset_insertrule($ruleset, $chain, $cmdstr);
+    }
 }
 
 sub ruleset_create_chain {
@@ -814,24 +846,18 @@ sub ruleset_insertrule {
 }
 
 sub generate_bridge_chains {
-    my ($ruleset, $bridge) = @_;
-
-    if (!ruleset_chain_exist($ruleset, "PVEFW-FORWARD")){
-	ruleset_create_chain($ruleset, "PVEFW-FORWARD");
-	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT");
-    }
+    my ($ruleset, $hostfw_conf, $bridge) = @_;
 
     if (!ruleset_chain_exist($ruleset, "$bridge-FW")) {
 	ruleset_create_chain($ruleset, "$bridge-FW");
 	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o $bridge -m physdev --physdev-is-bridged -j $bridge-FW");
 	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i $bridge -m physdev --physdev-is-bridged -j $bridge-FW");
-	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o $bridge -j DROP");  # disable interbridge routing
-	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i $bridge -j DROP"); # disable interbridge routing
     }
 
     if (!ruleset_chain_exist($ruleset, "$bridge-OUT")) {
 	ruleset_create_chain($ruleset, "$bridge-OUT");
 	ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-bridged --physdev-is-in -j $bridge-OUT");
+	ruleset_addrule($ruleset, "PVEFW-INPUT", "-i $bridge -m physdev --physdev-is-bridged --physdev-is-in -j $bridge-OUT");
     }
 
     if (!ruleset_chain_exist($ruleset, "$bridge-IN")) {
@@ -843,116 +869,176 @@ sub generate_bridge_chains {
     }
 }
 
-sub generate_tap_rules_direction {
-    my ($ruleset, $group_rules, $iface, $netid, $macaddr, $vmfw_conf, $bridge, $direction) = @_;
+sub ruleset_add_chain_policy {
+    my ($ruleset, $chain, $policy, $loglevel, $accept_action) = @_;
 
-    my $lc_direction = lc($direction);
-    my $rules = $vmfw_conf->{$lc_direction};
+    if ($policy eq 'ACCEPT') {
 
-    my $options = $vmfw_conf->{options};
-    my $loglevel = get_option_log_level($options, "log_level_${lc_direction}");
+	ruleset_generate_rule($ruleset, $chain, { action => 'ACCEPT' },
+			      { ACCEPT =>  $accept_action});
 
-    my $tapchain = "$iface-$direction";
+    } elsif ($policy eq 'DROP') {
+
+	ruleset_addrule($ruleset, $chain, "-j PVEFW-Drop");
+
+	ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"$chain-dropped: \" --log-level $loglevel")
+	    if defined($loglevel);
 
-    ruleset_create_chain($ruleset, $tapchain);
+	ruleset_addrule($ruleset, $chain, "-j DROP");
+    } elsif ($policy eq 'REJECT') {
+	ruleset_addrule($ruleset, $chain, "-j PVEFW-Reject");
+
+	ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"$chain-reject: \" --log-level $loglevel")
+	    if defined($loglevel);
+
+	ruleset_addrule($ruleset, $chain, "-g PVEFW-reject");
+    } else {
+	# should not happen
+	die "internal error: unknown policy '$policy'";
+    }
+}
+
+sub ruleset_create_vm_chain {
+    my ($ruleset, $chain, $options, $macaddr, $direction) = @_;
+
+    ruleset_create_chain($ruleset, $chain);
 
     if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
-	ruleset_addrule($ruleset, $tapchain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
+	ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
     }
 
     if (!(defined($options->{dhcp}) && $options->{dhcp} == 0)) {
-	ruleset_addrule($ruleset, $tapchain, "-p udp -m udp --dport 67:68 -j ACCEPT");
+	ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 67:68 -j ACCEPT");
     }
 
     if ($options->{tcpflags}) {
-	ruleset_addrule($ruleset, $tapchain, "-p tcp -j PVEFW-tcpflags");
+	ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags");
     }
 
-    ruleset_addrule($ruleset, $tapchain, "-m conntrack --ctstate INVALID -j DROP");
-    ruleset_addrule($ruleset, $tapchain, "-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");
 
-    if ($direction eq 'OUT' && defined($macaddr) && 
-	!(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
-	ruleset_addrule($ruleset, $tapchain, "-m mac ! --mac-source $macaddr -j DROP");
+    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, "-j MARK --set-mark 0"); # clear mark
     }
+}
 
-    if ($rules) {
-        foreach my $rule (@$rules) {
-	    next if $rule->{iface} && $rule->{iface} ne $netid;
-	    # we go to $bridge-IN if accept in out rules
-	    if($rule->{action}  =~ m/^(GROUP-(\S+))$/){
-		$rule->{action} .= "-$direction";
-		# generate empty group rule if don't exist
-		if(!ruleset_chain_exist($ruleset, $rule->{action})){
-		    generate_group_rules($ruleset, $group_rules, $2);
-		}
-		ruleset_generate_rule($ruleset, $tapchain, $rule);
-		ruleset_addrule($ruleset, $tapchain, "-m mark --mark 1 -j RETURN")
-		    if $direction eq 'OUT';
+sub ruleset_generate_vm_rules {
+    my ($ruleset, $rules, $groups_conf, $chain, $netid, $direction) = @_;
+
+    my $lc_direction = lc($direction);
+
+    foreach my $rule (@$rules) {
+	next if $rule->{iface} && $rule->{iface} ne $netid;
+	next if $rule->{disable};
+	if ($rule->{type} eq 'group') {
+	    my $group_chain = "GROUP-$rule->{action}-$direction"; 
+	    if(!ruleset_chain_exist($ruleset, $group_chain)){
+		generate_group_rules($ruleset, $groups_conf, $rule->{action});
+	    }
+	    ruleset_addrule($ruleset, $chain, "-j $group_chain");
+	    ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j RETURN")
+		if $direction eq 'OUT';
+	} else {
+	    next if $rule->{type} ne $lc_direction;
+	    if ($direction eq 'OUT') {
+		ruleset_generate_rule($ruleset, $chain, $rule, 
+				      { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
 	    } else {
-		if ($direction eq 'OUT') {
-		    ruleset_generate_rule($ruleset, $tapchain, $rule, 
-					  { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
-		} else {
-		    ruleset_generate_rule($ruleset, $tapchain, $rule, { REJECT => "PVEFW-reject" });
-		}
+		ruleset_generate_rule($ruleset, $chain, $rule, { REJECT => "PVEFW-reject" });
 	    }
 	}
     }
+}
+
+sub generate_venet_rules_direction {
+    my ($ruleset, $groups_conf, $vmfw_conf, $vmid, $ip, $direction) = @_;
+
+    parse_address_list($ip); # make sure we have a valid $ip list
+
+    my $lc_direction = lc($direction);
+
+    my $rules = $vmfw_conf->{rules};
+
+    my $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, undef, $direction);
+
+    ruleset_generate_vm_rules($ruleset, $rules, $groups_conf, $chain, 'venet', $direction);
 
     # implement policy
     my $policy;
 
     if ($direction eq 'OUT') {
-	$policy = $options->{'policy-out'} || 'ACCEPT'; # allow everything by default
+	$policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default
     } else {
-	$policy = $options->{'policy-in'} || 'DROP'; # allow everything by default
+	$policy = $options->{policy_in} || 'DROP'; # allow nothing by default
     }
 
-    if ($policy eq 'ACCEPT') {
-	if ($direction eq 'OUT') {
-	    ruleset_addrule($ruleset, $tapchain, "-g PVEFW-SET-ACCEPT-MARK");
-	} else {
-	    ruleset_addrule($ruleset, $tapchain, "-j ACCEPT");
-	}
-    } elsif ($policy eq 'DROP') {
+    my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : "ACCEPT";
+    ruleset_add_chain_policy($ruleset, $chain, $policy, $loglevel, $accept_action);
 
-	ruleset_addrule($ruleset, $tapchain, "-j PVEFW-Drop");
+    # plug into FORWARD chain
+    if ($direction eq 'OUT') {
+	ruleset_generate_rule_insert($ruleset, "PVEFW-FORWARD", {
+	    action => $chain,
+	    source => $ip,
+	    iface_in => 'venet0'});
+    } else {
+	ruleset_generate_rule($ruleset, "PVEFW-FORWARD", {
+	    action => $chain,
+	    dest => $ip,
+	    iface_out => 'venet0'});
+    }
+}
 
-	ruleset_addrule($ruleset, $tapchain, "-j LOG --log-prefix \"$tapchain-dropped: \" --log-level $loglevel")
-	    if defined($loglevel);
+sub generate_tap_rules_direction {
+    my ($ruleset, $groups_conf, $iface, $netid, $macaddr, $vmfw_conf, $bridge, $direction) = @_;
 
-	ruleset_addrule($ruleset, $tapchain, "-j DROP");
-    } elsif ($policy eq 'REJECT') {
-	ruleset_addrule($ruleset, $tapchain, "-j PVEFW-Reject");
+    my $lc_direction = lc($direction);
 
-	ruleset_addrule($ruleset, $tapchain, "-j LOG --log-prefix \"$tapchain-reject: \" --log-level $loglevel")
-	    if defined($loglevel);
+    my $rules = $vmfw_conf->{rules};
+
+    my $options = $vmfw_conf->{options};
+    my $loglevel = get_option_log_level($options, "log_level_${lc_direction}");
+
+    my $tapchain = "$iface-$direction";
+
+    ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction);
+
+    ruleset_generate_vm_rules($ruleset, $rules, $groups_conf, $tapchain, $netid, $direction);
 
-	ruleset_addrule($ruleset, $tapchain, "-g PVEFW-reject");
+    # implement policy
+    my $policy;
+
+    if ($direction eq 'OUT') {
+	$policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default
     } else {
-	# should not happen
-	die "internal error: unknown policy '$policy'";
+	$policy = $options->{policy_in} || 'DROP'; # allow nothing by default
     }
 
+    my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : "ACCEPT";
+    ruleset_add_chain_policy($ruleset, $tapchain, $policy, $loglevel, $accept_action);
+
     # plug the tap chain to bridge chain
     my $physdevdirection = $direction eq 'IN' ? "out" : "in";
     my $rule = "-m physdev --physdev-$physdevdirection $iface --physdev-is-bridged -j $tapchain";
     ruleset_insertrule($ruleset, "$bridge-$direction", $rule);
-
-    if ($direction eq 'OUT'){
-	# add tap->host rules
-	my $rule = "-m physdev --physdev-$physdevdirection $iface -j $tapchain";
-	ruleset_addrule($ruleset, "PVEFW-INPUT", $rule);
-    }
 }
 
-sub enablehostfw {
-    my ($ruleset, $rules, $group_rules) = @_;
+sub enable_host_firewall {
+    my ($ruleset, $hostfw_conf, $groups_conf) = @_;
 
     # fixme: allow security groups
 
-    my $options = $rules->{options};
+    my $options = $hostfw_conf->{options};
+    my $rules = $hostfw_conf->{rules};
 
     # host inbound firewall
     my $chain = "PVEFW-HOST-IN";
@@ -967,17 +1053,17 @@ sub enablehostfw {
     ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW -m multiport --dports 5404,5405 -j ACCEPT");
     ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT");  #corosync
 
-    if ($rules->{in}) {
-        foreach my $rule (@{$rules->{in}}) {
-            # we use RETURN because we need to check also tap rules
-            ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => 'RETURN', REJECT => "PVEFW-reject" });
-        }
-    }
+    # we use RETURN because we need to check also tap rules
+    my $accept_action = 'RETURN';
 
-    ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"kvmhost-IN dropped: \" --log-level $loglevel")
-	if defined($loglevel);
+    foreach my $rule (@$rules) {
+	next if $rule->{type} ne 'in';
+	ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+    }
 
-    ruleset_addrule($ruleset, $chain, "-j DROP");
+    # implement input policy
+    my $policy = $options->{policy_in} || 'DROP'; # allow nothing by default
+    ruleset_add_chain_policy($ruleset, $chain, $policy, $loglevel, $accept_action);
 
     # host outbound firewall
     $chain = "PVEFW-HOST-OUT";
@@ -992,37 +1078,36 @@ sub enablehostfw {
     ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW -m multiport --dports 5404,5405 -j ACCEPT");
     ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT"); #corosync
 
-    if ($rules->{out}) {
-        foreach my $rule (@{$rules->{out}}) {
-            # we use RETURN because we need to check also tap rules
-            ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => 'RETURN', REJECT => "PVEFW-reject" });
-        }
-    }
+    # we use RETURN because we may want to check other thigs later
+    $accept_action = 'RETURN';
 
-    ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"kvmhost-OUT dropped: \" --log-level $loglevel")
-	if defined($loglevel);
+    foreach my $rule (@$rules) {
+	next if $rule->{type} ne 'out';
+	ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+    }
 
-    ruleset_addrule($ruleset, $chain, "-j DROP");
+    # implement output policy
+    $policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default
+    ruleset_add_chain_policy($ruleset, $chain, $policy, $loglevel, $accept_action);
 
     ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-j PVEFW-HOST-OUT");
     ruleset_addrule($ruleset, "PVEFW-INPUT", "-j PVEFW-HOST-IN");
 }
 
 sub generate_group_rules {
-    my ($ruleset, $group_rules, $group) = @_;
+    my ($ruleset, $groups_conf, $group) = @_;
 
-    my $rules = $group_rules->{$group};
+    die "no such security group '$group'\n" if !$groups_conf->{$group};
 
-    die "no such security group '$group'\n" if !$rules;
+    my $rules = $groups_conf->{$group}->{rules};
 
     my $chain = "GROUP-${group}-IN";
 
     ruleset_create_chain($ruleset, $chain);
 
-    if ($rules->{in}) {
-        foreach my $rule (@{$rules->{in}}) {
- 	    ruleset_generate_rule($ruleset, $chain, $rule, { REJECT => "PVEFW-reject" });
-        }
+    foreach my $rule (@$rules) {
+	next if $rule->{type} ne 'in';
+	ruleset_generate_rule($ruleset, $chain, $rule, { REJECT => "PVEFW-reject" });
     }
 
     $chain = "GROUP-${group}-OUT";
@@ -1030,13 +1115,12 @@ sub generate_group_rules {
     ruleset_create_chain($ruleset, $chain);
     ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
 
-    if ($rules->{out}) {
-        foreach my $rule (@{$rules->{out}}) {
-            # we use PVEFW-SET-ACCEPT-MARK (Instead of ACCEPT) because we need to
-	    # check also other tap rules later
-            ruleset_generate_rule($ruleset, $chain, $rule, 
-				  { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" });
-        }
+    foreach my $rule (@$rules) {
+	next if $rule->{type} ne 'out';
+	# we use PVEFW-SET-ACCEPT-MARK (Instead of ACCEPT) because we need to
+	# check also other tap rules later
+	ruleset_generate_rule($ruleset, $chain, $rule, 
+			      { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" });
     }
 }
 
@@ -1052,7 +1136,7 @@ sub parse_fw_rule {
     my $macros = get_firewall_macros();
     my $protocols = get_etc_protocols();
 
-    my ($action, $iface, $source, $dest, $proto, $dport, $sport);
+    my ($type, $action, $iface, $source, $dest, $proto, $dport, $sport);
 
     # we can add single line comments to the end of the rule
     my $comment = $1 if $line =~ s/#\s*(.*?)\s*$//;
@@ -1061,40 +1145,47 @@ sub parse_fw_rule {
     my $disable = 1 if  $line =~ s/^\|//;
 
     my @data = split(/\s+/, $line);
-    my $expected_elements = $need_iface ? 7 : 6;
+    my $expected_elements = $need_iface ? 8 : 7;
 
     die "wrong number of rule elements\n" if scalar(@data) > $expected_elements;
 
     if ($need_iface) {
-	($action, $iface, $source, $dest, $proto, $dport, $sport) = @data
+	($type, $action, $iface, $source, $dest, $proto, $dport, $sport) = @data
     } else {
-	($action, $source, $dest, $proto, $dport, $sport) =  @data;
+	($type, $action, $source, $dest, $proto, $dport, $sport) =  @data;
     }
 
-    die "incomplete rule\n" if !$action;
+    die "incomplete rule\n" if ! ($type && $action);
 
     my $macro;
     my $macro_name;
 
-    if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
-	# OK
-    } elsif ($allow_groups && $action =~ m/^GROUP-(:?\S+)$/) {
-	# OK
-    } elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
-	($macro_name, $action) = ($1, $2);
-	my $lc_macro_name = lc($macro_name);
-	my $preferred_name = $pve_fw_preferred_macro_names->{$lc_macro_name};
-	$macro_name = $preferred_name if $preferred_name;
-	$macro = $macros->{$lc_macro_name};
-	die "unknown macro '$macro_name'\n" if !$macro;
+    $type = lc($type);
+
+    if ($type eq  'in' || $type eq 'out') {
+	if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
+	    # OK
+	} elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
+	    ($macro_name, $action) = ($1, $2);
+	    my $lc_macro_name = lc($macro_name);
+	    my $preferred_name = $pve_fw_preferred_macro_names->{$lc_macro_name};
+	    $macro_name = $preferred_name if $preferred_name;
+	    $macro = $macros->{$lc_macro_name};
+	    die "unknown macro '$macro_name'\n" if !$macro;
+	} else {
+	    die "unknown action '$action'\n";
+	}
+    } 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/^[A-Za-z0-9_\-]+$/;	
     } else {
-	die "unknown action '$action'\n";
+	die "unknown rule type '$type'\n";
     }
 
     if ($need_iface) {
 	$iface = undef if $iface && $iface eq '-';
-	die "unknown interface '$iface'\n"
-	    if defined($iface) && !$valid_netdev_names->{$iface};
     }
 
     $proto = undef if $proto && $proto eq '-';
@@ -1117,6 +1208,7 @@ sub parse_fw_rule {
     my $rules = [];
 
     my $param = {
+	type => $type,
 	disable => $disable,
 	comment => $comment,
 	action => $action,
@@ -1189,7 +1281,7 @@ sub parse_vmfw_option {
     } elsif ($line =~ m/^(log_level_in|log_level_out):\s*(($loglevels)\s*)?$/i) {
 	$opt = lc($1);
 	$value = $2 ? lc($3) : '';
-    } elsif ($line =~ m/^(policy-(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) {
+    } elsif ($line =~ m/^(policy_(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) {
 	$opt = lc($1);
 	$value = uc($3);
     } else {
@@ -1213,9 +1305,12 @@ sub parse_hostfw_option {
     } elsif ($line =~ m/^(log_level_in|log_level_out|tcp_flags_log_level|smurf_log_level):\s*(($loglevels)\s*)?$/i) {
 	$opt = lc($1);
 	$value = $2 ? lc($3) : '';
-    } elsif ($line =~ m/^(policy-(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) {
+    } elsif ($line =~ m/^(policy_(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) {
 	$opt = lc($1);
 	$value = uc($3);
+    } elsif ($line =~ m/^(nf_conntrack_max):\s*(\d+)\s*$/i) {
+	$opt = lc($1);
+	$value = int($2);
     } else {
 	chomp $line;
 	die "can't parse option '$line'\n"
@@ -1227,7 +1322,7 @@ sub parse_hostfw_option {
 sub parse_vm_fw_rules {
     my ($filename, $fh) = @_;
 
-    my $res = { in => [], out => [], options => {}};
+    my $res = { rules => [], options => {}};
 
     my $section;
 
@@ -1275,7 +1370,7 @@ sub parse_vm_fw_rules {
 sub parse_host_fw_rules {
     my ($filename, $fh) = @_;
 
-    my $res = { in => [], out => [], options => {}};
+    my $res = { rules => [], options => {}};
 
     my $section;
 
@@ -1300,7 +1395,6 @@ sub parse_host_fw_rules {
 
 	if ($section eq 'options') {
 	    eval {
-		print "PARSE:$line\n";
 		my ($opt, $value) = parse_hostfw_option($line);
 		$res->{options}->{$opt} = $value;
 	    };
@@ -1327,7 +1421,7 @@ sub parse_group_fw_rules {
     my $section;
     my $group;
 
-    my $res = { in => [], out => [] };
+    my $res = { rules => [] };
 
     while (defined(my $line = <$fh>)) {
 	next if $line =~ m/^#/;
@@ -1336,9 +1430,9 @@ sub parse_group_fw_rules {
 	my $linenr = $fh->input_line_number();
 	my $prefix = "$filename (line $linenr)";
 
-	if ($line =~ m/^\[(in|out):(\S+)\]\s*$/i) {
-	    $section = lc($1);
-	    $group = lc($2);
+	if ($line =~ m/^\[group\s+(\S+)\]\s*$/i) {
+	    $section = 'rules';
+	    $group = lc($1);
 	    next;
 	}
 	if (!$section || !$group) {
@@ -1374,35 +1468,48 @@ sub run_locked {
 sub read_local_vm_config {
 
     my $openvz = {};
-
     my $qemu = {};
 
-    my $list = PVE::QemuServer::config_list();
+    my $vmdata = { openvz => $openvz, qemu => $qemu };
 
-    foreach my $vmid (keys %$list) {
-	my $cfspath = PVE::QemuServer::cfs_config_path($vmid);
-	if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
-	    $qemu->{$vmid} = $conf;
+    my $vmlist = PVE::Cluster::get_vmlist();
+    return $vmdata if !$vmlist || !$vmlist->{ids};
+    my $ids = $vmlist->{ids};
+
+    foreach my $vmid (keys %$ids) {
+	next if !$vmid; # skip VE0
+	my $d = $ids->{$vmid};
+	next if !$d->{node} || $d->{node} ne $nodename;
+	next if !$d->{type};
+	if ($d->{type} eq 'openvz') {
+	    my $cfspath = PVE::OpenVZ::cfs_config_path($vmid);
+	    if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
+		$openvz->{$vmid} = $conf;
+	    }
+	} elsif ($d->{type} eq 'qemu') {
+	    my $cfspath = PVE::QemuServer::cfs_config_path($vmid);
+	    if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
+		$qemu->{$vmid} = $conf;
+	    }
 	}
     }
-
-    my $vmdata = { openvz => $openvz, qemu => $qemu };
-
+ 
     return $vmdata;
 };
 
-sub read_vm_firewall_rules {
+sub read_vm_firewall_configs {
     my ($vmdata) = @_;
-    my $rules = {};
+    my $vmfw_configs = {};
+
     foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) {
 	my $filename = "/etc/pve/firewall/$vmid.fw";
 	my $fh = IO::File->new($filename, O_RDONLY);
 	next if !$fh;
 
-	$rules->{$vmid} = parse_vm_fw_rules($filename, $fh);
+	$vmfw_configs->{$vmid} = parse_vm_fw_rules($filename, $fh);
     }
 
-    return $rules;
+    return $vmfw_configs;
 }
 
 sub get_option_log_level {
@@ -1430,7 +1537,7 @@ sub generate_std_chains {
     # same as shorewall smurflog.
     if (defined($loglevel)) {
 	$pve_std_chains-> {'PVEFW-smurflog'} = [
-	    "-j LOG --log-prefix \"smurfs-dropped\" --log-level $loglevel",
+	    "-j LOG --log-prefix \"smurfs-dropped: \" --log-level $loglevel",
 	    "-j DROP",
 	    ];
     } else {
@@ -1441,7 +1548,7 @@ sub generate_std_chains {
     $loglevel = get_option_log_level($options, 'tcp_flags_log_level');
     if (defined($loglevel)) {
 	$pve_std_chains-> {'PVEFW-logflags'} = [
-	    "-j LOG --log-prefix \"logflags-dropped:\" --log-level $loglevel --log-ip-options",
+	    "-j LOG --log-prefix \"logflags-dropped: \" --log-level $loglevel --log-ip-options",
 	    "-j DROP",
 	    ];
     } else {
@@ -1486,41 +1593,40 @@ sub read_pvefw_status {
 
 sub compile {
     my $vmdata = read_local_vm_config();
-    my $rules = read_vm_firewall_rules($vmdata);
+    my $vmfw_configs = read_vm_firewall_configs($vmdata);
 
-    my $group_rules = {};
+    my $groups_conf = {};
     my $filename = "/etc/pve/firewall/groups.fw";
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$group_rules = parse_group_fw_rules($filename, $fh);
+	$groups_conf = parse_group_fw_rules($filename, $fh);
     }
 
-    #print Dumper($rules);
-
     my $ruleset = {};
 
     ruleset_create_chain($ruleset, "PVEFW-INPUT");
     ruleset_create_chain($ruleset, "PVEFW-OUTPUT");
+
     ruleset_create_chain($ruleset, "PVEFW-FORWARD");
 
-    my $host_options = {};
-    my $host_rules;
+    my $hostfw_options = {};
+    my $hostfw_conf = {};
 
     $filename = "/etc/pve/local/host.fw";
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
-	$host_rules = parse_host_fw_rules($filename, $fh);
-	$host_options = $host_rules->{options};
+	$hostfw_conf = parse_host_fw_rules($filename, $fh);
+	$hostfw_options = $hostfw_conf->{options};
     }
 
-    generate_std_chains($ruleset, $host_options);
+    generate_std_chains($ruleset, $hostfw_options);
 
-    my $hotsfw_enable = $host_rules && !(defined($host_options->{enable}) && ($host_options->{enable} == 0));
+    my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0));
 
-    enablehostfw($ruleset, $host_rules, $group_rules) if $hotsfw_enable;
+    enable_host_firewall($ruleset, $hostfw_conf, $groups_conf) if $hostfw_enable;
 
     # generate firewall rules for QEMU VMs
     foreach my $vmid (keys %{$vmdata->{qemu}}) {
 	my $conf = $vmdata->{qemu}->{$vmid};
-	my $vmfw_conf = $rules->{$vmid};
+	my $vmfw_conf = $vmfw_configs->{$vmid};
 	next if !$vmfw_conf;
 	next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);
 
@@ -1535,21 +1641,61 @@ sub compile {
 
 	    $bridge .= "v$net->{tag}" if $net->{tag};
 
-
-	    generate_bridge_chains($ruleset, $bridge);
+	    generate_bridge_chains($ruleset, $hostfw_conf, $bridge);
 
 	    my $macaddr = $net->{macaddr};
-	    generate_tap_rules_direction($ruleset, $group_rules, $iface, $netid, $macaddr, $vmfw_conf, $bridge, 'IN');
-	    generate_tap_rules_direction($ruleset, $group_rules, $iface, $netid, $macaddr, $vmfw_conf, $bridge, 'OUT');
+	    generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, $vmfw_conf, $bridge, 'IN');
+	    generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, $vmfw_conf, $bridge, 'OUT');
 	}
     }
 
-    if ($hotsfw_enable) {
-	# allow traffic from lo (ourself)
-	ruleset_addrule($ruleset, "PVEFW-INPUT", "-i lo -j ACCEPT");
+    # generate firewall rules for OpenVZ containers
+    foreach my $vmid (keys %{$vmdata->{openvz}}) {
+	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);
+
+	if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
+	    my $ip = $conf->{ip_address}->{value};
+	    generate_venet_rules_direction($ruleset, $groups_conf, $vmfw_conf, $vmid, $ip, 'IN');
+	    generate_venet_rules_direction($ruleset, $groups_conf, $vmfw_conf, $vmid, $ip, 'OUT');
+	}
+
+	if ($conf->{netif} && $conf->{netif}->{value}) {
+	    my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value});
+	    foreach my $netid (keys %$netif) {
+		my $d = $netif->{$netid};
+		my $bridge = $d->{bridge};
+		if (!$bridge) {
+		    warn "no bridge device for CT $vmid iface '$netid'\n";
+		    next; # fixme?
+		}
+		my $macaddr = $d->{host_mac};
+		my $iface = $d->{host_ifname};
+		generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, $vmfw_conf, $bridge, 'IN');
+		generate_tap_rules_direction($ruleset, $groups_conf, $iface, $netid, $macaddr, $vmfw_conf, $bridge, 'OUT');
+	    }
+	}
     }
 
-    return $ruleset;
+    # fixme: this is an optimization? if so, we should also drop INVALID packages?
+    ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT");
+
+    # fixme: what log level should we use here?
+    my $loglevel = get_option_log_level($hostfw_options, "log_level_out");
+
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -j ACCEPT");
+    # disable interbridge routing
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j PVEFW-Drop"); 
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j PVEFW-Drop");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j LOG --log-prefix \"PVEFW-FORWARD-dropped \" --log-level $loglevel");  
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j LOG --log-prefix \"PVEFW-FORWARD-dropped \" --log-level $loglevel");  
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j DROP");  
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j DROP");
+
+    return wantarray ? ($ruleset, $hostfw_conf) : $ruleset;
 }
 
 sub get_ruleset_status {
@@ -1700,13 +1846,39 @@ sub apply_ruleset {
     die "unable to apply firewall changes\n" if $errors;
 }
 
+sub update_nf_conntrack_max {
+    my ($hostfw_conf) = @_;
+
+    my $max = 65536; # reasonable default
+
+    my $options = $hostfw_conf->{options} || {};
+
+    if (defined($options->{nf_conntrack_max}) && ($options->{nf_conntrack_max} > $max)) {
+	$max = $options->{nf_conntrack_max};
+	$max = int(($max+ 8191)/8192)*8192; # round to multiples of 8192
+    }
+
+    my $filename_nf_conntrack_max = "/proc/sys/net/nf_conntrack_max";
+    my $filename_hashsize = "/sys/module/nf_conntrack/parameters/hashsize";
+
+    my $current = int(PVE::Tools::file_read_firstline($filename_nf_conntrack_max) || $max);
+
+    if ($current != $max) {
+	my $hashsize = int($max/4);
+	PVE::ProcFSTools::write_proc_entry($filename_hashsize, $hashsize);
+	PVE::ProcFSTools::write_proc_entry($filename_nf_conntrack_max, $max);
+    }
+}
+
 sub update {
     my ($start, $verbose) = @_;
 
     my $code = sub {
 	my $status = read_pvefw_status();
 
-	my $ruleset = PVE::Firewall::compile();
+	my ($ruleset, $hostfw_conf) = PVE::Firewall::compile();
+
+	update_nf_conntrack_max($hostfw_conf);
 
 	if ($start || $status eq 'active') {