extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 12:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve expression evaluation

Browse Source 
- Only quote values when there is not an odd number of preceding quotes
- Make address family test return a numeric value
- Unconditionally trace the generated expression if debugging is set.
- Convert an empty expression into '' rather than generate an error.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-05 08:37:50 -08:00
parent 2875fbb521
commit 189cd59650
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1947,11 +1947,9 @@ sub evaluate_expression( $$$ ) {
$val = '' unless defined $val;
if ( $val eq '' ) {
$val = "''" unless $first =~ /['"]$/;
} else {
$val = "'$val'" unless $val =~ /^-?\d+$/;
}
$val = "'$val'" unless ( $val =~ /^-?\d+$/ || # Value is numeric
( ( ( $first =~ tr/"/"/ ) & 1 ) || # There are an odd number of double quotes preceding the value
( ( $first =~ tr/'/'/ ) & 1 ) ) ); # There are an odd number of single quotes preceding the value
$expression = join( '', $first, $val, $rest );
cond_error( "Variable Expansion Loop" , $filename, $linenumber ) if ++$count > 100;
@ -1969,7 +1967,7 @@ sub evaluate_expression( $$$ ) {
$val = 0;
}
} elsif ( $cap =~ /^IPV([46])$/ ) {
$val = ( $family == $1 );
$val = ( $family == $1 ) || 0;
} else {
cond_error "Unknown capability ($cap)", $filename, $linenumber;
}
@ -1979,16 +1977,17 @@ sub evaluate_expression( $$$ ) {
$expression =~ s/^\s*(.+)\s*$/$1/;
print "EXPR=> $expression\n" if $debug;
unless ( $expression =~ /^\d+$/ ) {
print "EXPR=> $expression\n" if $debug;
#
# Not a simple one-term expression -- compile it
#
$val = eval qq(package Shorewall::User;\nuse strict;\n# line $linenumber "$filename"\n$expression);
unless ( $val ) {
cond_error( "Couldn't parse expression: $@" , $filename, $linenumber ) if $@;
cond_error( "Undefined expression" , $filename, $linenumber ) unless defined $val;
cond_error( "Couldn't parse expression ($expression): $@" , $filename, $linenumber ) if $@;
$val = '' unless defined $val;
}
}