X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FFirewall.pm;h=612e7f91400e16bf3ff8ba9ab6d046599da60621;hb=a8195f4f42e2c9812afa37134bfa4482f4295a21;hp=2e1f1e214283ef39b4dfbe494f096f9c77a21d63;hpb=80bfe1ffd8b9248aaf6800ae7acc60754b9a8ca1;p=pve-firewall.git

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 2e1f1e2..612e7f9 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -6,6 +6,19 @@ use Data::Dumper;
 use PVE::Tools;
 use PVE::QemuServer;
 
+my $macros;
+sub get_shorewall_macros {
+
+    return $macros if $macros;
+
+    foreach my $path (</usr/share/shorewall/macro.*>) {
+	if ($path =~ m|/macro\.(\S+)$|) {
+	    $macros->{$1} = 1;
+	}
+    }
+    return $macros;
+}
+
 
 my $rule_format = "%-15s %-15s %-15s %-15s %-15s %-15s\n";
 
@@ -16,10 +29,13 @@ my $generate_input_rule = sub {
     die "not implemented" if $rule->{dest} ne 'any';
 
     my $zone = $net->{zone} || die "internal error";
-    my $zid = $zoneinfo->{$zone}->{id} || die "internal error";
+    my $zid = $zoneinfo->{$zone}->{zoneref} || die "internal error";
     my $tap = $net->{tap} || die "internal error";
-    
-    return sprintf($rule_format, $rule->{action}, $rule->{source}, "$zid:$tap", 
+
+    my $action = $rule->{service} ? 
+	"$rule->{service}($rule->{action})" : $rule->{action};
+
+    return sprintf($rule_format, $action, $rule->{source}, "$zid:$tap", 
 		   $rule->{proto} || '-', $rule->{dport} || '-', $rule->{sport} || '-');
 };
 
@@ -30,10 +46,13 @@ my $generate_output_rule = sub {
     die "not implemented" if $rule->{dest} ne 'any';
 
     my $zone = $net->{zone} || die "internal error";
-    my $zid = $zoneinfo->{$zone}->{id} || die "internal error";
+    my $zid = $zoneinfo->{$zone}->{zoneref} || die "internal error";
     my $tap = $net->{tap} || die "internal error";
+
+    my $action = $rule->{service} ? 
+	"$rule->{service}($rule->{action})" : $rule->{action};
     
-    return sprintf($rule_format, $rule->{action}, "$zid:$tap", $rule->{dest}, 
+    return sprintf($rule_format, $action, "$zid:$tap", $rule->{dest}, 
 		   $rule->{proto} || '-', $rule->{dport} || '-', $rule->{sport} || '-');
 };
 
@@ -44,7 +63,7 @@ sub compile {
     my ($targetdir, $vmdata, $rules) = @_;
 
     # remove existing data ?
-    foreach my $file (qw(zones rules interfaces  maclist  policy)) {
+    foreach my $file (qw(params zones rules interfaces  maclist  policy)) {
 	unlink "$targetdir/$file";
     }
 
@@ -131,25 +150,34 @@ sub compile {
 
     foreach my $z (sort keys %$zoneinfo) {
 	$zoneinfo->{$z}->{id} = &$lookup_zonename($z);
+	$zoneinfo->{$z}->{zonevar} = uc($z);
+ 	$zoneinfo->{$z}->{zoneref} = '$' . $zoneinfo->{$z}->{zonevar};
     }
 
-    # dump zone file
-
     my $out;
 
-    my $format = "%-15s %-10s %-15s %s\n";
-    $out = sprintf($format, '#ZONE', 'TYPE', 'OPTIONS', '');
+    # 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);
+
+    # dump zone file
+
+    my $format = "%-30s %-10s %-15s\n";
+    $out = sprintf($format, '#ZONE', 'TYPE', 'OPTIONS');
     
     foreach my $z (sort keys %$zoneinfo) {
-	my $zid = $zoneinfo->{$z}->{id};
+	my $zid = $zoneinfo->{$z}->{zoneref};
 	if ($zoneinfo->{$z}->{type} eq 'firewall') {
-	    $out .= sprintf($format, $zid, $zoneinfo->{$z}->{type}, '' , "# $z");
+	    $out .= sprintf($format, $zid, $zoneinfo->{$z}->{type}, '');
 	} elsif ($zoneinfo->{$z}->{type} eq 'bridge') {
-	    $out .= sprintf($format, $zid, 'ipv4', '', "# $z");
+	    $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}->{id} || die "internal error";
-	    $out .= sprintf($format, "$zid:$bzid", 'bport', '', "# $z");
+	    my $bzid = $zoneinfo->{$bridge_zone}->{zoneref} || die "internal error";
+	    $out .= sprintf($format, "$zid:$bzid", 'bport', '');
 	} else {
 	    die "internal error";
 	}
@@ -161,19 +189,19 @@ sub compile {
 
     # dump interfaces
 
-    $format = "%-15s %-20s %-10s %-15s %s\n";
-    $out = sprintf($format, '#ZONE', 'INTERFACE', 'BROADCAST', 'OPTIONS', '');
+    $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}->{id};
+	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', "# $z");
+	    $out .= sprintf($format, $zid, $bridge, 'detect', 'bridge,optional');
 
 	} elsif ($zoneinfo->{$z}->{type} eq 'bport') {
 	    my $ifaces = $zoneinfo->{$z}->{ifaces};
@@ -181,7 +209,7 @@ sub compile {
 		my $bridge_zone = $zoneinfo->{$z}->{bridge_zone} || die "internal error";
 		my $bridge = $zoneinfo->{$bridge_zone}->{bridge} || die "internal error";
 		my $iftxt = "$bridge:$iface";
-		$out .= sprintf($format, $zid, $iftxt, '-', 'maclist', "# $z");
+		$out .= sprintf($format, $zid, $iftxt, '-', 'maclist');
 		$macs .= sprintf($maclist_format, 'ACCEPT', $iface, $maclist->{$iface});
 	    }
 	} else {
@@ -210,7 +238,11 @@ sub compile {
 
     $out = sprintf($rule_format, '#ACTION', 'SOURCE', 'DEST', 'PROTO', 'DPORT', 'SPORT');
     foreach my $vmid (sort keys %$rules) {
-	if (my $inrules = $rules->{$vmid}->{in}) {
+	my $inrules = $rules->{$vmid}->{in};
+	my $outrules = $rules->{$vmid}->{out};
+
+	if (scalar(@$inrules)) {
+	    $out .= "# IN to VM $vmid\n";
 	    foreach my $rule (@$inrules) {
 		foreach my $netid (keys %{$netinfo->{$vmid}}) {
 		    my $net = $netinfo->{$vmid}->{$netid};
@@ -220,7 +252,8 @@ sub compile {
 	    }
 	}
 
-	if (my $outrules = $rules->{$vmid}->{out}) {
+	if (scalar(@$outrules)) {
+	    $out .= "# OUT from VM $vmid\n";
 	    foreach my $rule (@$outrules) {
 		foreach my $netid (keys %{$netinfo->{$vmid}}) {
 		    my $net = $netinfo->{$vmid}->{$netid};