X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FFirewall.pm;h=8eb277cd661f26a088321dc111c2c40381e94c12;hb=5e1267a55ed38388206bc1116b7b68775e8caf72;hp=3d7d9eb4489064cd134fa350b767946182ad5c36;hpb=f6846fbfa921820046054ab65a5eb5f6445e1a43;p=pve-firewall.git

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 3d7d9eb..8eb277c 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -5,50 +5,102 @@ use strict;
 use Data::Dumper;
 use PVE::Tools;
 use PVE::QemuServer;
+use File::Path;
+use IO::File;
+use Data::Dumper;
+
+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";
+my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
 
 my $generate_input_rule = sub {
     my ($zoneinfo, $rule, $net, $netid) = @_;
 
-    die "not implemented" if $rule->{source} ne 'any';
-    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", 
-		   $rule->{proto} || '-', $rule->{dport} || '-', $rule->{sport} || '-');
+
+    my $dest = "$zid:$tap";
+
+    if ($rule->{dest}) {
+	$dest .= ":$rule->{dest}";
+    }
+
+    my $action = $rule->{service} ? 
+	"$rule->{service}($rule->{action})" : $rule->{action};
+
+    my $source;
+
+    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}";
+	} else {
+	    $source = "${zoneref}:$rule->{source}";
+	}
+    } else {
+	$source = "all:$rule->{source}";
+    }
+
+    return sprintf($rule_format, $action, $source, $dest, $rule->{proto} || '-', 
+		   $rule->{dport} || '-', $rule->{sport} || '-');
 };
 
 my $generate_output_rule = sub {
     my ($zoneinfo, $rule, $net, $netid) = @_;
 
-    die "not implemented" if $rule->{source} ne 'any';
-    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}, 
+    my $dest;
+
+    if (!$rule->{dest}) {
+	$dest = 'all';
+    } else {
+	$dest = "all:$rule->{dest}";
+    }
+
+    return sprintf($rule_format, $action, "$zid:$tap", $dest, 
 		   $rule->{proto} || '-', $rule->{dport} || '-', $rule->{sport} || '-');
 };
 
 # we need complete VM configuration of all VMs (openvz/qemu)
 # in vmdata
 
-sub compile {
+my $compile_shorewall = sub {
     my ($targetdir, $vmdata, $rules) = @_;
 
+    # remove existing data ?
+    foreach my $file (qw(params zones rules interfaces  maclist  policy)) {
+	unlink "$targetdir/$file";
+    }
+
     my $netinfo;
 
     my $zoneinfo = {
 	fw => { type => 'firewall' },
     };
 
+    my $maclist = {};
+
     my $register_bridge;
 
     $register_bridge = sub {
@@ -58,9 +110,26 @@ sub compile {
 
 	return $zone if $zoneinfo->{$zone};
 
+	my $ext_zone = "z${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);
@@ -99,6 +168,7 @@ sub compile {
 
 	    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;
 	}
@@ -123,25 +193,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";
 	}
@@ -153,24 +232,32 @@ 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', "# $z");
-
+	    $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";
-		$out .= sprintf($format, $zid, $iftxt, '', '', "# $z");
+
+		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";
@@ -181,10 +268,23 @@ sub compile {
 
     PVE::Tools::file_set_contents("$targetdir/interfaces", $out);
 
+    # dump maclist
+    PVE::Tools::file_set_contents("$targetdir/maclist", $macs);
+
     # dump policy
 
     $format = "%-15s %-15s %-15s %s\n";
     $out = sprintf($format, '#SOURCE', 'DEST', 'POLICY', 'LOG');
+    $out .= sprintf($format, 'fw', 'all', 'ACCEPT', '');
+
+    # 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');
 
     PVE::Tools::file_set_contents("$targetdir/policy", $out);
@@ -194,21 +294,26 @@ 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};
-		    next if !($rule->{iface} eq 'any' || $rule->{iface} eq $netid);
+		    next if $rule->{iface} && $rule->{iface} ne $netid;
 		    $out .= &$generate_input_rule($zoneinfo, $rule, $net, $netid);
 		}
 	    }
 	}
 
-	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};
-		    next if !($rule->{iface} eq 'any' || $rule->{iface} eq $netid);
+		    next if $rule->{iface} && $rule->{iface} ne $netid;
 		    $out .= &$generate_output_rule($zoneinfo, $rule, $net, $netid);
 		}
 	    }
@@ -216,12 +321,151 @@ sub compile {
     }
 
     PVE::Tools::file_set_contents("$targetdir/rules", $out);
+};
+
+
+sub parse_fw_rules {
+    my ($filename, $fh) = @_;
+
+    my $section;
+
+    my $res = { in => [], out => [] };
+
+    my $macros = PVE::Firewall::get_shorewall_macros();
+
+    while (defined(my $line = <$fh>)) {
+	next if $line =~ m/^#/;
+	next if $line =~ m/^\s*$/;
+
+	if ($line =~ m/^\[(in|out)\]\s*$/i) {
+	    $section = lc($1);
+	    next;
+	}
+	next if !$section;
+
+	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)$/) {
+	    # 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;
+	}
+
+	$iface = undef if $iface && $iface eq '-';
+	if ($iface && $iface !~ m/^(net0|net1|net2|net3|net4|net5)$/) {
+	    warn "unknown interface '$iface'\n";
+	    next;
+	}
+
+	$proto = undef if $proto && $proto eq '-';
+	if ($proto && $proto !~ m/^(icmp|tcp|udp)$/) {
+	    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 $rule = {
+	    action => $action,
+	    service => $service,
+	    iface => $iface,
+	    source => $source,
+	    dest => $dest,
+	    proto => $proto,
+	    dport => $dport,
+	    sport => $sport,
+	};
+
+	push @{$res->{$section}}, $rule;
+    }
+
+    return $res;
+}
+
+sub read_local_vm_config {
+
+    my $openvz = {};
+
+    my $qemu = {};
+
+    my $list = PVE::QemuServer::config_list();
+
+    foreach my $vmid (keys %$list) {
+	# next if $vmid ne '100';
+	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 {
+    my ($vmdata) = @_;
+    my $rules = {};
+    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_fw_rules($filename, $fh);
+    }
+
+    return $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']);
 }
 
+sub compile_and_start {
+    my ($restart) = @_;
 
-sub activate {
+    compile();
 
+    PVE::Tools::run_command(['shorewall', $restart ? 'restart' : 'start']);
 }