X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=test%2Ffwtester.pl;h=04f137f4c6caee70afdb34bebe467ca0c8174d4b;hb=47ece390a9ad198f5b37effd64769dc78ffae3bf;hp=9aa3c480627b88471012f615ccee9a44abdd9f70;hpb=111cce513df68735da1cd111ec3f28b0cdb2f9c1;p=pve-firewall.git

diff --git a/test/fwtester.pl b/test/fwtester.pl
index 9aa3c48..04f137f 100755
--- a/test/fwtester.pl
+++ b/test/fwtester.pl
@@ -11,9 +11,6 @@ use File::Basename;
 my $mark;
 my $trace;
 
-my $outside_iface = 'eth0';
-my $outside_bridge = 'vmbr0';
-
 my $debug = 0;
 
 sub print_usage_and_exit {
@@ -37,6 +34,13 @@ sub add_trace {
     }
 }
 
+sub nf_dev_match {
+    my ($devre, $dev) = @_;
+
+    $devre =~ s/\+$/\.\*/;
+    return  ($dev =~ m/^${devre}$/) ? 1 : 0;
+}
+
 sub rule_match {
     my ($chain, $rule, $pkg) = @_;
 
@@ -51,12 +55,14 @@ sub rule_match {
     }
 
     if ($rule =~ s/^-i (\S+)\s*//) {
+	my $devre = $1;
 	die "missing iface_in" if !$pkg->{iface_in};
-	return undef if $pkg->{iface_in} ne $1; # no match
+	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 $pkg->{iface_out} ne $1; # no match
+	return undef if !nf_dev_match($devre, $pkg->{iface_out});
     }
 
     if ($rule =~ s/^-p (tcp|udp)\s*//) {
@@ -91,16 +97,14 @@ sub rule_match {
 
     if ($rule =~ s/^-m physdev --physdev-is-bridged --physdev-in (\S+)\s*//) {
 	my $devre = $1;
-	$devre =~ s/\+/\.\*/;
 	return undef if !$pkg->{physdev_in};
-	return undef if $pkg->{physdev_in} !~ m/^${devre}$/;
+	return undef if !nf_dev_match($devre, $pkg->{physdev_in});
     }
 
     if ($rule =~ s/^-m physdev --physdev-is-bridged --physdev-out (\S+)\s*//) {
 	my $devre = $1;
-	$devre =~ s/\+/\.\*/;
 	return undef if !$pkg->{physdev_out};
-	return undef if $pkg->{physdev_out} !~ m/^${devre}$/;
+	return undef if !nf_dev_match($devre, $pkg->{physdev_out});
     }
 
     if ($rule =~ s/^-j MARK --set-mark (\d+)\s*$//) {
@@ -124,7 +128,7 @@ sub ruleset_simulate_chain {
 
     add_trace("ENTER chain $chain\n");
     
-    my $counter = 2; # ENTER + LEAVE = 2
+    my $counter = 0;
 
     if ($chain eq 'PVEFW-Drop') {
 	add_trace("LEAVE chain $chain\n");
@@ -214,16 +218,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';
+	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;
+		$pkg->{iface_out} = $target->{bridge} || die 'internal error';
 		$chain = 'PVEFW-OUTPUT';
-		$next_route_state = $outside_iface
+		$next_route_state = $target->{iface} || die 'internal error';
 	    } elsif ($target->{type} eq 'ct') {
 		$pkg->{iface_in} = 'lo';
 		$pkg->{iface_out} = 'venet0';
@@ -247,12 +251,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;
+		$pkg->{iface_out} = $target->{bridge} || die 'internal error';
+		$next_route_state = $target->{iface} || die 'internal error';
 
 	    } elsif ($target->{type} eq 'vm') {
 
@@ -294,6 +298,7 @@ sub route_packet {
 	} elsif ($route_state =~ m/^vmbr\d+$/) {
 	    
 	    die "missing physdev_in - internal error?" if !$physdev_in;
+	    $pkg->{physdev_in} = $physdev_in;
 
 	    if ($target->{type} eq 'host') {
 
@@ -302,17 +307,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;
-		$pkg->{physdev_in} = $physdev_in;
+		$pkg->{iface_out} = $target->{bridge} || die 'internal error';
 		# conditionally set physdev_out (same behavior as kernel)
-		if ($route_state eq $outside_bridge) {
-		    $pkg->{physdev_out} = $outside_iface || die 'internal error';
+		if ($route_state eq $target->{bridge}) {
+		    $pkg->{physdev_out} = $target->{iface} || die 'internal error';
 		}
-		$next_route_state = $outside_iface;
+		$next_route_state = $target->{iface};
 
 	    } elsif ($target->{type} eq 'ct') {
 
@@ -326,7 +330,6 @@ sub route_packet {
 		$chain = 'PVEFW-FORWARD';
 		$pkg->{iface_in} = $route_state;
 		$pkg->{iface_out} = $target->{bridge};
-		$pkg->{physdev_in} = $physdev_in;
 		# conditionally set physdev_out (same behavior as kernel)
 		if ($route_state eq $target->{bridge}) {
 		    $pkg->{physdev_out} = $target->{fwpr} || die 'internal error';
@@ -422,9 +425,21 @@ 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} = '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);
@@ -440,7 +455,7 @@ sub simulate_firewall {
 	$start_state = 'fwbr-out'; 
 	$pkg->{mac_source} = $from_info->{macaddr};
     } else {
-	die "implement me";
+	die "unable to parse \"from => '$from'\"\n";
     }
 
     my $target;
@@ -448,9 +463,18 @@ sub simulate_firewall {
     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} = 'bport';
+	$target->{bridge} = 'vmbr0';
+	$target->{iface} = 'tapXYZ';
     } elsif ($to =~ m/^ct(\d+)$/) {
 	my $vmid = $1;
 	$target = extract_ct_info($vmdata, $vmid);
@@ -466,7 +490,7 @@ sub simulate_firewall {
 	$target = extract_vm_info($vmdata, $vmid);
 	$target->{iface} = $target->{tapdev};
     } else {
-	die "implement me";
+	die "unable to parse \"to => '$to'\"\n";
     }
 
     my ($res, $ic, $rc) = route_packet($ruleset, $ipset_ruleset, $pkg,