holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Tighten up source and dest checking in expand_rule()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-07-09 06:50:23 -07:00
parent 1f30976790
commit 6c802d3353
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -3910,7 +3910,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# #
# Isolate Source Interface, if any # Isolate Source Interface, if any
# #
if ( $source ) { if ( supplied $source ) {
if ( $source eq '-' ) { if ( $source eq '-' ) {
$source = ''; $source = '';
} elsif ( $family == F_IPV4 ) { } elsif ( $family == F_IPV4 ) {
@ -3945,7 +3945,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# #
# Verify Interface, if any # Verify Interface, if any
# #
if ( $iiface ) { if ( supplied $iiface ) {
fatal_error "Unknown Interface ($iiface)" unless known_interface $iiface; fatal_error "Unknown Interface ($iiface)" unless known_interface $iiface;
if ( $restriction & POSTROUTE_RESTRICT ) { if ( $restriction & POSTROUTE_RESTRICT ) {
@ -3981,7 +3981,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# #
# Isolate Destination Interface, if any # Isolate Destination Interface, if any
# #
if ( $dest ) { if ( supplied $dest ) {
if ( $dest eq '-' ) { if ( $dest eq '-' ) {
$dest = ''; $dest = '';
} elsif ( ( $restriction & PREROUTE_RESTRICT ) && $dest =~ /^detect:(.*)$/ ) { } elsif ( ( $restriction & PREROUTE_RESTRICT ) && $dest =~ /^detect:(.*)$/ ) {
@ -4044,7 +4044,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# #
# Verify Destination Interface, if any # Verify Destination Interface, if any
# #
if ( $diface ) { if ( supplied $diface ) {
fatal_error "Unknown Interface ($diface)" unless known_interface $diface; fatal_error "Unknown Interface ($diface)" unless known_interface $diface;
if ( $restriction & PREROUTE_RESTRICT ) { if ( $restriction & PREROUTE_RESTRICT ) {