X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=PVE%2FFirewall.pm;h=6a3f225dbc69e7ee523c17833cd33bdb337186ff;hp=8be0c33005de8a6ac28d4f6f9c4f5facdbd9f9f6;hb=1b6a0a59ecf373b94fafbfb5466f33ef3438bbd2;hpb=8cebfa6f274d94b92a34f1cc4dd992a0d751d0df

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 8be0c33..6a3f225 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -5,6 +5,11 @@ use strict;
 use Data::Dumper;
 use PVE::Tools;
 use PVE::QemuServer;
+use File::Path;
+use IO::File;
+use Net::IP;
+
+use Data::Dumper;
 
 my $macros;
 sub get_shorewall_macros {
@@ -19,6 +24,99 @@ sub get_shorewall_macros {
     return $macros;
 }
 
+my $etc_services;
+
+sub get_etc_services {
+
+    return $etc_services if $etc_services;
+
+    my $filename = "/etc/services";
+
+    my $fh = IO::File->new($filename, O_RDONLY);
+    if (!$fh) {
+	warn "unable to read '$filename' - $!\n";
+	return {};
+    }
+
+    my $services = {};
+
+    while (my $line = <$fh>) {
+	chomp ($line);
+	next if $line =~m/^#/;
+	next if ($line =~m/^\s*$/);
+
+	if ($line =~ m!^(\S+)\s+(\S+)/(tcp|udp).*$!) {
+	    $services->{byid}->{$2}->{name} = $1;
+	    $services->{byid}->{$2}->{$3} = 1;
+	    $services->{byname}->{$1} = $services->{byid}->{$2};
+	}
+    }
+
+    close($fh);
+
+    $etc_services = $services;    
+    
+    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};
+	}
+    }
+
+    close($fh);
+
+    $etc_protocols = $protocols;
+
+    return $etc_protocols;
+}
+
+sub parse_address_list {
+    my ($str) = @_;
+
+    foreach my $aor (split(/,/, $str)) {
+	if (!Net::IP->new($aor)) {
+	    my $err = Net::IP::Error();
+	    die "invalid IP address: $err\n";
+	}
+    }
+}
+
+sub parse_port_name_number_or_range {
+    my ($str) = @_;
+
+    my $services = PVE::Firewall::get_etc_services();
+
+    foreach my $item (split(/,/, $str)) {
+	foreach my $pon (split(':', $item, 2)) {
+	    next if $pon =~ m/^\d+$/ && $pon > 0 && $pon < 65536;
+	    next if defined($services->{byname}->{$pon});
+	    die "invalid port '$pon'\n";
+	}
+    }
+
+}
 
 my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
 
@@ -38,23 +136,36 @@ my $generate_input_rule = sub {
     my $action = $rule->{service} ? 
 	"$rule->{service}($rule->{action})" : $rule->{action};
 
-    my $source;
+    my $sources = [];
 
-    if ($zoneinfo->{$zone}->{type} eq 'bport') {
+    if (!$rule->{source}) {
+	push @$sources, 'all'; 
+    } elsif ($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}";
+	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 {
-	$source = "any:$rule->{source}";
+	push @$sources, "all:$rule->{source}";
+    }
+
+    my $out = '';
+
+    foreach my $source (@$sources) {
+	$out .= sprintf($rule_format, $action, $source, $dest, $rule->{proto} || '-', 
+			$rule->{dport} || '-', $rule->{sport} || '-');
     }
 
-    return sprintf($rule_format, $action, $source, $dest, $rule->{proto} || '-', 
-		   $rule->{dport} || '-', $rule->{sport} || '-');
+    return $out;
 };
 
 my $generate_output_rule = sub {
@@ -70,9 +181,9 @@ my $generate_output_rule = sub {
     my $dest;
 
     if (!$rule->{dest}) {
-	$dest = 'any';
+	$dest = 'all';
     } else {
-	$dest = "any:$rule->{dest}";
+	$dest = "all:$rule->{dest}";
     }
 
     return sprintf($rule_format, $action, "$zid:$tap", $dest, 
@@ -82,7 +193,7 @@ my $generate_output_rule = sub {
 # 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 ?
@@ -103,11 +214,11 @@ sub compile {
     $register_bridge = sub {
 	my ($bridge, $vlan) = @_;
 
-	my $zone =  'z' . $bridge;
+	my $zone =  $bridge;
 
 	return $zone if $zoneinfo->{$zone};
 
-	my $ext_zone = "z${bridge}ext";
+	my $ext_zone = "${bridge}_ext";
 
 	$zoneinfo->{$zone} = {
 	    type => 'bridge',
@@ -138,7 +249,7 @@ sub compile {
 	my ($bridge, $vlan, $vmzone, $tap) = @_;
 
 	my $bridge_zone = &$register_bridge($bridge, $vlan);
-	my $zone = $bridge_zone . $vmzone;
+	my $zone = $bridge_zone . '_' . $vmzone;
 
 	if (!$zoneinfo->{$zone}) {
 	    $zoneinfo->{$zone} = {
@@ -299,7 +410,7 @@ sub compile {
 	    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);
 		}
 	    }
@@ -310,7 +421,7 @@ sub compile {
 	    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);
 		}
 	    }
@@ -318,12 +429,156 @@ 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 = get_shorewall_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) {
+	    $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 && !(defined($protocols->{byname}->{$proto}) ||
+			defined($protocols->{byid}->{$proto}))) {
+	    warn "unknown protokol '$proto'\n";
+	    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 '-';
+
+	eval {
+	    parse_address_list($source) if $source;
+	    parse_address_list($dest) if $dest;
+	    parse_port_name_number_or_range($dport) if $dport;
+	    parse_port_name_number_or_range($sport) if $sport;
+	};
+	if (my $err = $@) {
+	    warn $err;
+	    next;
+
+	}
+
+
+	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 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;
+	}
+    }
+
+    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']);
 }