extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-12 04:37:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement passed() in Config.pm

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-03-15 12:00:56 -07:00
parent 796f191d48
commit eb9dd3e485
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Shorewall/Perl/Shorewall/Config.pm
View File

@ -61,6 +61,7 @@ our @EXPORT = qw(
progress_message3 progress_message3
supplied supplied
passed
split_list split_list
shorewall shorewall
@ -86,7 +87,7 @@ our @EXPORT = qw(
kernel_version kernel_version
); );
our @EXPORT_OK = qw( $shorewall_dir initialize shorewall); our @EXPORT_OK = qw( $shorewall_dir initialize shorewall passed);
our %EXPORT_TAGS = ( internal => [ qw( create_temp_script our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
generate_sha1 generate_sha1
@ -2151,6 +2152,12 @@ sub supplied( $ ) {
defined $val && $val ne ''; defined $val && $val ne '';
} }
sub passed( $ ) {
my $val = shift;
defined $val && $val ne '' && $val ne '-';
}
# #
# Pre-process a line from a configuration file. # Pre-process a line from a configuration file.
@ -2514,6 +2521,20 @@ sub evaluate_expression( $$$$ ) {
my $val; my $val;
my $count = 0; my $count = 0;
my $chain = $actparams{chain}; my $chain = $actparams{chain};
# $1 $2
if ( $expression =~ /^(!)?\s*passed\([\$@](\d+)\)$/ ) {
my $val = passed($actparams{$2});
return $1 ? ! $val : $val unless $debug;
$val = $1 ? ! $val : $val;
print "EXPR=> '$val'\n" if $debug;
return $val;
}
# $1 $2 $3 - $4 # $1 $2 $3 - $4
while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
my ( $first, $var, $rest ) = ( $1, $3, $4); my ( $first, $var, $rest ) = ( $1, $3, $4);
@ -2572,7 +2593,10 @@ sub evaluate_expression( $$$$ ) {
# #
# Not a simple one-term expression -- compile it # Not a simple one-term expression -- compile it
# #
$val = eval qq(package Shorewall::User;\nuse strict;\n# line $linenumber "$filename"\n$expression); $val = eval qq(package Shorewall::User;
use strict;
use Shorewall::Config \(qw/supplied/\);
# line $linenumber "$filename"\n$expression);
unless ( $val ) { unless ( $val ) {
directive_error( "Couldn't parse expression ($expression): $@" , $filename, $linenumber ) if $@; directive_error( "Couldn't parse expression ($expression): $@" , $filename, $linenumber ) if $@;
@ -3136,7 +3160,7 @@ sub embedded_shell( $ ) {
sub embedded_perl( $ ) { sub embedded_perl( $ ) {
my $multiline = shift; my $multiline = shift;
my ( $command , $linenumber ) = ( qq(package Shorewall::User;\nno strict;\nuse Shorewall::Config (qw/shorewall/);\n# line $currentlinenumber "$currentfilename"\n$currentline), $currentlinenumber ); my ( $command , $linenumber ) = ( qq(package Shorewall::User;\nno strict;\nuse Shorewall::Config (qw/shorewall supplied/);\n# line $currentlinenumber "$currentfilename"\n$currentline), $currentlinenumber );
$directive_callback->( 'PERL', $currentline ) if $directive_callback; $directive_callback->( 'PERL', $currentline ) if $directive_callback;
@ -3308,7 +3332,6 @@ sub setup_audit_action( $ ) {
} }
} }
# #
# Returns the Level and Tag for the current action chain # Returns the Level and Tag for the current action chain
# #