X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=PVE%2FFirewall.pm;h=c6d45376d05eb71cd9d585bd15f09fdbcc43a87f;hp=3f0adf0cb531d0314a97135f5b3fceef79d7cf79;hb=64568ce0ba3e01ccea2c7c4d8135c7ee1a7fcfcd;hpb=8fb53d8ccf5b71e3352c33221fdecb9e97e1753c

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 3f0adf0..c6d4537 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -7,343 +7,573 @@ use PVE::Tools;
 use PVE::QemuServer;
 use File::Path;
 use IO::File;
+use Net::IP;
+use PVE::Tools qw(run_command lock_file);
+
 use Data::Dumper;
 
+my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
+
 my $macros;
-sub get_shorewall_macros {
+my @ruleset = ();
+
+# todo: implement some kind of MACROS, like shorewall /usr/share/shorewall/macro.*
+sub get_firewall_macros {
 
     return $macros if $macros;
 
-    foreach my $path (</usr/share/shorewall/macro.*>) {
-	if ($path =~ m|/macro\.(\S+)$|) {
-	    $macros->{$1} = 1;
-	}
-    }
+    #foreach my $path (</usr/share/shorewall/macro.*>) {
+    #  if ($path =~ m|/macro\.(\S+)$|) {
+    #    $macros->{$1} = 1;
+    #  }
+    #}
+
+    $macros = {}; # fixme: implemet me
+
     return $macros;
 }
 
+my $etc_services;
 
-my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
+sub get_etc_services {
+
+    return $etc_services if $etc_services;
 
-my $generate_input_rule = sub {
-    my ($zoneinfo, $rule, $net, $netid) = @_;
+    my $filename = "/etc/services";
+
+    my $fh = IO::File->new($filename, O_RDONLY);
+    if (!$fh) {
+	warn "unable to read '$filename' - $!\n";
+	return {};
+    }
 
-    my $zone = $net->{zone} || die "internal error";
-    my $zid = $zoneinfo->{$zone}->{zoneref} || die "internal error";
-    my $tap = $net->{tap} || die "internal error";
+    my $services = {};
 
-    my $dest = "$zid:$tap";
+    while (my $line = <$fh>) {
+	chomp ($line);
+	next if $line =~m/^#/;
+	next if ($line =~m/^\s*$/);
 
-    if ($rule->{dest}) {
-	$dest .= ":$rule->{dest}";
+	if ($line =~ m!^(\S+)\s+(\S+)/(tcp|udp).*$!) {
+	    $services->{byid}->{$2}->{name} = $1;
+	    $services->{byid}->{$2}->{$3} = 1;
+	    $services->{byname}->{$1} = $services->{byid}->{$2};
+	}
     }
 
-    my $action = $rule->{service} ? 
-	"$rule->{service}($rule->{action})" : $rule->{action};
+    close($fh);
 
-    my $source;
+    $etc_services = $services;    
+    
 
-    if ($zoneinfo->{$zone}->{type} eq 'bport') {
-	my $bridge_zone = $zoneinfo->{$zone}->{bridge_zone} || die "internal error";
-	my $bridge_ext_zone = $zoneinfo->{$bridge_zone}->{bridge_ext_zone} || die "internal error";
-	my $zoneref = $zoneinfo->{$bridge_ext_zone}->{zoneref} || die "internal error";
-	if (!$rule->{source}) {
-	    # $source = "${zoneref}";
-	    $source = 'all';
-	} else {
-	    # 'all' does not work
-	    $source = "${zoneref}:$rule->{source}";
+    return $etc_services;
+}
+
+my $etc_protocols;
+
+sub get_etc_protocols {
+    return $etc_protocols if $etc_protocols;
+
+    my $filename = "/etc/protocols";
+
+    my $fh = IO::File->new($filename, O_RDONLY);
+    if (!$fh) {
+	warn "unable to read '$filename' - $!\n";
+	return {};
+    }
+
+    my $protocols = {};
+
+    while (my $line = <$fh>) {
+	chomp ($line);
+	next if $line =~m/^#/;
+	next if ($line =~m/^\s*$/);
+
+	if ($line =~ m!^(\S+)\s+(\d+)\s+.*$!) {
+	    $protocols->{byid}->{$2}->{name} = $1;
+	    $protocols->{byname}->{$1} = $protocols->{byid}->{$2};
 	}
-    } else {
-	$source = "all:$rule->{source}";
     }
 
-    return sprintf($rule_format, $action, $source, $dest, $rule->{proto} || '-', 
-		   $rule->{dport} || '-', $rule->{sport} || '-');
-};
+    close($fh);
 
-my $generate_output_rule = sub {
-    my ($zoneinfo, $rule, $net, $netid) = @_;
+    $etc_protocols = $protocols;
 
-    my $zone = $net->{zone} || die "internal error";
-    my $zid = $zoneinfo->{$zone}->{zoneref} || die "internal error";
-    my $tap = $net->{tap} || die "internal error";
+    return $etc_protocols;
+}
 
-    my $action = $rule->{service} ? 
-	"$rule->{service}($rule->{action})" : $rule->{action};
-    
-    my $dest;
+sub parse_address_list {
+    my ($str) = @_;
 
-    if (!$rule->{dest}) {
-	$dest = 'all';
-    } else {
-	$dest = "all:$rule->{dest}";
+    my $nbaor = 0;
+    foreach my $aor (split(/,/, $str)) {
+	if (!Net::IP->new($aor)) {
+	    my $err = Net::IP::Error();
+	    die "invalid IP address: $err\n";
+	}else{
+	    $nbaor++;
+	}
     }
+    return $nbaor;
+}
 
-    return sprintf($rule_format, $action, "$zid:$tap", $dest, 
-		   $rule->{proto} || '-', $rule->{dport} || '-', $rule->{sport} || '-');
-};
+sub parse_port_name_number_or_range {
+    my ($str) = @_;
+
+    my $services = PVE::Firewall::get_etc_services();
+    my $nbports = 0;
+    foreach my $item (split(/,/, $str)) {
+	my $portlist = "";
+	foreach my $pon (split(':', $item, 2)) {
+	    if ($pon =~ m/^\d+$/){
+		die "invalid port '$pon'\n" if $pon < 0 && $pon > 65536;
+	    }else{
+		die "invalid port $services->{byname}->{$pon}\n" if !$services->{byname}->{$pon};
+	    }
+	    $nbports++;
+	}
+    }
+
+    return ($nbports);
+}
+
+my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
+
+sub iptables {
+    my ($cmd) = @_;
+
+    run_command("/sbin/iptables $cmd", outfunc => sub {}, errfunc => sub {});
+}
+
+sub iptables_restore {
+
+    unshift (@ruleset, '*filter');
+    push (@ruleset, 'COMMIT');
 
-# we need complete VM configuration of all VMs (openvz/qemu)
-# in vmdata
+    my $cmdlist = join("\n", @ruleset) . "\n";
 
-my $compile_shorewall = sub {
-    my ($targetdir, $vmdata, $rules) = @_;
+    my $verbose = 1; # fixme: how/when do we set this
 
-    # remove existing data ?
-    foreach my $file (qw(params zones rules interfaces  maclist  policy)) {
-	unlink "$targetdir/$file";
+    #run_command("echo '$cmdlist' | /sbin/iptables-restore -n");
+    eval { run_command("/sbin/iptables-restore -n ", input => $cmdlist); };
+    if (my $err = $@) {
+	print STDERR $cmdlist if $verbose;
+	die $err;
     }
+}
+
+sub iptables_addrule {
+   my ($rule) = @_;
 
-    my $netinfo;
+   push (@ruleset, $rule);
+}
 
-    my $zoneinfo = {
-	fw => { type => 'firewall' },
+sub iptables_chain_exist {
+    my ($chain) = @_;
+
+    eval{
+	iptables("-n --list $chain");
     };
+    return undef if $@;
 
-    my $maclist = {};
+    return 1;
+}
 
-    my $register_bridge;
+sub iptables_rule_exist {
+    my ($rule) = @_;
 
-    $register_bridge = sub {
-	my ($bridge, $vlan) = @_;
+    eval{
+	iptables("-C $rule");
+    };
+    return undef if $@;
 
-	my $zone =  'z' . $bridge;
+    return 1;
+}
 
-	return $zone if $zoneinfo->{$zone};
+sub iptables_generate_rule {
+    my ($chain, $rule) = @_;
 
-	my $ext_zone = "z${bridge}ext";
+    my $cmd = "-A $chain";
 
-	$zoneinfo->{$zone} = {
-	    type => 'bridge',
-	    bridge => $bridge,
-	    bridge_ext_zone => $ext_zone,
-	};
+    $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->{destination};
+    $cmd .= " -p $rule->{proto}" if $rule->{proto};
+    $cmd .= "  --match multiport" if $rule->{nbdport} && $rule->{nbdport} > 1;
+    $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};
 
-	# 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,
-	};
+    iptables_addrule($cmd);
 
-	return &$register_bridge("${bridge}v${vlan}") if defined($vlan);
-	
-	return $zone;
-    };
+}
 
-    my $register_bridge_port = sub {
-	my ($bridge, $vlan, $vmzone, $tap) = @_;
+sub generate_bridge_rules {
+    my ($bridge) = @_;
 
-	my $bridge_zone = &$register_bridge($bridge, $vlan);
-	my $zone = $bridge_zone . $vmzone;
+    if(!iptables_chain_exist("BRIDGEFW-OUT")){
+	iptables_addrule(":BRIDGEFW-OUT - [0:0]");
+    }
 
-	if (!$zoneinfo->{$zone}) {
-	    $zoneinfo->{$zone} = {
-		type => 'bport',
-		bridge_zone => $bridge_zone,
-		ifaces => {},
-	    };
-	}
+    if(!iptables_chain_exist("BRIDGEFW-IN")){
+	iptables_addrule(":BRIDGEFW-IN - [0:0]");
+    }
 
-	$zoneinfo->{$zone}->{ifaces}->{$tap} = 1;
-	
-	return $zone;
-    };
+    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");
 
-    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;
-	}
     }
 
-    #print Dumper($netinfo);
+    generate_proxmoxfwinput();
 
-    # NOTE: zone names have length limit, so we need to
-    # translate them into shorter names 
+    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");
 
-    my $zoneid = 0;
-    my $zonemap = { fw => 'fw' };
+    }
 
-    my $lookup_zonename = sub {
-	my ($zone) = @_;
+    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");
 
-	return $zonemap->{$zone} if defined($zonemap->{$zone});
-	$zonemap->{$zone} = 'z' . $zoneid++;
+    }
 
-	return $zonemap->{$zone};
-    };
+}
 
-    foreach my $z (sort keys %$zoneinfo) {
-	$zoneinfo->{$z}->{id} = &$lookup_zonename($z);
-	$zoneinfo->{$z}->{zonevar} = uc($z);
- 	$zoneinfo->{$z}->{zoneref} = '$' . $zoneinfo->{$z}->{zonevar};
+
+sub generate_tap_rules_direction {
+    my ($iface, $netid, $rules, $bridge, $direction) = @_;
+
+    my $tapchain = "$iface-$direction";
+
+    iptables_addrule(":$tapchain - [0:0]");
+
+    iptables_addrule("-A $tapchain -m state --state INVALID -j DROP");
+    iptables_addrule("-A $tapchain -m state --state RELATED,ESTABLISHED -j ACCEPT");
+
+    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);
+        }
     }
 
-    my $out;
+    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";
 
-    # dump params file
-    $out = "# PVE zones\n";
-    foreach my $z (sort keys %$zoneinfo) {
-	$out .= "$zoneinfo->{$z}->{zonevar}=$zoneinfo->{$z}->{id}\n";
+    if(!iptables_rule_exist($rule)){
+	iptables_addrule("-I $rule");
     }
-    PVE::Tools::file_set_contents("$targetdir/params", $out);
 
-    # dump zone file
+    if($direction eq 'OUT'){
+	#add tap->host rules
+	my $rule = "proxmoxfw-INPUT -m physdev --physdev-$physdevdirection $iface -j $tapchain";
 
-    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(!iptables_rule_exist($rule)){
+	    iptables_addrule("-A $rule");
 	}
     }
+}
 
-    $out .= sprintf("#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE\n");
+sub generate_tap_rules {
+    my ($net, $netid, $vmid) = @_;
 
-    PVE::Tools::file_set_contents("$targetdir/zones", $out);
+    my $filename = "/etc/pve/firewall/$vmid.fw";
+    my $fh = IO::File->new($filename, O_RDONLY);
+    return if !$fh;
 
-    # dump interfaces
+    #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);
 
-    $format = "%-25s %-20s %-10s %-15s\n";
-    $out = sprintf($format, '#ZONE', 'INTERFACE', 'BROADCAST', 'OPTIONS');
+    my $inrules = $rules->{in};
+    my $outrules = $rules->{out};
 
-    my $maclist_format = "%-15s %-15s %-15s\n";
-    my $macs = sprintf($maclist_format, '#DISPOSITION', 'INTERFACE', 'MACZONE');
+    my $iface = "tap".$vmid."i".$1 if $netid =~ m/net(\d+)/;
 
-    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";
+    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+)/;
+
+    flush_tap_rules_direction($iface, $bridge, 'IN');
+    flush_tap_rules_direction($iface, $bridge, 'OUT');
+    iptables_restore();
+}
+
+sub flush_tap_rules_direction {
+    my ($iface, $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");
+	}
 
-		if ($maclist->{$iface}) {
-		    $out .= sprintf($format, $zid, $iftxt, '-', 'maclist');
-		    $macs .= sprintf($maclist_format, 'ACCEPT', $iface, $maclist->{$iface});
-		} else {
-		    $out .= sprintf($format, $zid, $iftxt, '-', '');
-		}
+	if($direction eq 'OUT'){
+	    my $rule = "proxmoxfw-INPUT -m physdev --physdev-$physdevdirection $iface -j $tapchain";
+	    if(iptables_rule_exist($rule)){
+		iptables_addrule("-D $rule");
 	    }
-	} else {
-	    die "internal error";
 	}
+
+	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);
+        }
     }
 
-    $out .= sprintf("#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE\n");
+    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);
+        }
+    }
 
-    PVE::Tools::file_set_contents("$targetdir/interfaces", $out);
+    iptables_addrule("-A host-OUT -j LOG --log-prefix \"kvmhost-OUT dropped: \" --log-level 4");
+    iptables_addrule("-A host-OUT -j DROP");
 
-    # dump maclist
-    PVE::Tools::file_set_contents("$targetdir/maclist", $macs);
+    
+    my $rule = "proxmoxfw-INPUT -j host-IN";
+    if(!iptables_rule_exist($rule)){
+	iptables_addrule("-I $rule");
+    }
 
-    # dump policy
+    $rule = "proxmoxfw-OUTPUT -j host-OUT";
+    if(!iptables_rule_exist($rule)){
+	iptables_addrule("-I $rule");
+    }
 
-    $format = "%-15s %-15s %-15s %s\n";
-    $out = sprintf($format, '#SOURCE', 'DEST', 'POLICY', 'LOG');
-    $out .= sprintf($format, 'fw', 'all', 'ACCEPT', '');
+    iptables_restore();
 
-    # 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');
-	}
+
+}
+
+sub disablehostfw {
+
+    my $chain = "host-IN";
+
+    my $rule = "proxmoxfw-INPUT -j $chain";
+    if(iptables_rule_exist($rule)){
+	iptables_addrule("-D $rule");
     }
-    $out .= sprintf($format, 'all', 'all', 'REJECT', 'info');
 
-    PVE::Tools::file_set_contents("$targetdir/policy", $out);
+    if(iptables_chain_exist($chain)){
+	iptables_addrule("-F $chain");
+	iptables_addrule("-X $chain");
+    }
 
-    # dump rules
-    $out = '';
+    $chain = "host-OUT";
 
-    $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};
+    $rule = "proxmoxfw-OUTPUT -j $chain";
+    if(iptables_rule_exist($rule)){
+	iptables_addrule("-D $rule");
+    }
 
-	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(iptables_chain_exist($chain)){
+	iptables_addrule("-F $chain");
+	iptables_addrule("-X $chain");
+    }
 
-	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);
-		}
-	    }
-	}
+    iptables_restore();   
+}
+
+sub generate_proxmoxfwinput {
+
+    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");
     }
+}
 
-    PVE::Tools::file_set_contents("$targetdir/rules", $out);
-};
+sub generate_proxmoxfwoutput {
+
+    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");
+    }
+
+}
+
+sub enable_group_rules {
+    my ($group) = @_;
+    
+    generate_group_rules($group);
+    iptables_restore();
+}
+
+sub generate_group_rules {
+    my ($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 $chain = "GROUP-".$group."-IN";
+
+    iptables_addrule(":$chain - [0:0]");
+
+    if (scalar(@$inrules)) {
+        foreach my $rule (@$inrules) {
+            iptables_generate_rule($chain, $rule);
+        }
+    }
+
+    $chain = "GROUP-".$group."-OUT";
+
+    iptables_addrule(":$chain - [0:0]");
+
+    if(!iptables_chain_exist("BRIDGEFW-OUT")){
+	iptables_addrule(":BRIDGEFW-OUT - [0:0]");
+    }
+
+    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);
+        }
+    }
+
+}
+
+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();
+}
 
 sub parse_fw_rules {
-    my ($filename, $fh) = @_;
+    my ($filename, $fh, $group) = @_;
 
     my $section;
+    my $securitygroup;
+    my $securitygroupexist;
 
     my $res = { in => [], out => [] };
 
-    my $macros = PVE::Firewall::get_shorewall_macros();
-
+    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*$/i) {
+	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);
@@ -354,7 +584,7 @@ sub parse_fw_rules {
 	}
 
 	my $service;
-	if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
+	if ($action =~ m/^(ACCEPT|DROP|REJECT|GROUP-(\S+))$/) {
 	    # OK
 	} elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
 	    ($service, $action) = ($1, $2);
@@ -374,26 +604,34 @@ sub parse_fw_rules {
 	}
 
 	$proto = undef if $proto && $proto eq '-';
-	if ($proto && $proto !~ m/^(icmp|tcp|udp)$/) {
+	if ($proto && !(defined($protocols->{byname}->{$proto}) ||
+			defined($protocols->{byid}->{$proto}))) {
 	    warn "unknown protokol '$proto'\n";
 	    next;
 	}
 
 	$source = undef if $source && $source eq '-';
-
-#	if ($source !~ m/^(XYZ)$/) {
-#	    warn "unknown source '$source'\n";
-#	    next;
-#	}
-
 	$dest = undef if $dest && $dest eq '-';
-#	if ($dest !~ m/^XYZ)$/) {
-#	    warn "unknown destination '$dest'\n";
-#	    next;
-#	}
 
 	$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;
+	};
+	if (my $err = $@) {
+	    warn $err;
+	    next;
+
+	}
+
 
 	my $rule = {
 	    action => $action,
@@ -401,14 +639,32 @@ sub parse_fw_rules {
 	    iface => $iface,
 	    source => $source,
 	    dest => $dest,
+	    nbsource => $nbsource,
+	    nbdest => $nbdest,
 	    proto => $proto,
 	    dport => $dport,
 	    sport => $sport,
+	    nbdport => $nbdport,
+	    nbsport => $nbsport,
+
 	};
 
 	push @{$res->{$section}}, $rule;
     }
 
+    die "security group $group don't exist" if $group && !$securitygroupexist;
+    return $res;
+}
+
+sub run_locked {
+    my ($code, @param) = @_;
+
+    my $timeout = 10;
+
+    my $res = lock_file($pve_fw_lock_filename, $timeout, $code, @param);
+
+    die $@ if $@;
+
     return $res;
 }
 
@@ -421,7 +677,7 @@ sub read_local_vm_config {
     my $list = PVE::QemuServer::config_list();
 
     foreach my $vmid (keys %$list) {
-	# next if $vmid ne '100';
+	#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;
@@ -448,18 +704,12 @@ sub read_vm_firewall_rules {
 }
 
 sub compile {
-
     my $vmdata = read_local_vm_config();
     my $rules = read_vm_firewall_rules($vmdata);
 
     # print Dumper($vmdata);
 
-    my $swdir = '/etc/shorewall';
-    mkdir $swdir;
-
-    &$compile_shorewall($swdir, $vmdata, $rules);
-
-    PVE::Tools::run_command(['shorewall', 'compile']);
+    die "implement me";
 }
 
 sub compile_and_start {
@@ -467,8 +717,7 @@ sub compile_and_start {
 
     compile();
 
-    PVE::Tools::run_command(['shorewall', $restart ? 'restart' : 'start']);
+     die "implement me";  
 }
 
-
 1;