X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=test%2Ffwtester.pl;h=c7b9f8b7ab9c33293271e5b82a9e06f42415f541;hb=db990d66c74060a9602c57fd023c70cc825ca008;hp=af25014efe8f6a61e041f8f5ae3a0bf01b8a113a;hpb=c0c871d8584339d0f13a8749c2900b8539e9f282;p=pve-firewall.git diff --git a/test/fwtester.pl b/test/fwtester.pl index af25014..c7b9f8b 100755 --- a/test/fwtester.pl +++ b/test/fwtester.pl @@ -11,12 +11,6 @@ use File::Basename; 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 { @@ -224,24 +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'; - } 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 +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; - - } 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 +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; - # 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') { @@ -457,12 +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} = '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); @@ -478,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; @@ -486,12 +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} = '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); @@ -507,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, @@ -573,14 +556,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 => {