improve error messages

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

diff --git a/test/fwtester.pl b/test/fwtester.pl
index 555e1516700ad15769450adbec98c4b27bff96cf..36b38bc9979f48d3b3e4d323ca4a4f876d74f2ed 100755 (executable)
--- a/test/fwtester.pl
+++ b/test/fwtester.pl
@@ -14,6 +14,9 @@ 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 {
@@ -37,6 +40,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 +61,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 +103,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,24 +134,27 @@ sub ruleset_simulate_chain {
 
     add_trace("ENTER chain $chain\n");
     
+    my $counter = 0;
+
     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 +164,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 +175,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 +185,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 +212,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;
@@ -211,6 +227,9 @@ sub route_packet {
        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';
        } elsif ($route_state eq 'host') {
 
            if ($target->{type} eq 'outside') {
@@ -218,6 +237,11 @@ sub route_packet {
                $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;
+               $chain = 'PVEFW-OUTPUT';
+               $next_route_state = $nfvm_iface
            } elsif ($target->{type} eq 'ct') {
                $pkg->{iface_in} = 'lo';
                $pkg->{iface_out} = 'venet0';
@@ -248,6 +272,13 @@ sub route_packet {
                $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;
+
            } elsif ($target->{type} eq 'vm') {
 
                $chain = 'PVEFW-FORWARD';
@@ -288,6 +319,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,24 +328,28 @@ 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';
                }
                $next_route_state = $outside_iface;
 
+           } elsif ($target->{type} eq 'nfvm') {
+
+               $chain = 'PVEFW-FORWARD';
+               $pkg->{iface_in} = $route_state;
+               $pkg->{iface_out} = $nfvm_bridge;
+               # conditionally set physdev_out (same behavior as kernel)
+               if ($route_state eq $nfvm_bridge) {
+                   $pkg->{physdev_out} = $nfvm_iface || die 'internal error';
+               }
+               $next_route_state = $nfvm_iface;
+
            } elsif ($target->{type} eq 'ct') {
 
                $chain = 'PVEFW-FORWARD';
@@ -326,7 +362,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 +381,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 +392,7 @@ sub route_packet {
        $physdev_in = $next_physdev_in;
     }
 
-    return 'ACCEPT';
+    return ('ACCEPT', $ipt_invocation_counter, $rule_check_counter);
 }
 
 sub extract_ct_info {
@@ -423,6 +460,9 @@ sub simulate_firewall {
     } elsif ($from eq 'outside') {
        $from_info->{type} = 'outside';
        $start_state = 'from-outside';
+    } elsif ($from eq 'nfvm') {
+       $from_info->{type} = 'nfvm';
+       $start_state = 'from-nfvm';
     } elsif ($from =~ m/^ct(\d+)$/) {
        my $vmid = $1;
        $from_info = extract_ct_info($vmdata, $vmid);
@@ -438,7 +478,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;
@@ -449,6 +489,9 @@ sub simulate_firewall {
     } elsif ($to eq 'outside') {
        $target->{type} = 'outside';
        $target->{iface} = $outside_iface;
+     } elsif ($to eq 'nfvm') {
+       $target->{type} = 'nfvm';
+       $target->{iface} = $nfvm_iface;
     } elsif ($to =~ m/^ct(\d+)$/) {
        my $vmid = $1;
        $target = extract_ct_info($vmdata, $vmid);
@@ -464,11 +507,14 @@ 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 = 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;