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

Add lookup hash for standard targets

Browse Source
This commit is contained in:
Tom Eastep 2011-01-08 15:29:10 -08:00
parent 8dc60e788f
commit 97bba29c07
2 changed files with 83 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ our %EXPORT_TAGS = (
NOT_RESTORE NOT_RESTORE
initialize_chain_table initialize_chain_table
lookup_shorewall_action
add_commands add_commands
move_rules move_rules
insert_rule1 insert_rule1
@ -179,6 +180,19 @@ our %EXPORT_TAGS = (
$section $section
%sections %sections
%targets %targets
%shorewall_targets
TGT_ACCEPT
TGT_REJECT
TGT_DROP
TGT_NONAT
TGT_LOG
TGT_CONTINUE
TGT_COUNT
TGT_QUEUE
TGT_NFQUEUE
TGT_ADD
TGT_DEL
TGT_REDIRECT
) ], ) ],
); );
@ -266,6 +280,38 @@ use constant { STANDARD => 1, #defined by Netfilter
# Valid Targets -- value is a combination of one or more of the above # Valid Targets -- value is a combination of one or more of the above
# #
our %targets; our %targets;
#
# Shorewall-defined targets
#
use constant { TGT_ACCEPT => 1,
TGT_REJECT => 2,
TGT_DROP => 3,
TGT_NONAT => 4,
TGT_LOG => 5,
TGT_CONTINUE => 6,
TGT_COUNT => 7,
TGT_QUEUE => 8,
TGT_NFQUEUE => 9,
TGT_ADD => 10,
TGT_DEL => 11,
TGT_REDIRECT => 12,
};
our %shorewall_targets = ( ACCEPT => TGT_ACCEPT,
REJECT => TGT_REJECT,
DROP => TGT_DROP,
NONAT => TGT_NONAT,
LOG => TGT_LOG,
CONTINUE => TGT_CONTINUE,
COUNT => TGT_COUNT,
QUEUE => TGT_QUEUE,
NFQUEUE => TGT_NFQUEUE,
ADD => TGT_ADD,
DEL => TGT_DEL,
REDIRECT => TGT_REDIRECT,
);
# #
# expand_rule() restrictions # expand_rule() restrictions
# #
@ -404,6 +450,17 @@ sub initialize( $ ) {
# #
} }
#
# Lookup a standard action
#
sub lookup_shorewall_action( $ ) {
my $target = shift;
$target =~ s/[-+!]$//;
$shorewall_targets{ $target };
}
# #
# Process a COMMENT line (in $currentline) # Process a COMMENT line (in $currentline)
# #

50
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1020,31 +1020,33 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$ ) {
# #
my $log_action = $action; my $log_action = $action;
if ( $actiontype & REDIRECT ) { if ( my $shorewall_target = lookup_shorewall_action( $basictarget ) ) {
my $z = $actiontype & NATONLY ? '' : firewall_zone; if ( $shorewall_target == TGT_REDIRECT ) {
if ( $dest eq '-' ) { my $z = $actiontype & NATONLY ? '' : firewall_zone;
$dest = $inaction ? '' : join( '', $z, '::' , $ports =~ /[:,]/ ? '' : $ports ); if ( $dest eq '-' ) {
} elsif ( $inaction ) { $dest = $inaction ? '' : join( '', $z, '::' , $ports =~ /[:,]/ ? '' : $ports );
$dest = ":$dest"; } elsif ( $inaction ) {
} else { $dest = ":$dest";
$dest = join( '', $z, '::', $dest ) unless $dest =~ /^[^\d].*:/; } else {
} $dest = join( '', $z, '::', $dest ) unless $dest =~ /^[^\d].*:/;
} elsif ( $action eq 'REJECT' ) { }
$action = 'reject'; } elsif ( $shorewall_target == TGT_REJECT ) {
} elsif ( $action eq 'CONTINUE' ) { $action = 'reject';
$action = 'RETURN'; } elsif ( $shorewall_target == TGT_CONTINUE ) {
} elsif ( $action eq 'COUNT' ) { $action = 'RETURN';
$action = ''; } elsif ( $shorewall_target == TGT_COUNT ) {
} elsif ( $actiontype & LOGRULE ) { $action = '';
fatal_error 'LOG requires a log level' unless defined $loglevel and $loglevel ne ''; } elsif ( $shorewall_target == TGT_LOG ) {
} elsif ( $actiontype & SET ) { fatal_error 'LOG requires a log level' unless defined $loglevel and $loglevel ne '';
my %xlate = ( ADD => 'add-set' , DEL => 'del-set' ); } elsif ( $actiontype & SET ) {
my %xlate = ( ADD => 'add-set' , DEL => 'del-set' );
my ( $setname, $flags, $rest ) = split ':', $param, 3; my ( $setname, $flags, $rest ) = split ':', $param, 3;
fatal_error "Invalid ADD/DEL parameter ($param)" if $rest; fatal_error "Invalid ADD/DEL parameter ($param)" if $rest;
fatal_error "Expected ipset name ($setname)" unless $setname =~ s/^\+// && $setname =~ /^[a-zA-Z]\w*$/; fatal_error "Expected ipset name ($setname)" unless $setname =~ s/^\+// && $setname =~ /^[a-zA-Z]\w*$/;
fatal_error "Invalid flags ($flags)" unless defined $flags && $flags =~ /^(dst|src)(,(dst|src)){0,5}$/; fatal_error "Invalid flags ($flags)" unless defined $flags && $flags =~ /^(dst|src)(,(dst|src)){0,5}$/;
$action = join( ' ', 'SET --' . $xlate{$basictarget} , $setname , $flags ); $action = join( ' ', 'SET --' . $xlate{$basictarget} , $setname , $flags );
}
} }
# #
# Isolate and validate source and destination zones # Isolate and validate source and destination zones