X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=PVE%2FFirewall.pm;h=1a38e000a3548e12e778d6f2c0b6e1a9053b0b80;hp=19314ad5da3cd1659fbceb4c620f731d1804996c;hb=961b4928a8857922ca7b49a23661030695b5ef52;hpb=06320eb0823c756df8dc836ecd4325839fb768e2

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 19314ad..1a38e00 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -3,6 +3,7 @@ package PVE::Firewall;
 use warnings;
 use strict;
 use Data::Dumper;
+use Digest::SHA;
 use PVE::Tools;
 use PVE::QemuServer;
 use File::Path;
@@ -14,23 +15,39 @@ use Data::Dumper;
 
 my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
 
-my $macros;
-my @ruleset = ();
+# todo: define more MACROS
+# inspired by: /usr/share/shorewall/macro.*
+my $pve_fw_macros = {
+    BitTorrent => [
+	{ action => 'PARAM', proto => 'tcp', dport => '6881:6889' },
+	{ action => 'PARAM', proto => 'udp', dport => '6881' } 
+    ],
+    HTTP => [
+	{ action => 'PARAM', proto => 'tcp', dport => '80' },
+    ],
+    HTTPS => [
+	{ action => 'PARAM', proto => 'tcp', dport => '443' },
+    ],
+};
+
+my $pve_fw_parsed_macros;
+my $pve_fw_preferred_macro_names = {};
 
-# todo: implement some kind of MACROS, like shorewall /usr/share/shorewall/macro.*
 sub get_firewall_macros {
 
-    return $macros if $macros;
+    return $pve_fw_parsed_macros if $pve_fw_parsed_macros;
+    
+    $pve_fw_parsed_macros = {};
 
-    #foreach my $path (</usr/share/shorewall/macro.*>) {
-    #  if ($path =~ m|/macro\.(\S+)$|) {
-    #    $macros->{$1} = 1;
-    #  }
-    #}
+    foreach my $k (keys %$pve_fw_macros) {
+	my $name = lc($k);
 
-    $macros = {}; # fixme: implemet me
+	my $macro =  $pve_fw_macros->{$k};
+	$pve_fw_preferred_macro_names->{$name} = $k;
+	$pve_fw_parsed_macros->{$name} = $macro;
+    }
 
-    return $macros;
+    return $pve_fw_parsed_macros;
 }
 
 my $etc_services;
@@ -137,6 +154,18 @@ sub parse_port_name_number_or_range {
     return ($nbports);
 }
 
+my $bridge_firewall_enabled = 0;
+
+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");
+
+    $bridge_firewall_enabled = 1;
+}
+
 my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
 
 sub iptables {
@@ -145,20 +174,61 @@ sub iptables {
     run_command("/sbin/iptables $cmd", outfunc => sub {}, errfunc => sub {});
 }
 
-sub iptables_restore {
+sub iptables_restore_cmdlist {
+    my ($cmdlist) = @_;
 
-    unshift (@ruleset, '*filter');
-    push (@ruleset, 'COMMIT');
+    run_command("/sbin/iptables-restore -n", input => $cmdlist);
+}
 
-    my $cmdlist = join("\n", @ruleset);
+sub iptables_get_chains {
 
-    run_command("echo '$cmdlist' | /sbin/iptables-restore -n", outfunc => sub {});
-}
+    my $res = {};
+
+    # check what chains we want to track
+    my $is_pvefw_chain = sub {
+	my $name = shift;
+
+	return 1 if $name =~ m/^PVEFW-\S+$/;
+
+	return 1 if $name =~ m/^tap\d+i\d+-(:?IN|OUT)$/;
+	return 1 if $name =~ m/^vmbr\d+-(:?IN|OUT)$/;
+	return 1 if $name =~ m/^GROUP-(:?[^\s\-]+)-(:?IN|OUT)$/;
 
-sub iptables_addrule {
-   my ($rule) = @_;
+	return undef;
+    };
+
+    my $table = '';
+
+    my $parser = sub {
+	my $line = shift;
 
-   push (@ruleset, $rule);
+	return if $line =~ m/^#/;
+	return if $line =~ m/^\s*$/;
+
+	if ($line =~ m/^\*(\S+)$/) {
+	    $table = $1;
+	    return;
+	}
+
+	return if $table ne 'filter';
+
+	if ($line =~ m/^:(\S+)\s/) {
+	    my $chain = $1;
+	    return if !&$is_pvefw_chain($chain);
+	    $res->{$chain} = "unknown";
+	} elsif ($line =~ m/^-A\s+(\S+)\s.*--comment\s+\"PVESIG:(\S+)\"/) {
+	    my ($chain, $sig) = ($1, $2);
+	    return if !&$is_pvefw_chain($chain);
+	    $res->{$chain} = $sig;
+	} else {
+	    # simply ignore the rest
+	    return;
+	}
+    };
+
+    run_command("/sbin/iptables-save", outfunc => $parser);
+
+    return $res;
 }
 
 sub iptables_chain_exist {
@@ -183,10 +253,10 @@ sub iptables_rule_exist {
     return 1;
 }
 
-sub iptables_generate_rule {
-    my ($chain, $rule) = @_;
+sub ruleset_generate_rule {
+    my ($ruleset, $chain, $rule, $goto) = @_;
 
-    my $cmd = "-A $chain";
+    my $cmd = '';
 
     $cmd .= " -m iprange --src-range" if $rule->{nbsource} && $rule->{nbsource} > 1;
     $cmd .= " -s $rule->{source}" if $rule->{source};
@@ -197,768 +267,431 @@ sub iptables_generate_rule {
     $cmd .= " --dport $rule->{dport}" if $rule->{dport};
     $cmd .= "  --match multiport" if $rule->{nbsport} && $rule->{nbsport} > 1;
     $cmd .= " --sport $rule->{sport}" if $rule->{sport};
-    $cmd .= " -j $rule->{action}" if $rule->{action};
 
-    iptables_addrule($cmd);
+    if (my $action = $rule->{action}) {
+	$goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
+	$cmd .= $goto ? " -g $action" : " -j $action";
+    };
 
+    ruleset_addrule($ruleset, $chain, $cmd) if $cmd;
 }
 
-sub generate_bridge_rules {
-    my ($bridge) = @_;
+sub ruleset_create_chain {
+    my ($ruleset, $chain) = @_;
 
-    if(!iptables_chain_exist("BRIDGEFW-OUT")){
-	iptables_addrule(":BRIDGEFW-OUT - [0:0]");
-    }
+    die "Invalid chain name '$chain' (28 char max)\n" if length($chain) > 28;
 
-    if(!iptables_chain_exist("BRIDGEFW-IN")){
-	iptables_addrule(":BRIDGEFW-IN - [0:0]");
-    }
-
-    if(!iptables_chain_exist("proxmoxfw-FORWARD")){
-	iptables_addrule(":proxmoxfw-FORWARD - [0:0]");
-	iptables_addrule("-I FORWARD -j proxmoxfw-FORWARD");
-	iptables_addrule("-A proxmoxfw-FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT");
-	iptables_addrule("-A proxmoxfw-FORWARD -m physdev --physdev-is-in --physdev-is-bridged -j BRIDGEFW-OUT");
-	iptables_addrule("-A proxmoxfw-FORWARD -m physdev --physdev-is-out --physdev-is-bridged -j BRIDGEFW-IN");
+    die "chain '$chain' already exists\n" if $ruleset->{$chain};
 
-    }
-
-    generate_proxmoxfwinput();
+    $ruleset->{$chain} = [];
+}
 
-    if(!iptables_chain_exist("$bridge-IN")){
-	iptables_addrule(":$bridge-IN - [0:0]");
-	iptables_addrule("-A proxmoxfw-FORWARD -i $bridge -j DROP");  #disable interbridge routing
-	iptables_addrule("-A BRIDGEFW-IN -j $bridge-IN");
-	iptables_addrule("-A $bridge-IN -j ACCEPT");
+sub ruleset_chain_exist {
+    my ($ruleset, $chain) = @_;
 
-    }
+    return $ruleset->{$chain} ? 1 : undef;
+}
 
-    if(!iptables_chain_exist("$bridge-OUT")){
-	iptables_addrule(":$bridge-OUT - [0:0]");
-	iptables_addrule("-A proxmoxfw-FORWARD -o $bridge -j DROP"); # disable interbridge routing
-	iptables_addrule("-A BRIDGEFW-OUT -j $bridge-OUT");
+sub ruleset_addrule {
+   my ($ruleset, $chain, $rule) = @_;
 
-    }
+   die "no such chain '$chain'\n" if !$ruleset->{$chain};
 
+   push @{$ruleset->{$chain}}, "-A $chain $rule";
 }
 
+sub ruleset_insertrule {
+   my ($ruleset, $chain, $rule) = @_;
 
-sub generate_tap_rules_direction {
-    my ($iface, $netid, $rules, $bridge, $direction) = @_;
+   die "no such chain '$chain'\n" if !$ruleset->{$chain};
 
-    my $tapchain = "$iface-$direction";
-
-    iptables_addrule(":$tapchain - [0:0]");
+   unshift @{$ruleset->{$chain}}, "-A $chain $rule";
+}
 
-    iptables_addrule("-A $tapchain -m state --state INVALID -j DROP");
-    iptables_addrule("-A $tapchain -m state --state RELATED,ESTABLISHED -j ACCEPT");
+sub generate_bridge_chains {
+    my ($ruleset, $bridge) = @_;
 
-    if (scalar(@$rules)) {
-        foreach my $rule (@$rules) {
-	    next if $rule->{iface} && $rule->{iface} ne $netid;
-	    if($rule->{action}  =~ m/^(GROUP-(\S+))$/){
-		    $rule->{action} .= "-$direction";
-		    #generate empty group rule if don't exist
-		    if(!iptables_chain_exist($rule->{action})){
-			generate_group_rules($2);
-		    }
-	    }
-	    #we go to vmbr-IN if accept in out rules
-	    $rule->{action} = "$bridge-IN" if $rule->{action} eq 'ACCEPT' && $direction eq 'OUT';
-	    iptables_generate_rule($tapchain, $rule);
-        }
+    if (!ruleset_chain_exist($ruleset, "PVEFW-BRIDGE-IN")){
+	ruleset_create_chain($ruleset, "PVEFW-BRIDGE-IN");
     }
 
-    iptables_addrule("-A $tapchain -j LOG --log-prefix \"$tapchain-dropped: \" --log-level 4");
-    iptables_addrule("-A $tapchain -j DROP");
-
-    #plug the tap chain to bridge chain
-    my $physdevdirection = $direction eq 'IN' ? "out":"in";
-    my $rule = "$bridge-$direction -m physdev --physdev-$physdevdirection $iface --physdev-is-bridged -j $tapchain";
-
-    if(!iptables_rule_exist($rule)){
-	iptables_addrule("-I $rule");
+    if (!ruleset_chain_exist($ruleset, "PVEFW-BRIDGE-OUT")){
+	ruleset_create_chain($ruleset, "PVEFW-BRIDGE-OUT");
     }
 
-    if($direction eq 'OUT'){
-	#add tap->host rules
-	my $rule = "proxmoxfw-INPUT -m physdev --physdev-$physdevdirection $iface -j $tapchain";
+    if (!ruleset_chain_exist($ruleset, "PVEFW-FORWARD")){
+	ruleset_create_chain($ruleset, "PVEFW-FORWARD");
 
-	if(!iptables_rule_exist($rule)){
-	    iptables_addrule("-A $rule");
-	}
+	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m state --state RELATED,ESTABLISHED -j ACCEPT");
+	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-in --physdev-is-bridged -j PVEFW-BRIDGE-OUT");
+	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-out --physdev-is-bridged -j PVEFW-BRIDGE-IN");
     }
-}
-
-sub generate_tap_rules {
-    my ($net, $netid, $vmid) = @_;
-
-    my $filename = "/etc/pve/firewall/$vmid.fw";
-    my $fh = IO::File->new($filename, O_RDONLY);
-    return if !$fh;
-
-    #generate bridge rules
-    my $bridge = $net->{bridge};
-    my $tag = $net->{tag};
-    $bridge .= "v$tag" if $tag;
-   
-    #generate tap chain
-    my $rules = parse_fw_rules($filename, $fh);
-
-    my $inrules = $rules->{in};
-    my $outrules = $rules->{out};
-
-    my $iface = "tap".$vmid."i".$1 if $netid =~ m/net(\d+)/;
 
-    generate_bridge_rules($bridge);
-    generate_tap_rules_direction($iface, $netid, $inrules, $bridge, 'IN');
-    generate_tap_rules_direction($iface, $netid, $outrules, $bridge, 'OUT');
-    iptables_restore();
-}
-
-sub flush_tap_rules {
-    my ($net, $netid, $vmid) = @_;
-
-    my $bridge = $net->{bridge};
-    my $iface = "tap".$vmid."i".$1 if $netid =~ m/net(\d+)/;
+    if (!ruleset_chain_exist($ruleset, "$bridge-IN")) {
+	ruleset_create_chain($ruleset, "$bridge-IN");
+	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i $bridge -j DROP");  # disable interbridge routing
+	ruleset_addrule($ruleset, "PVEFW-BRIDGE-IN", "-j $bridge-IN");
+	ruleset_addrule($ruleset, "$bridge-IN", "-j ACCEPT");
+    }
 
-    flush_tap_rules_direction($iface, $bridge, 'IN');
-    flush_tap_rules_direction($iface, $bridge, 'OUT');
-    iptables_restore();
+    if (!ruleset_chain_exist($ruleset, "$bridge-OUT")) {
+	ruleset_create_chain($ruleset, "$bridge-OUT");
+	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o $bridge -j DROP"); # disable interbridge routing
+	ruleset_addrule($ruleset, "PVEFW-BRIDGE-OUT", "-j $bridge-OUT");
+    }
 }
 
-sub flush_tap_rules_direction {
-    my ($iface, $bridge, $direction) = @_;
+sub generate_tap_rules_direction {
+    my ($ruleset, $group_rules, $iface, $netid, $macaddr, $rules, $bridge, $direction) = @_;
 
     my $tapchain = "$iface-$direction";
 
-    if(iptables_chain_exist($tapchain)){
-	iptables_addrule("-F $tapchain");
-
-	my $physdevdirection = $direction eq 'IN' ? "out":"in";
-	my $rule = "$bridge-$direction -m physdev --physdev-$physdevdirection $iface --physdev-is-bridged -j $tapchain";
-	if(iptables_rule_exist($rule)){
-	    iptables_addrule("-D $rule");
-	}
+    ruleset_create_chain($ruleset, $tapchain);
 
-	if($direction eq 'OUT'){
-	    my $rule = "proxmoxfw-INPUT -m physdev --physdev-$physdevdirection $iface -j $tapchain";
-	    if(iptables_rule_exist($rule)){
-		iptables_addrule("-D $rule");
-	    }
-	}
+    ruleset_addrule($ruleset, $tapchain, "-m state --state INVALID -j DROP");
+    ruleset_addrule($ruleset, $tapchain, "-m state --state RELATED,ESTABLISHED -j ACCEPT");
 
-	iptables_addrule("-X $tapchain");
-    }
-}
-
-sub enablehostfw {
-
-    generate_proxmoxfwinput();
-    generate_proxmoxfwoutput();
-
-    my $filename = "/etc/pve/local/host.fw";
-    my $fh = IO::File->new($filename, O_RDONLY);
-    return if !$fh;
-
-    my $rules = parse_fw_rules($filename, $fh);
-    my $inrules = $rules->{in};
-    my $outrules = $rules->{out};
-
-    #host inbound firewall
-    iptables_addrule(":host-IN - [0:0]");
-    iptables_addrule("-A host-IN -m state --state INVALID -j DROP");
-    iptables_addrule("-A host-IN -m state --state RELATED,ESTABLISHED -j ACCEPT");
-    iptables_addrule("-A host-IN -i lo -j ACCEPT");
-    iptables_addrule("-A host-IN -m addrtype --dst-type MULTICAST -j ACCEPT");
-    iptables_addrule("-A host-IN -p udp -m state --state NEW -m multiport --dports 5404,5405 -j ACCEPT");
-    iptables_addrule("-A host-IN -p udp -m udp --dport 9000 -j ACCEPT"); #corosync
-
-    if (scalar(@$inrules)) {
-        foreach my $rule (@$inrules) {
-            #we use RETURN because we need to check also tap rules
-            $rule->{action} = 'RETURN' if $rule->{action} eq 'ACCEPT';
-            iptables_generate_rule('host-IN', $rule);
-        }
+    if ($direction eq 'OUT' && defined($macaddr)) {
+	ruleset_addrule($ruleset, $tapchain, "-m mac ! --mac-source $macaddr -j DROP");
     }
 
-    iptables_addrule("-A host-IN -j LOG --log-prefix \"kvmhost-IN dropped: \" --log-level 4");
-    iptables_addrule("-A host-IN -j DROP");
-
-    #host outbound firewall
-    iptables_addrule(":host-OUT - [0:0]");
-    iptables_addrule("-A host-OUT -m state --state INVALID -j DROP");
-    iptables_addrule("-A host-OUT -m state --state RELATED,ESTABLISHED -j ACCEPT");
-    iptables_addrule("-A host-OUT -o lo -j ACCEPT");
-    iptables_addrule("-A host-OUT -m addrtype --dst-type MULTICAST -j ACCEPT");
-    iptables_addrule("-A host-OUT -p udp -m state --state NEW -m multiport --dports 5404,5405 -j ACCEPT");
-    iptables_addrule("-A host-OUT -p udp -m udp --dport 9000 -j ACCEPT"); #corosync
-
-    if (scalar(@$outrules)) {
-        foreach my $rule (@$outrules) {
-            #we use RETURN because we need to check also tap rules
-            $rule->{action} = 'RETURN' if $rule->{action} eq 'ACCEPT';
-            iptables_generate_rule('host-OUT', $rule);
-        }
+    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 -g $bridge-IN")
+		    if $direction eq 'OUT';
+	    } else {
+		$rule->{action} = "$bridge-IN" if $rule->{action} eq 'ACCEPT' && $direction eq 'OUT';
+		ruleset_generate_rule($ruleset, $tapchain, $rule);
+	    }
+	}
     }
 
-    iptables_addrule("-A host-OUT -j LOG --log-prefix \"kvmhost-OUT dropped: \" --log-level 4");
-    iptables_addrule("-A host-OUT -j DROP");
+    ruleset_addrule($ruleset, $tapchain, "-j LOG --log-prefix \"$tapchain-dropped: \" --log-level 4");
+    ruleset_addrule($ruleset, $tapchain, "-j DROP");
 
-    
-    my $rule = "proxmoxfw-INPUT -j host-IN";
-    if(!iptables_rule_exist($rule)){
-	iptables_addrule("-I $rule");
-    }
+    # 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);
 
-    $rule = "proxmoxfw-OUTPUT -j host-OUT";
-    if(!iptables_rule_exist($rule)){
-	iptables_addrule("-I $rule");
+    if ($direction eq 'OUT'){
+	# add tap->host rules
+	my $rule = "-m physdev --physdev-$physdevdirection $iface -j $tapchain";
+	ruleset_addrule($ruleset, "PVEFW-INPUT", $rule);
     }
-
-    iptables_restore();
-
-
 }
 
-sub disablehostfw {
-
-    my $chain = "host-IN";
-
-    my $rule = "proxmoxfw-INPUT -j $chain";
-    if(iptables_rule_exist($rule)){
-	iptables_addrule("-D $rule");
-    }
+sub enablehostfw {
+    my ($ruleset, $rules, $group_rules) = @_;
 
-    if(iptables_chain_exist($chain)){
-	iptables_addrule("-F $chain");
-	iptables_addrule("-X $chain");
-    }
+    # fixme: allow security groups
 
-    $chain = "host-OUT";
+    # host inbound firewall
+    my $chain = "PVEFW-HOST-IN";
+    ruleset_create_chain($ruleset, $chain);
 
-    $rule = "proxmoxfw-OUTPUT -j $chain";
-    if(iptables_rule_exist($rule)){
-	iptables_addrule("-D $rule");
-    }
+    ruleset_addrule($ruleset, $chain, "-m state --state INVALID -j DROP");
+    ruleset_addrule($ruleset, $chain, "-m state --state RELATED,ESTABLISHED -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-i lo -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-p udp -m state --state NEW -m multiport --dports 5404,5405 -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT");  #corosync
 
-    if(iptables_chain_exist($chain)){
-	iptables_addrule("-F $chain");
-	iptables_addrule("-X $chain");
+    if ($rules->{in}) {
+        foreach my $rule (@{$rules->{in}}) {
+            # we use RETURN because we need to check also tap rules
+            $rule->{action} = 'RETURN' if $rule->{action} eq 'ACCEPT';
+            ruleset_generate_rule($ruleset, $chain, $rule);
+        }
     }
 
-    iptables_restore();   
-}
-
-sub generate_proxmoxfwinput {
+    ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"kvmhost-IN dropped: \" --log-level 4");
+    ruleset_addrule($ruleset, $chain, "-j DROP");
 
-    if(!iptables_chain_exist("proxmoxfw-INPUT")){
-        iptables_addrule(":proxmoxfw-INPUT - [0:0]");
-        iptables_addrule("-I INPUT -j proxmoxfw-INPUT");
-        iptables_addrule("-A INPUT -j ACCEPT");
-    }
-}
+    # host outbound firewall
+    $chain = "PVEFW-HOST-OUT";
+    ruleset_create_chain($ruleset, $chain);
 
-sub generate_proxmoxfwoutput {
+    ruleset_addrule($ruleset, $chain, "-m state --state INVALID -j DROP");
+    ruleset_addrule($ruleset, $chain, "-m state --state RELATED,ESTABLISHED -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-o lo -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-p udp -m state --state NEW -m multiport --dports 5404,5405 -j ACCEPT");
+    ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT"); #corosync
 
-    if(!iptables_chain_exist("proxmoxfw-OUTPUT")){
-        iptables_addrule(":proxmoxfw-OUTPUT - [0:0]");
-        iptables_addrule("-I OUTPUT -j proxmoxfw-OUTPUT");
-        iptables_addrule("-A OUTPUT -j ACCEPT");
+    if ($rules->{out}) {
+        foreach my $rule (@{$rules->{out}}) {
+            # we use RETURN because we need to check also tap rules
+            $rule->{action} = 'RETURN' if $rule->{action} eq 'ACCEPT';
+            ruleset_generate_rule($ruleset, $chain, $rule);
+        }
     }
 
-}
-
-sub enable_group_rules {
-    my ($group) = @_;
+    ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"kvmhost-OUT dropped: \" --log-level 4");
+    ruleset_addrule($ruleset, $chain, "-j DROP");
     
-    generate_group_rules($group);
-    iptables_restore();
+    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-j PVEFW-HOST-OUT");
+    ruleset_addrule($ruleset, "PVEFW-INPUT", "-j PVEFW-HOST-IN");
 }
 
 sub generate_group_rules {
-    my ($group) = @_;
+    my ($ruleset, $group_rules, $group) = @_;
 
-    my $filename = "/etc/pve/firewall/groups.fw";
-    my $fh = IO::File->new($filename, O_RDONLY);
-    return if !$fh;
-
-    my $rules = parse_fw_rules($filename, $fh, $group);
-    my $inrules = $rules->{in};
-    my $outrules = $rules->{out};
+    my $rules = $group_rules->{$group};
 
-    my $chain = "GROUP-".$group."-IN";
+    die "no such security group '$group'\n" if !$rules;
+    
+    my $chain = "GROUP-${group}-IN";
 
-    iptables_addrule(":$chain - [0:0]");
+    ruleset_create_chain($ruleset, $chain);
 
-    if (scalar(@$inrules)) {
-        foreach my $rule (@$inrules) {
-            iptables_generate_rule($chain, $rule);
+    if ($rules->{in}) {
+        foreach my $rule (@{$rules->{in}}) {
+ 	    ruleset_generate_rule($ruleset, $chain, $rule);
         }
     }
 
-    $chain = "GROUP-".$group."-OUT";
+    $chain = "GROUP-${group}-OUT";
 
-    iptables_addrule(":$chain - [0:0]");
-
-    if(!iptables_chain_exist("BRIDGEFW-OUT")){
-	iptables_addrule(":BRIDGEFW-OUT - [0:0]");
-    }
+    ruleset_create_chain($ruleset, $chain);
+    ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
 
-    if(!iptables_chain_exist("BRIDGEFW-IN")){
-	iptables_addrule(":BRIDGEFW-IN - [0:0]");
-    }
-
-    if (scalar(@$outrules)) {
-        foreach my $rule (@$outrules) {
-            #we go the BRIDGEFW-IN because we need to check also other tap rules 
-            #(and group rules can be set on any bridge, so we can't go to VMBRXX-IN)
-            $rule->{action} = 'BRIDGEFW-IN' if $rule->{action} eq 'ACCEPT';
-            iptables_generate_rule($chain, $rule);
+    if ($rules->{out}) {
+        foreach my $rule (@{$rules->{out}}) {
+            # we go the PVEFW-SET-ACCEPT-MARK Instead of ACCEPT) because we need to 
+	    # check also other tap rules (and group rules can be set on any bridge, 
+	    # so we can't go to VMBRXX-IN)
+            $rule->{action} = 'PVEFW-SET-ACCEPT-MARK' if $rule->{action} eq 'ACCEPT';
+            ruleset_generate_rule($ruleset, $chain, $rule);
         }
     }
-
 }
 
-sub disable_group_rules {
-    my ($group) = @_;
-
-    my $chain = "GROUP-".$group."-IN";
-
-    if(iptables_chain_exist($chain)){
-	iptables_addrule("-F $chain");
-	iptables_addrule("-X $chain");
-    }
-
-    $chain = "GROUP-".$group."-OUT";
-
-    if(iptables_chain_exist($chain)){
-	iptables_addrule("-F $chain");
-	iptables_addrule("-X $chain");
-    }
-
-    #iptables_restore will die if security group is linked in a tap chain
-    #maybe can we improve that, parsing each vm config, or parsing iptables -S
-    #to see if the security group is linked or not
-    iptables_restore();
+my $MAX_NETS = 32;
+my $valid_netdev_names = {};
+for (my $i = 0; $i < $MAX_NETS; $i++)  {
+    $valid_netdev_names->{"net$i"} = 1;
 }
 
+sub parse_fw_rule {
+    my ($line, $need_iface, $allow_groups) = @_;
 
-my $generate_input_rule = sub {
-    my ($zoneinfo, $rule, $net, $netid) = @_;
-
-    my $zone = $net->{zone} || die "internal error";
-    my $zid = $zoneinfo->{$zone}->{zoneref} || die "internal error";
-    my $tap = $net->{tap} || die "internal error";
-
-    my $dest = "$zid:$tap";
-
-    if ($rule->{dest}) {
-	$dest .= ":$rule->{dest}";
-    }
-
-    my $action = $rule->{service} ? 
-	"$rule->{service}($rule->{action})" : $rule->{action};
-
-    my $sources = [];
-
-    if (!$rule->{source}) {
-	push @$sources, 'all'; 
-    } elsif ($zoneinfo->{$zone}->{type} eq 'bport') {
-	my $bridge_zone = $zoneinfo->{$zone}->{bridge_zone} || die "internal error";
-	my $zoneref = $zoneinfo->{$bridge_zone}->{zoneref} || die "internal error";
-
-	# using 'all' does not work, so we create one rule for
-	# each related zone on the same bridge
-	push @$sources, "${zoneref}:$rule->{source}";
-	foreach my $z (keys %$zoneinfo) {
-	    next if $z eq $zone;
-	    next if !$zoneinfo->{$z}->{bridge_zone};
-	    next if $zoneinfo->{$z}->{bridge_zone} ne $bridge_zone;
-	    $zoneref = $zoneinfo->{$z}->{zoneref} || die "internal error";
-	    push @$sources, "${zoneref}:$rule->{source}";
-	}
-    } else {
-	push @$sources, "all:$rule->{source}";
-    }
-
-    my $out = '';
-
-    foreach my $source (@$sources) {
-	$out .= sprintf($rule_format, $action, $source, $dest, $rule->{proto} || '-', 
-			$rule->{dport} || '-', $rule->{sport} || '-');
-    }
+    my $macros = get_firewall_macros();
+    my $protocols = get_etc_protocols();
 
-    return $out;
-};
+    my ($action, $iface, $source, $dest, $proto, $dport, $sport);
 
-my $generate_output_rule = sub {
-    my ($zoneinfo, $rule, $net, $netid) = @_;
+    $line =~ s/#.*$//;
 
-    my $zone = $net->{zone} || die "internal error";
-    my $zid = $zoneinfo->{$zone}->{zoneref} || die "internal error";
-    my $tap = $net->{tap} || die "internal error";
+    my @data = split(/\s+/, $line);
+    my $expected_elements = $need_iface ? 7 : 6;
 
-    my $action = $rule->{service} ? 
-	"$rule->{service}($rule->{action})" : $rule->{action};
-    
-    my $dest;
+    die "wrong number of rule elements\n" if scalar(@data) > $expected_elements;
 
-    if (!$rule->{dest}) {
-	$dest = 'all';
+    if ($need_iface) {
+	($action, $iface, $source, $dest, $proto, $dport, $sport) = @data
     } else {
-	$dest = "all:$rule->{dest}";
+	($action, $source, $dest, $proto, $dport, $sport) =  @data;
     }
 
-    return sprintf($rule_format, $action, "$zid:$tap", $dest, 
-		   $rule->{proto} || '-', $rule->{dport} || '-', $rule->{sport} || '-');
-};
+    die "incomplete rule\n" if !$action;
 
-# we need complete VM configuration of all VMs (openvz/qemu)
-# in vmdata
+    my $macro;
+    my $macro_name;
 
-my $compile_shorewall = sub {
-    my ($targetdir, $vmdata, $rules) = @_;
-
-    # remove existing data ?
-    foreach my $file (qw(params zones rules interfaces  maclist  policy)) {
-	unlink "$targetdir/$file";
+    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;
+    } else {
+	die "unknown action '$action'\n";
     }
 
-    my $netinfo;
-
-    my $zoneinfo = {
-	fw => { type => 'firewall' },
-    };
-
-    my $maclist = {};
-
-    my $register_bridge;
-
-    $register_bridge = sub {
-	my ($bridge, $vlan) = @_;
-
-	my $zone =  $bridge;
-
-	return $zone if $zoneinfo->{$zone};
-
-	my $ext_zone = "${bridge}_ext";
-
-	$zoneinfo->{$zone} = {
-	    type => 'bridge',
-	    bridge => $bridge,
-	    bridge_ext_zone => $ext_zone,
-	};
-
-	# physical input devices
-	my $dir = "/sys/class/net/$bridge/brif";
-	my $physical = {};
-	PVE::Tools::dir_glob_foreach($dir, '((eth|bond).+)', sub {
-	    my ($slave) = @_;
-	    $physical->{$slave} = 1;
-	});
-
-	$zoneinfo->{$ext_zone} = {
-	    type => 'bport',
-	    bridge_zone => $zone,
-	    ifaces => $physical,
-	};
-
-	return &$register_bridge("${bridge}v${vlan}") if defined($vlan);
-	
-	return $zone;
-    };
-
-    my $register_bridge_port = sub {
-	my ($bridge, $vlan, $vmzone, $tap) = @_;
-
-	my $bridge_zone = &$register_bridge($bridge, $vlan);
-	my $zone = $bridge_zone . '_' . $vmzone;
-
-	if (!$zoneinfo->{$zone}) {
-	    $zoneinfo->{$zone} = {
-		type => 'bport',
-		bridge_zone => $bridge_zone,
-		ifaces => {},
-	    };
-	}
-
-	$zoneinfo->{$zone}->{ifaces}->{$tap} = 1;
-	
-	return $zone;
+    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 '-';
+    die "unknown protokol '$proto'\n" if $proto && 
+	!(defined($protocols->{byname}->{$proto}) ||
+	  defined($protocols->{byid}->{$proto}));
+
+    $source = undef if $source && $source eq '-';
+    $dest = undef if $dest && $dest eq '-';
+
+    $dport = undef if $dport && $dport eq '-';
+    $sport = undef if $sport && $sport eq '-';
+
+    my $nbsource = undef;
+    my $nbdest = undef;
+
+    $nbsource = parse_address_list($source) if $source;
+    $nbdest = parse_address_list($dest) if $dest;
+ 
+    my $rules = [];
+
+    my $param = {
+	action => $action,
+	iface => $iface,
+	source => $source,
+	dest => $dest,
+	nbsource => $nbsource,
+	nbdest => $nbdest,
+	proto => $proto,
+	dport => $dport,
+	sport => $sport,
     };
 
-    foreach my $vmid (keys %{$vmdata->{qemu}}) {
-	$netinfo->{$vmid} = {};
-	my $conf = $vmdata->{qemu}->{$vmid};
-	foreach my $opt (keys %$conf) {
-	    next if $opt !~ m/^net(\d+)$/;
-	    my $netnum = $1;
-	    my $net = PVE::QemuServer::parse_net($conf->{$opt});
-	    next if !$net;
-	    die "implement me" if !$net->{bridge};
-
-	    my $vmzone = $conf->{zone} || "vm$vmid";
-	    $net->{tap} = "tap${vmid}i${netnum}";
-	    $maclist->{$net->{tap}} = $net->{macaddr} || die "internal error";
-	    $net->{zone} = &$register_bridge_port($net->{bridge}, $net->{tag}, $vmzone, $net->{tap});
-	    $netinfo->{$vmid}->{$opt} = $net;
+    if ($macro) {
+	foreach my $templ (@$macro) {
+	    my $rule = {};
+	    foreach my $k (keys %$templ) {
+		my $v = $templ->{$k};
+		$v = $param->{$k} if $v eq 'PARAM';
+		die "missing parameter '$k' in macro '$macro_name'\n" if !defined($v);
+		$rule->{$k} = $v;
+	    }
+	    push @$rules, $rule;
 	}
+    } else {
+	push @$rules, $param;
     }
 
-    #print Dumper($netinfo);
-
-    # NOTE: zone names have length limit, so we need to
-    # translate them into shorter names 
-
-    my $zoneid = 0;
-    my $zonemap = { fw => 'fw' };
-
-    my $lookup_zonename = sub {
-	my ($zone) = @_;
+    foreach my $rule (@$rules) {
+	$rule->{nbdport} = parse_port_name_number_or_range($rule->{dport}) 
+	    if defined($rule->{dport});
+	$rule->{nbsport} = parse_port_name_number_or_range($rule->{sport}) 
+	    if defined($rule->{sport});
+    }
 
-	return $zonemap->{$zone} if defined($zonemap->{$zone});
-	$zonemap->{$zone} = 'z' . $zoneid++;
+    return $rules;
+}
 
-	return $zonemap->{$zone};
-    };
+sub parse_vm_fw_rules {
+    my ($filename, $fh) = @_;
 
-    foreach my $z (sort keys %$zoneinfo) {
-	$zoneinfo->{$z}->{id} = &$lookup_zonename($z);
-	$zoneinfo->{$z}->{zonevar} = uc($z);
- 	$zoneinfo->{$z}->{zoneref} = '$' . $zoneinfo->{$z}->{zonevar};
-    }
+    my $res = { in => [], out => [] };
 
-    my $out;
+    my $section;
 
-    # dump params file
-    $out = "# PVE zones\n";
-    foreach my $z (sort keys %$zoneinfo) {
-	$out .= "$zoneinfo->{$z}->{zonevar}=$zoneinfo->{$z}->{id}\n";
-    }
-    PVE::Tools::file_set_contents("$targetdir/params", $out);
+    while (defined(my $line = <$fh>)) {
+	next if $line =~ m/^#/;
+	next if $line =~ m/^\s*$/;
 
-    # dump zone file
+	my $linenr = $fh->input_line_number();
+	my $prefix = "$filename (line $linenr)";
 
-    my $format = "%-30s %-10s %-15s\n";
-    $out = sprintf($format, '#ZONE', 'TYPE', 'OPTIONS');
-    
-    foreach my $z (sort keys %$zoneinfo) {
-	my $zid = $zoneinfo->{$z}->{zoneref};
-	if ($zoneinfo->{$z}->{type} eq 'firewall') {
-	    $out .= sprintf($format, $zid, $zoneinfo->{$z}->{type}, '');
-	} elsif ($zoneinfo->{$z}->{type} eq 'bridge') {
-	    $out .= sprintf($format, $zid, 'ipv4', '');
-	} elsif ($zoneinfo->{$z}->{type} eq 'bport') {
-	    my $bridge_zone = $zoneinfo->{$z}->{bridge_zone} || die "internal error";
-	    my $bzid = $zoneinfo->{$bridge_zone}->{zoneref} || die "internal error";
-	    $out .= sprintf($format, "$zid:$bzid", 'bport', '');
-	} else {
-	    die "internal error";
+	if ($line =~ m/^\[(in|out)\]\s*$/i) {
+	    $section = lc($1);
+	    next;
 	}
-    }
-
-    $out .= sprintf("#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE\n");
-
-    PVE::Tools::file_set_contents("$targetdir/zones", $out);
-
-    # dump interfaces
-
-    $format = "%-25s %-20s %-10s %-15s\n";
-    $out = sprintf($format, '#ZONE', 'INTERFACE', 'BROADCAST', 'OPTIONS');
-
-    my $maclist_format = "%-15s %-15s %-15s\n";
-    my $macs = sprintf($maclist_format, '#DISPOSITION', 'INTERFACE', 'MACZONE');
-
-    foreach my $z (sort keys %$zoneinfo) {
-	my $zid = $zoneinfo->{$z}->{zoneref};
-	if ($zoneinfo->{$z}->{type} eq 'firewall') {
-	    # do nothing;
-	} elsif ($zoneinfo->{$z}->{type} eq 'bridge') {
-	    my $bridge = $zoneinfo->{$z}->{bridge} || die "internal error";
-	    $out .= sprintf($format, $zid, $bridge, 'detect', 'bridge,optional');
-	} elsif ($zoneinfo->{$z}->{type} eq 'bport') {
-	    my $ifaces = $zoneinfo->{$z}->{ifaces};
-	    foreach my $iface (sort keys %$ifaces) {
-		my $bridge_zone = $zoneinfo->{$z}->{bridge_zone} || die "internal error";
-		my $bridge = $zoneinfo->{$bridge_zone}->{bridge} || die "internal error";
-		my $iftxt = "$bridge:$iface";
-
-		if ($maclist->{$iface}) {
-		    $out .= sprintf($format, $zid, $iftxt, '-', 'maclist');
-		    $macs .= sprintf($maclist_format, 'ACCEPT', $iface, $maclist->{$iface});
-		} else {
-		    $out .= sprintf($format, $zid, $iftxt, '-', '');
-		}
-	    }
-	} else {
-	    die "internal error";
+	if (!$section) {
+	    warn "$prefix: skip line - no section";
+	    next;
 	}
-    }
-
-    $out .= sprintf("#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE\n");
 
-    PVE::Tools::file_set_contents("$targetdir/interfaces", $out);
+	my $rules;
+	eval { $rules = parse_fw_rule($line, 1, 1); };
+	if (my $err = $@) {
+	    warn "$prefix: $err";
+	    next;
+	}
 
-    # dump maclist
-    PVE::Tools::file_set_contents("$targetdir/maclist", $macs);
+	push @{$res->{$section}}, @$rules;
+    }
 
-    # dump policy
+    return $res;
+}
 
-    $format = "%-15s %-15s %-15s %s\n";
-    $out = sprintf($format, '#SOURCE', 'DEST', 'POLICY', 'LOG');
-    $out .= sprintf($format, 'fw', 'all', 'ACCEPT', '');
+sub parse_host_fw_rules {
+    my ($filename, $fh) = @_;
 
-    # we need to disable intra-zone traffic on bridges. Else traffic
-    # from untracked interfaces simply pass the firewall
-    foreach my $z (sort keys %$zoneinfo) {
-	my $zid = $zoneinfo->{$z}->{zoneref};
-	if ($zoneinfo->{$z}->{type} eq 'bridge') {
-	    $out .= sprintf($format, $zid, $zid, 'REJECT', 'info');
-	}
-    }
-    $out .= sprintf($format, 'all', 'all', 'REJECT', 'info');
+    my $res = { in => [], out => [] };
 
-    PVE::Tools::file_set_contents("$targetdir/policy", $out);
+    my $section;
 
-    # dump rules
-    $out = '';
+    while (defined(my $line = <$fh>)) {
+	next if $line =~ m/^#/;
+	next if $line =~ m/^\s*$/;
 
-    $out = sprintf($rule_format, '#ACTION', 'SOURCE', 'DEST', 'PROTO', 'DPORT', 'SPORT');
-    foreach my $vmid (sort keys %$rules) {
-	my $inrules = $rules->{$vmid}->{in};
-	my $outrules = $rules->{$vmid}->{out};
+	my $linenr = $fh->input_line_number();
+	my $prefix = "$filename (line $linenr)";
 
-	if (scalar(@$inrules)) {
-	    $out .= "# IN to VM $vmid\n";
-	    foreach my $rule (@$inrules) {
-		foreach my $netid (keys %{$netinfo->{$vmid}}) {
-		    my $net = $netinfo->{$vmid}->{$netid};
-		    next if $rule->{iface} && $rule->{iface} ne $netid;
-		    $out .= &$generate_input_rule($zoneinfo, $rule, $net, $netid);
-		}
-	    }
+	if ($line =~ m/^\[(in|out)\]\s*$/i) {
+	    $section = lc($1);
+	    next;
+	}
+	if (!$section) {
+	    warn "$prefix: skip line - no section";
+	    next;
 	}
 
-	if (scalar(@$outrules)) {
-	    $out .= "# OUT from VM $vmid\n";
-	    foreach my $rule (@$outrules) {
-		foreach my $netid (keys %{$netinfo->{$vmid}}) {
-		    my $net = $netinfo->{$vmid}->{$netid};
-		    next if $rule->{iface} && $rule->{iface} ne $netid;
-		    $out .= &$generate_output_rule($zoneinfo, $rule, $net, $netid);
-		}
-	    }
+	my $rules;
+	eval { $rules = parse_fw_rule($line, 1, 1); };
+	if (my $err = $@) {
+	    warn "$prefix: $err";
+	    next;
 	}
-    }
 
-    PVE::Tools::file_set_contents("$targetdir/rules", $out);
-};
+	push @{$res->{$section}}, @$rules;
+    }
 
+    return $res;
+}
 
-sub parse_fw_rules {
-    my ($filename, $fh, $group) = @_;
+sub parse_group_fw_rules {
+    my ($filename, $fh) = @_;
 
     my $section;
-    my $securitygroup;
-    my $securitygroupexist;
+    my $group;
 
     my $res = { in => [], out => [] };
-
-    my $macros = get_firewall_macros();
-    my $protocols = get_etc_protocols();
-    
+   
     while (defined(my $line = <$fh>)) {
 	next if $line =~ m/^#/;
 	next if $line =~ m/^\s*$/;
 
-	if ($line =~ m/^\[(in|out)(:(\S+))?\]\s*$/i) {
-	    $section = lc($1);
-	    $securitygroup = lc($3) if $3;
-	    $securitygroupexist = 1 if $securitygroup &&  $securitygroup eq $group;
-	    next;
-	}
-	next if !$section;
-	next if $group && $securitygroup ne $group;
-
-	my ($action, $iface, $source, $dest, $proto, $dport, $sport) =
-	    split(/\s+/, $line);
-
-	if (!$action) {
-	    warn "skip incomplete line\n";
-	    next;
-	}
-
-	my $service;
-	if ($action =~ m/^(ACCEPT|DROP|REJECT|GROUP-(\S+))$/) {
-	    # OK
-	} elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
-	    ($service, $action) = ($1, $2);
-	    if (!$macros->{$service}) {
-		warn "unknown service '$service'\n";
-		next;
-	    }
-	} else {
-	    warn "unknown action '$action'\n";
-	    next;
-	}
+	my $linenr = $fh->input_line_number();
+	my $prefix = "$filename (line $linenr)";
 
-	$iface = undef if $iface && $iface eq '-';
-	if ($iface && $iface !~ m/^(net0|net1|net2|net3|net4|net5)$/) {
-	    warn "unknown interface '$iface'\n";
+	if ($line =~ m/^\[(in|out):(\S+)\]\s*$/i) {
+	    $section = lc($1);
+	    $group = lc($2);
 	    next;
 	}
-
-	$proto = undef if $proto && $proto eq '-';
-	if ($proto && !(defined($protocols->{byname}->{$proto}) ||
-			defined($protocols->{byid}->{$proto}))) {
-	    warn "unknown protokol '$proto'\n";
+	if (!$section || !$group) {
+	    warn "$prefix: skip line - no section";
 	    next;
 	}
 
-	$source = undef if $source && $source eq '-';
-	$dest = undef if $dest && $dest eq '-';
-
-	$dport = undef if $dport && $dport eq '-';
-	$sport = undef if $sport && $sport eq '-';
-	my $nbdport = undef;
-	my $nbsport = undef;
-	my $nbsource = undef;
-	my $nbdest = undef;
-
-	eval {
-	    $nbsource = parse_address_list($source) if $source;
-	    $nbdest = parse_address_list($dest) if $dest;
-	    $nbdport = parse_port_name_number_or_range($dport) if $dport;
-	    $nbsport = parse_port_name_number_or_range($sport) if $sport;
-	};
+	my $rules;
+	eval { $rules = parse_fw_rule($line, 0, 0); };
 	if (my $err = $@) {
-	    warn $err;
+	    warn "$prefix: $err";
 	    next;
-
 	}
 
-
-	my $rule = {
-	    action => $action,
-	    service => $service,
-	    iface => $iface,
-	    source => $source,
-	    dest => $dest,
-	    nbsource => $nbsource,
-	    nbdest => $nbdest,
-	    proto => $proto,
-	    dport => $dport,
-	    sport => $sport,
-	    nbdport => $nbdport,
-	    nbsport => $nbsport,
-
-	};
-
-	push @{$res->{$section}}, $rule;
+	push @{$res->{$group}->{$section}}, @$rules;
     }
 
-    die "security group $group don't exist" if $group && !$securitygroupexist;
     return $res;
 }
 
@@ -983,7 +716,6 @@ sub read_local_vm_config {
     my $list = PVE::QemuServer::config_list();
 
     foreach my $vmid (keys %$list) {
-	#next if !($vmid eq '100' || $vmid eq '102');
 	my $cfspath = PVE::QemuServer::cfs_config_path($vmid);
 	if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
 	    $qemu->{$vmid} = $conf;
@@ -1003,7 +735,7 @@ sub read_vm_firewall_rules {
 	my $fh = IO::File->new($filename, O_RDONLY);
 	next if !$fh;
 
-	$rules->{$vmid} = parse_fw_rules($filename, $fh);
+	$rules->{$vmid} = parse_vm_fw_rules($filename, $fh);
     }
 
     return $rules;
@@ -1012,18 +744,191 @@ sub read_vm_firewall_rules {
 sub compile {
     my $vmdata = read_local_vm_config();
     my $rules = read_vm_firewall_rules($vmdata);
+    
+    my $group_rules = {};
+    my $filename = "/etc/pve/firewall/groups.fw";
+    if (my $fh = IO::File->new($filename, O_RDONLY)) {
+	$group_rules = parse_group_fw_rules($filename, $fh);
+    }
 
-    # print Dumper($vmdata);
+    #print Dumper($rules);
+
+    my $ruleset = {};
+
+    # setup host firewall rules
+    ruleset_create_chain($ruleset, "PVEFW-INPUT");
+    ruleset_create_chain($ruleset, "PVEFW-OUTPUT");
+
+    ruleset_create_chain($ruleset, "PVEFW-SET-ACCEPT-MARK");
+    ruleset_addrule($ruleset, "PVEFW-SET-ACCEPT-MARK", "-j MARK --set-mark 1");
+
+    $filename = "/etc/pve/local/host.fw";
+    if (my $fh = IO::File->new($filename, O_RDONLY)) {
+	my $host_rules = parse_host_fw_rules($filename, $fh);
+	enablehostfw($ruleset, $host_rules, $group_rules);
+    }
 
-    die "implement me";
+    # generate firewall rules for QEMU VMs 
+    foreach my $vmid (keys %{$vmdata->{qemu}}) {
+	my $conf = $vmdata->{qemu}->{$vmid};
+	next if !$rules->{$vmid};
+
+	foreach my $netid (keys %$conf) {
+	    next if $netid !~ m/^net(\d+)$/;
+	    my $net = PVE::QemuServer::parse_net($conf->{$netid});
+	    next if !$net;
+	    my $iface = "tap${vmid}i$1";
+
+	    my $bridge = $net->{bridge};
+	    next if !$bridge; # fixme: ?
+
+	    $bridge .= "v$net->{tag}" if $net->{tag};
+
+	    generate_bridge_chains($ruleset, $bridge);
+
+	    my $macaddr = $net->{macaddr};
+	    generate_tap_rules_direction($ruleset, $group_rules, $iface, $netid, $macaddr, $rules->{$vmid}->{in}, $bridge, 'IN');
+	    generate_tap_rules_direction($ruleset, $group_rules, $iface, $netid, $macaddr, $rules->{$vmid}->{out}, $bridge, 'OUT');
+	}
+    }
+    return $ruleset;
 }
 
-sub compile_and_start {
-    my ($restart) = @_;
+sub get_ruleset_status {
+    my ($ruleset, $verbose) = @_;
 
-    compile();
+    my $active_chains = iptables_get_chains();
+
+    my $statushash = {};
+
+    foreach my $chain (sort keys %$ruleset) {
+	my $digest = Digest::SHA->new('sha1');
+	foreach my $cmd (@{$ruleset->{$chain}}) {
+	     $digest->add("$cmd\n");
+	}
+	my $sig = $digest->b64digest;
+	$statushash->{$chain}->{sig} = $sig;
+
+	my $oldsig = $active_chains->{$chain};
+	if (!defined($oldsig)) {
+	    $statushash->{$chain}->{action} = 'create';
+	} else {
+	    if ($oldsig eq $sig) {
+		$statushash->{$chain}->{action} = 'exists';
+	    } else {
+		$statushash->{$chain}->{action} = 'update';
+	    }
+	}
+	print "$statushash->{$chain}->{action} $chain ($sig)\n" if $verbose;
+	foreach my $cmd (@{$ruleset->{$chain}}) {
+	    print "\t$cmd\n" if $verbose;
+	}
+    }
+
+    foreach my $chain (sort keys %$active_chains) {
+	if (!defined($ruleset->{$chain})) {
+	    my $sig = $active_chains->{$chain};
+	    $statushash->{$chain}->{action} = 'delete';
+	    $statushash->{$chain}->{sig} = $sig;
+	    print "delete $chain ($sig)\n" if $verbose;
+	}
+    }    
+
+    return $statushash;
+}
+
+sub print_ruleset {
+    my ($ruleset) = @_;
+
+    get_ruleset_status($ruleset, 1);
+}
+
+sub print_sig_rule {
+    my ($chain, $sig) = @_;
+
+    # We just use this to store a SHA1 checksum used to detect changes
+    return "-A $chain -m comment --comment \"PVESIG:$sig\"\n";
+}
+
+sub apply_ruleset {
+    my ($ruleset, $verbose) = @_;
+
+    enable_bridge_firewall();
+
+    my $cmdlist = "*filter\n"; # we pass this to iptables-restore;
+
+    my $statushash = get_ruleset_status($ruleset, $verbose);
+
+    # create missing chains first
+    foreach my $chain (sort keys %$ruleset) {
+	my $stat = $statushash->{$chain};
+	die "internal error" if !$stat;
+	next if $stat->{action} ne 'create';
+
+	$cmdlist .= ":$chain - [0:0]\n";
+    }
+
+    my $rule = "INPUT -j PVEFW-INPUT";
+    if (!PVE::Firewall::iptables_rule_exist($rule)) {
+	$cmdlist .= "-A $rule\n";
+    }
+    $rule = "OUTPUT -j PVEFW-OUTPUT";
+    if (!PVE::Firewall::iptables_rule_exist($rule)) {
+	$cmdlist .= "-A $rule\n";
+    }
+
+    $rule = "FORWARD -j PVEFW-FORWARD";
+    if (!PVE::Firewall::iptables_rule_exist($rule)) {
+	$cmdlist .= "-A $rule\n";
+    }
+
+    foreach my $chain (sort keys %$ruleset) {
+	my $stat = $statushash->{$chain};
+	die "internal error" if !$stat;
+
+	if ($stat->{action} eq 'update' || $stat->{action} eq 'create') {
+	    $cmdlist .= "-F $chain\n";
+	    foreach my $cmd (@{$ruleset->{$chain}}) {
+		$cmdlist .= "$cmd\n";
+	    }
+	    $cmdlist .= print_sig_rule($chain, $stat->{sig});
+	} elsif ($stat->{action} eq 'delete') {
+	    die "internal error"; # this should not happen
+	} elsif ($stat->{action} eq 'exists') {
+	    # do nothing
+	} else {
+	    die "internal error - unknown status '$stat->{action}'";
+	}
+    }
+
+    foreach my $chain (keys %$statushash) {
+	next if $statushash->{$chain}->{action} ne 'delete';
+	$cmdlist .= "-F $chain\n";
+    }
+    foreach my $chain (keys %$statushash) {
+	next if $statushash->{$chain}->{action} ne 'delete';
+	$cmdlist .= "-X $chain\n";
+    }
+
+    $cmdlist .= "COMMIT\n";
+
+    print $cmdlist if $verbose;
+
+    iptables_restore_cmdlist($cmdlist);
+
+    # test: re-read status and check if everything is up to date 
+    $statushash = get_ruleset_status($ruleset);
+
+    my $errors;
+    foreach my $chain (sort keys %$ruleset) {
+	my $stat = $statushash->{$chain};
+	if ($stat->{action} ne 'exists') {
+	    warn "unable to update chain '$chain'\n";
+	    $errors = 1;
+	}
+    }
 
-     die "implement me";  
+    die "unable to apply firewall changes\n" if $errors;
 }
 
 1;