X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=test%2Ffwtester.pl;h=0cedfa7fae9a26ecbc41a2d58786bc1f9b9df8a4;hp=36b38bc9979f48d3b3e4d323ca4a4f876d74f2ed;hb=93be433387be21e7a26495065da3a32bb79b334a;hpb=49e9d9a5dba2b29787a7b35b46f34f6138ebf519

diff --git a/test/fwtester.pl b/test/fwtester.pl
index 36b38bc..0cedfa7 100755
--- a/test/fwtester.pl
+++ b/test/fwtester.pl
@@ -7,16 +7,11 @@ use Data::Dumper;
 use PVE::Firewall;
 use Getopt::Long;
 use File::Basename;
+use Net::IP;
 
 my $mark;
 my $trace;
 
-my $outside_iface = 'eth0';
-my $outside_bridge = 'vmbr0';
-
-my $nfvm_iface = 'tapXYZ';
-my $nfvm_bridge = 'vmbr0';
-
 my $debug = 0;
 
 sub print_usage_and_exit {
@@ -47,90 +42,156 @@ sub nf_dev_match {
     return  ($dev =~ m/^${devre}$/) ? 1 : 0;
 }
 
+sub ipset_match {
+    my ($ipsetname, $ipset, $ipaddr) = @_;
+
+    my $ip = Net::IP->new($ipaddr);
+
+    foreach my $entry (@$ipset) {
+	next if $entry =~ m/^create/; # simply ignore
+	if ($entry =~ m/add \S+ (\S+)$/) {
+	    my $test = Net::IP->new($1);
+	    if ($test->overlaps($ip)) {
+		add_trace("IPSET $ipsetname match $ipaddr\n");
+		return 1;
+	    }
+	} else {
+	    die "implement me";
+	}
+    }
+
+    return 0;
+}
+
 sub rule_match {
-    my ($chain, $rule, $pkg) = @_;
+    my ($ipset_ruleset, $chain, $rule, $pkg) = @_;
 
     $rule =~ s/^-A $chain // || die "got strange rule: $rule";
 
-    if ($rule =~ s/^-m conntrack\s*//) {
-	return undef; # simply ignore
-    }
+    while (length($rule)) {
 
-    if ($rule =~ s/^-m addrtype\s*//) {
-	return undef; # simply ignore
-    }
+	if ($rule =~ s/^-m conntrack\s*//) {
+	    return undef; # simply ignore
+	}
 
-    if ($rule =~ s/^-i (\S+)\s*//) {
-	my $devre = $1;
-	die "missing iface_in" if !$pkg->{iface_in};
-	return undef if !nf_dev_match($devre, $pkg->{iface_in});
-    }
-    if ($rule =~ s/^-o (\S+)\s*//) {
-	my $devre = $1;
-	die "missing iface_out" if !$pkg->{iface_out};
-	return undef if !nf_dev_match($devre, $pkg->{iface_out});
-    }
+	if ($rule =~ s/^-m addrtype\s*//) {
+	    return undef; # simply ignore
+	}
 
-    if ($rule =~ s/^-p (tcp|udp)\s*//) {
-	die "missing proto" if !$pkg->{proto};
-	return undef if $pkg->{proto} ne $1; # no match
-    }
+	if ($rule =~ s/^-i (\S+)\s*//) {
+	    my $devre = $1;
+	    die "missing iface_in" if !$pkg->{iface_in};
+	    return undef if !nf_dev_match($devre, $pkg->{iface_in});
+	    next;
+	}
 
-    if ($rule =~ s/^--dport (\d+):(\d+)\s*//) {
-	die "missing dport" if !$pkg->{dport};
-	return undef if ($pkg->{dport} < $1) || ($pkg->{dport} > $2); # no match
-    }
+	if ($rule =~ s/^-o (\S+)\s*//) {
+	    my $devre = $1;
+	    die "missing iface_out" if !$pkg->{iface_out};
+	    return undef if !nf_dev_match($devre, $pkg->{iface_out});
+	    next;
+	}
 
-    if ($rule =~ s/^--dport (\d+)\s*//) {
-	die "missing dport" if !$pkg->{dport};
-	return undef if $pkg->{dport} != $1; # no match
-    }
+	if ($rule =~ s/^-p (tcp|udp)\s*//) {
+	    die "missing proto" if !$pkg->{proto};
+	    return undef if $pkg->{proto} ne $1; # no match
+	    next;
+	}
 
-    if ($rule =~ s/^-s (\S+)\s*//) {
-	die "missing source" if !$pkg->{source};
-	return undef if $pkg->{source} ne $1; # no match
-    }
+	if ($rule =~ s/^--dport (\d+):(\d+)\s*//) {
+	    die "missing dport" if !$pkg->{dport};
+	    return undef if ($pkg->{dport} < $1) || ($pkg->{dport} > $2); # no match
+	    next;
+	}
+
+	if ($rule =~ s/^--dport (\d+)\s*//) {
+	    die "missing dport" if !$pkg->{dport};
+	    return undef if $pkg->{dport} != $1; # no match
+	    next;
+	}
+
+	if ($rule =~ s/^-s (\S+)\s*//) {
+	    die "missing source" if !$pkg->{source};
+	    my $ip = Net::IP->new($1);
+	    return undef if !$ip->overlaps(Net::IP->new($pkg->{source})); # no match
+	    next;
+	}
     
-    if ($rule =~ s/^-d (\S+)\s*//) {
-	die "missing destination" if !$pkg->{dest};
-	return undef if $pkg->{dest} ne $1; # no match
-    }
+	if ($rule =~ s/^-d (\S+)\s*//) {
+	    die "missing destination" if !$pkg->{dest};
+	    my $ip = Net::IP->new($1);
+	    return undef if !$ip->overlaps(Net::IP->new($pkg->{dest})); # no match
+	    next;
+	}
 
-    if ($rule =~ s/^-m mac ! --mac-source (\S+)\s*//) {
-	die "missing source mac" if !$pkg->{mac_source};
-	return undef if $pkg->{mac_source} eq $1; # no match
-    }
+	if ($rule =~ s/^-m set --match-set (\S+) src\s*//) {
+	    die "missing source" if !$pkg->{source};
+	    my $ipset = $ipset_ruleset->{$1};
+	    die "no such ip set '$1'" if !$ipset;
+	    return undef if !ipset_match($1, $ipset, $pkg->{source});
+	    next;
+	}
 
-    if ($rule =~ s/^-m physdev --physdev-is-bridged --physdev-in (\S+)\s*//) {
-	my $devre = $1;
-	return undef if !$pkg->{physdev_in};
-	return undef if !nf_dev_match($devre, $pkg->{physdev_in});
-    }
+	if ($rule =~ s/^-m set --match-set (\S+) dst\s*//) {
+	    die "missing destination" if !$pkg->{dest};
+	    my $ipset = $ipset_ruleset->{$1};
+	    die "no such ip set '$1'" if !$ipset;
+	    return undef if !ipset_match($1, $ipset, $pkg->{dest});
+	    next;
+	}
 
-    if ($rule =~ s/^-m physdev --physdev-is-bridged --physdev-out (\S+)\s*//) {
-	my $devre = $1;
-	return undef if !$pkg->{physdev_out};
-	return undef if !nf_dev_match($devre, $pkg->{physdev_out});
-    }
+	if ($rule =~ s/^-m mac ! --mac-source (\S+)\s*//) {
+	    die "missing source mac" if !$pkg->{mac_source};
+	    return undef if $pkg->{mac_source} eq $1; # no match
+	    next;
+	}
 
-    if ($rule =~ s/^-j MARK --set-mark (\d+)\s*$//) {
-	$mark = $1;
-	return undef;
-    }
+	if ($rule =~ s/^-m physdev --physdev-is-bridged --physdev-in (\S+)\s*//) {
+	    my $devre = $1;
+	    return undef if !$pkg->{physdev_in};
+	    return undef if !nf_dev_match($devre, $pkg->{physdev_in});
+	    next;
+	}
 
-    if ($rule =~ s/^-j (\S+)\s*$//) {
-	return (0, $1);
-    }
+	if ($rule =~ s/^-m physdev --physdev-is-bridged --physdev-out (\S+)\s*//) {
+	    my $devre = $1;
+	    return undef if !$pkg->{physdev_out};
+	    return undef if !nf_dev_match($devre, $pkg->{physdev_out});
+	    next;
+	}
+
+	if ($rule =~ s/^-m mark --mark (\d+)\s*//) {
+	    return undef if !defined($mark) || $mark != $1;
+	    next;
+	}
+
+	# final actions
+
+	if ($rule =~ s/^-j MARK --set-mark (\d+)\s*$//) {
+	    $mark = $1;
+	    return undef;
+	}
+
+	if ($rule =~ s/^-j (\S+)\s*$//) {
+	    return (0, $1);
+	}
+
+	if ($rule =~ s/^-g (\S+)\s*$//) {
+	    return (1, $1);
+	}
 
-    if ($rule =~ s/^-g (\S+)\s*$//) {
-	return (1, $1);
+	if ($rule =~ s/^-j NFLOG --nflog-prefix \"[^\"]+\"$//) {
+	    return undef; 
+	}
+
+	last;
     }
 
     die "unable to parse rule: $rule";
 }
 
 sub ruleset_simulate_chain {
-    my ($ruleset, $chain, $pkg) = @_;
+    my ($ruleset, $ipset_ruleset, $chain, $pkg) = @_;
 
     add_trace("ENTER chain $chain\n");
     
@@ -155,7 +216,7 @@ sub ruleset_simulate_chain {
 
     foreach my $rule (@$rules) {
 	$counter++;
-	my ($goto, $action) = rule_match($chain, $rule, $pkg);
+	my ($goto, $action) = rule_match($ipset_ruleset, $chain, $rule, $pkg);
 	if (!defined($action)) {
 	    add_trace("SKIP: $rule\n");
 	    next;
@@ -171,11 +232,11 @@ sub ruleset_simulate_chain {
 	} else {
 	    if ($goto) {
 		add_trace("LEAVE chain $chain - goto $action\n");
-		return ruleset_simulate_chain($ruleset, $action, $pkg)
+		return ruleset_simulate_chain($ruleset, $ipset_ruleset, $action, $pkg)
 		#$chain = $action;
 		#$rules = $ruleset->{$chain} || die "no such chain '$chain'";
 	    } else {
-		my ($act, $ctr) = ruleset_simulate_chain($ruleset, $action, $pkg);
+		my ($act, $ctr) = ruleset_simulate_chain($ruleset, $ipset_ruleset, $action, $pkg);
 		$counter += $ctr;
 		return ($act, $counter) if $act;
 		add_trace("CONTINUE chain $chain\n");
@@ -224,24 +285,16 @@ sub route_packet {
 	$pkg->{iface_in} = $pkg->{iface_out} = undef;
 	$pkg->{physdev_in} = $pkg->{physdev_out} = undef;
 
-	if ($route_state eq 'from-outside') {
-	    $next_route_state = $outside_bridge || die 'internal error';
-	    $next_physdev_in = $outside_iface || die 'internal error';
-	} elsif ($route_state eq 'from-nfvm') {
-	    $next_route_state = $nfvm_bridge || die 'internal error';
-	    $next_physdev_in = $nfvm_iface || die 'internal error';
+	if ($route_state eq 'from-bport') {
+	    $next_route_state = $from_info->{bridge} || die 'internal error';
+	    $next_physdev_in = $from_info->{iface} || die 'internal error';
 	} elsif ($route_state eq 'host') {
 
-	    if ($target->{type} eq 'outside') {
+	    if ($target->{type} eq 'bport') {
 		$pkg->{iface_in} = 'lo';
-		$pkg->{iface_out} = $outside_bridge;
-		$chain = 'PVEFW-OUTPUT';
-		$next_route_state = $outside_iface
-	    } elsif ($target->{type} eq 'nfvm') {
-		$pkg->{iface_in} = 'lo';
-		$pkg->{iface_out} = $nfvm_bridge;
+		$pkg->{iface_out} = $target->{bridge} || die 'internal error';
 		$chain = 'PVEFW-OUTPUT';
-		$next_route_state = $nfvm_iface
+		$next_route_state = $target->{iface} || die 'internal error';
 	    } elsif ($target->{type} eq 'ct') {
 		$pkg->{iface_in} = 'lo';
 		$pkg->{iface_out} = 'venet0';
@@ -265,19 +318,12 @@ sub route_packet {
 		$pkg->{iface_out} = 'lo';
 		$next_route_state = 'host';
 
-	    } elsif ($target->{type} eq 'outside') {
+	    } elsif ($target->{type} eq 'bport') {
 		
 		$chain = 'PVEFW-FORWARD';
 		$pkg->{iface_in} = 'venet0';
-		$pkg->{iface_out} = $outside_bridge;
-		$next_route_state = $outside_iface;
-
-	    } elsif ($target->{type} eq 'nfvm') {
-		
-		$chain = 'PVEFW-FORWARD';
-		$pkg->{iface_in} = 'venet0';
-		$pkg->{iface_out} = $nfvm_bridge;
-		$next_route_state = $nfvm_iface;
+		$pkg->{iface_out} = $target->{bridge} || die 'internal error';
+		$next_route_state = $target->{iface} || die 'internal error';
 
 	    } elsif ($target->{type} eq 'vm') {
 
@@ -328,27 +374,16 @@ sub route_packet {
 		$pkg->{iface_out} = 'lo';
 		$next_route_state = 'host';
 
-	    } elsif ($target->{type} eq 'outside') {
+	    } elsif ($target->{type} eq 'bport') {
 
 		$chain = 'PVEFW-FORWARD';
 		$pkg->{iface_in} = $route_state;
-		$pkg->{iface_out} = $outside_bridge;
-		# conditionally set physdev_out (same behavior as kernel)
-		if ($route_state eq $outside_bridge) {
-		    $pkg->{physdev_out} = $outside_iface || die 'internal error';
-		}
-		$next_route_state = $outside_iface;
-
-	    } elsif ($target->{type} eq 'nfvm') {
-
-		$chain = 'PVEFW-FORWARD';
-		$pkg->{iface_in} = $route_state;
-		$pkg->{iface_out} = $nfvm_bridge;
+		$pkg->{iface_out} = $target->{bridge} || die 'internal error';
 		# conditionally set physdev_out (same behavior as kernel)
-		if ($route_state eq $nfvm_bridge) {
-		    $pkg->{physdev_out} = $nfvm_iface || die 'internal error';
+		if ($route_state eq $target->{bridge}) {
+		    $pkg->{physdev_out} = $target->{iface} || die 'internal error';
 		}
-		$next_route_state = $nfvm_iface;
+		$next_route_state = $target->{iface};
 
 	    } elsif ($target->{type} eq 'ct') {
 
@@ -382,7 +417,7 @@ sub route_packet {
 	    add_trace("IPT check at $route_state (chain $chain)\n");
 	    add_trace(Dumper($pkg));
 	    $ipt_invocation_counter++;
-	    my ($res, $ctr) = ruleset_simulate_chain($ruleset, $chain, $pkg);
+	    my ($res, $ctr) = ruleset_simulate_chain($ruleset, $ipset_ruleset, $chain, $pkg);
 	    $rule_check_counter += $ctr;
 	    return ($res, $ipt_invocation_counter, $rule_check_counter) if $res ne 'ACCEPT';
 	} 
@@ -429,11 +464,11 @@ sub extract_vm_info {
 sub simulate_firewall {
     my ($ruleset, $ipset_ruleset, $vmdata, $test) = @_;
 
-    my $from = delete $test->{from} || die "missing 'from' field";
-    my $to = delete $test->{to} || die "missing 'to' field";
-    my $action = delete $test->{action} || die "missing 'action'";
+    my $from = $test->{from} || die "missing 'from' field";
+    my $to = $test->{to} || die "missing 'to' field";
+    my $action = $test->{action} || die "missing 'action'";
     
-    my $testid = delete $test->{id};
+    my $testid = $test->{id};
     
     die "from/to needs to be different" if $from eq $to;
 
@@ -446,6 +481,10 @@ sub simulate_firewall {
     };
 
     while (my ($k,$v) = each %$test) {
+	next if $k eq 'from';
+	next if $k eq 'to';
+	next if $k eq 'action';
+	next if $k eq 'id';
 	die "unknown attribute '$k'\n" if !exists($pkg->{$k});
 	$pkg->{$k} = $v;
     }
@@ -457,17 +496,26 @@ sub simulate_firewall {
     if ($from eq 'host') {
 	$from_info->{type} = 'host';
 	$start_state = 'host';
+    } elsif ($from =~ m|^(vmbr\d+)/(\S+)$|) {
+	$from_info->{type} = 'bport';
+	$from_info->{bridge} = $1;
+	$from_info->{iface} = $2;
+	$start_state = 'from-bport';
     } elsif ($from eq 'outside') {
-	$from_info->{type} = 'outside';
-	$start_state = 'from-outside';
+	$from_info->{type} = 'bport';
+	$from_info->{bridge} = 'vmbr0';
+	$from_info->{iface} = 'eth0';
+	$start_state = 'from-bport';
     } elsif ($from eq 'nfvm') {
-	$from_info->{type} = 'nfvm';
-	$start_state = 'from-nfvm';
+	$from_info->{type} = 'bport';
+	$from_info->{bridge} = 'vmbr0';
+	$from_info->{iface} = 'tapXYZ';
+	$start_state = 'from-bport';
     } elsif ($from =~ m/^ct(\d+)$/) {
 	my $vmid = $1;
 	$from_info = extract_ct_info($vmdata, $vmid);
 	if ($from_info->{ip_address}) {
-	    $pkg->{source} = $from_info->{ip_address};
+	    $pkg->{source} = $from_info->{ip_address} if !defined($pkg->{source});
 	    $start_state = 'venet-out';
 	} else {
 	    die "implement me";
@@ -481,17 +529,25 @@ sub simulate_firewall {
 	die "unable to parse \"from => '$from'\"\n";
     }
 
+    $pkg->{source} = '100.200.3.4' if !defined($pkg->{source});
+
     my $target;
 
     if ($to eq 'host') {
 	$target->{type} = 'host';
 	$target->{iface} = 'host';
+    } elsif ($to =~ m|^(vmbr\d+)/(\S+)$|) {
+	$target->{type} = 'bport';
+	$target->{bridge} = $1;
+	$target->{iface} = $2;
     } elsif ($to eq 'outside') {
-	$target->{type} = 'outside';
-	$target->{iface} = $outside_iface;
+	$target->{type} = 'bport';
+	$target->{bridge} = 'vmbr0';
+	$target->{iface} = 'eth0';
      } elsif ($to eq 'nfvm') {
-	$target->{type} = 'nfvm';
-	$target->{iface} = $nfvm_iface;
+	$target->{type} = 'bport';
+	$target->{bridge} = 'vmbr0';
+	$target->{iface} = 'tapXYZ';
     } elsif ($to =~ m/^ct(\d+)$/) {
 	my $vmid = $1;
 	$target = extract_ct_info($vmdata, $vmid);
@@ -545,7 +601,28 @@ sub run_tests {
 	    $trace = '';
 	    print Dumper($ruleset) if $debug;
 	    $testcount++;
-	    eval { simulate_firewall($ruleset, $ipset_ruleset, $vmdata, $test); };
+	    eval {
+		my @test_zones = qw(host outside nfvm vm100 ct200);
+		if (!defined($test->{from}) && !defined($test->{to})) {
+		    die "missing zone speification (from, to)\n";
+		} elsif (!defined($test->{to})) {
+		    foreach my $zone (@test_zones) {
+			next if $zone eq $test->{from};
+			$test->{to} = $zone;
+			add_trace("Set Zone: to => '$zone'\n"); 
+			simulate_firewall($ruleset, $ipset_ruleset, $vmdata, $test);
+		    }
+		} elsif (!defined($test->{from})) {
+		    foreach my $zone (@test_zones) {
+			next if $zone eq $test->{to};
+			$test->{from} = $zone;
+			add_trace("Set Zone: from => '$zone'\n"); 
+			simulate_firewall($ruleset, $ipset_ruleset, $vmdata, $test);
+		    }
+		} else {
+		    simulate_firewall($ruleset, $ipset_ruleset, $vmdata, $test);
+		}
+	    };
 	    if (my $err = $@) {
 
 		print Dumper($ruleset) if !$debug;
@@ -573,14 +650,14 @@ sub run_tests {
 my $vmdata = {
     qemu => {
 	100 => {
-	    net0 => "e1000=0E:0B:38:B8:B3:21,bridge=vmbr0",
+	    net0 => "e1000=0E:0B:38:B8:B3:21,bridge=vmbr0,firewall=1",
 	},
 	101 => {
-	    net0 => "e1000=0E:0B:38:B8:B3:22,bridge=vmbr0",
+	    net0 => "e1000=0E:0B:38:B8:B3:22,bridge=vmbr0,firewall=1",
 	},
 	# on bridge vmbr1
 	110 => {
-	    net0 => "e1000=0E:0B:38:B8:B4:21,bridge=vmbr1",
+	    net0 => "e1000=0E:0B:38:B8:B4:21,bridge=vmbr1,firewall=1",
 	},
     },
     openvz => {