fwtester: fix emulation - correctly set phydev_in

[pve-firewall.git] / test / fwtester.pl

diff --git a/test/fwtester.pl b/test/fwtester.pl
index afbc7f682bbc03d71094257d0995ba108e5eb550..2b577bafd1d92b3b62a508daaacd82c7d0a40071 100755 (executable)
--- a/test/fwtester.pl
+++ b/test/fwtester.pl
@@ -124,24 +124,27 @@ sub ruleset_simulate_chain {
 
     add_trace("ENTER chain $chain\n");
     
+    my $counter = 2; # ENTER + LEAVE = 2
+
     if ($chain eq 'PVEFW-Drop') {
        add_trace("LEAVE chain $chain\n");
-       return 'DROP';
+       return ('DROP', $counter);
     }
     if ($chain eq 'PVEFW-reject') {
        add_trace("LEAVE chain $chain\n");
-       return 'REJECT';
+       return ('REJECT', $counter);
     }
 
     if ($chain eq 'PVEFW-tcpflags') {
        add_trace("LEAVE chain $chain\n");
-       return undef;
+       return (undef, $counter);
     }
 
     my $rules = $ruleset->{$chain} ||
        die "no such chain '$chain'";
 
     foreach my $rule (@$rules) {
+       $counter++;
        my ($goto, $action) = rule_match($chain, $rule, $pkg);
        if (!defined($action)) {
            add_trace("SKIP: $rule\n");
@@ -151,7 +154,7 @@ sub ruleset_simulate_chain {
        
        if ($action eq 'ACCEPT' || $action eq 'DROP' || $action eq 'REJECT') {
            add_trace("TERMINATE chain $chain: $action\n");
-           return $action;
+           return ($action, $counter);
        } elsif ($action eq 'RETURN') {
            add_trace("RETURN FROM chain $chain\n");
            last;
@@ -162,9 +165,9 @@ sub ruleset_simulate_chain {
                #$chain = $action;
                #$rules = $ruleset->{$chain} || die "no such chain '$chain'";
            } else {
-               if ($action = ruleset_simulate_chain($ruleset, $action, $pkg)) {
-                   return $action;
-               }
+               my ($act, $ctr) = ruleset_simulate_chain($ruleset, $action, $pkg);
+               $counter += $ctr;
+               return ($act, $counter) if $act;
                add_trace("CONTINUE chain $chain\n");
            }
        }
@@ -172,10 +175,10 @@ sub ruleset_simulate_chain {
 
     add_trace("LEAVE chain $chain\n");
     if ($chain =~ m/^PVEFW-(INPUT|OUTPUT|FORWARD)$/) {
-       return 'ACCEPT'; # default policy
+       return ('ACCEPT', $counter); # default policy
     }
 
-    return undef;
+    return (undef, $counter);
 }
 
 sub copy_packet {
@@ -199,6 +202,9 @@ sub route_packet {
 
     my $physdev_in;
 
+    my $ipt_invocation_counter = 0;
+    my $rule_check_counter = 0;
+
     while ($route_state ne $target->{iface}) {
 
        my $chain;
@@ -288,6 +294,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') {
 
@@ -296,18 +303,11 @@ sub route_packet {
                $pkg->{iface_out} = 'lo';
                $next_route_state = 'host';
 
-               if ($route_state eq $outside_bridge) {
-
-               } else {
-
-               }
-
            } elsif ($target->{type} eq 'outside') {
 
                $chain = 'PVEFW-FORWARD';
                $pkg->{iface_in} = $route_state;
                $pkg->{iface_out} = $outside_bridge;
-               $pkg->{physdev_in} = $physdev_in;
                # conditionally set physdev_out (same behavior as kernel)
                if ($route_state eq $outside_bridge) {
                    $pkg->{physdev_out} = $outside_iface || die 'internal error';
@@ -326,7 +326,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';
@@ -346,8 +345,10 @@ sub route_packet {
        if ($chain) {
            add_trace("IPT check at $route_state (chain $chain)\n");
            add_trace(Dumper($pkg));
-           my $res = ruleset_simulate_chain($ruleset, $chain, $pkg);
-           return $res if $res ne 'ACCEPT';
+           $ipt_invocation_counter++;
+           my ($res, $ctr) = ruleset_simulate_chain($ruleset, $chain, $pkg);
+           $rule_check_counter += $ctr;
+           return ($res, $ipt_invocation_counter, $rule_check_counter) if $res ne 'ACCEPT';
        } 
 
        $route_state = $next_route_state;
@@ -355,7 +356,7 @@ sub route_packet {
        $physdev_in = $next_physdev_in;
     }
 
-    return 'ACCEPT';
+    return ('ACCEPT', $ipt_invocation_counter, $rule_check_counter);
 }
 
 sub extract_ct_info {
@@ -395,18 +396,21 @@ sub simulate_firewall {
     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 $testid = delete $test->{id};
+    
     die "from/to needs to be different" if $from eq $to;
 
     my $pkg = {
        proto => 'tcp',
-       sport => '1234',
-       dport => '4321',
-       source => '10.11.12.13',
-       dest => '10.11.12.14',
+       sport => undef,
+       dport => undef,
+       source => undef,
+       dest => undef,
     };
 
     while (my ($k,$v) = each %$test) {
+       die "unknown attribute '$k'\n" if !exists($pkg->{$k});
        $pkg->{$k} = $v;
     }
 
@@ -464,8 +468,11 @@ sub simulate_firewall {
        die "implement me";
     }
 
-    my $res = route_packet($ruleset, $ipset_ruleset, $pkg, $from_info, $target, $start_state);
+    my ($res, $ic, $rc) = route_packet($ruleset, $ipset_ruleset, $pkg, 
+                                      $from_info, $target, $start_state);
 
+    add_trace("IPT statistics: invocation = $ic, checks = $rc\n");
+ 
     die "test failed ($res != $action)\n" if $action ne $res;
 
     return undef;