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

Clean up variable expansion:

Browse Source 
1) Centralize code in function expand_variables()
2) Eliminate %rawconfig
3) Correct logic in update_config_file() - the defect was not observable
   but the code was clearly silly
This commit is contained in:
Tom Eastep 2011-06-25 21:08:32 -07:00
parent 47c759d93c
commit 9f37f09b28
1 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,10 +208,6 @@ our %globals;
# #
our %config; our %config;
# #
# Raw values from shorewall.conf - used to update the config file
#
my %rawconfig;
#
# Config options and global settings that are to be copied to output script # Config options and global settings that are to be copied to output script
# #
my @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOAD_HELPERS_ONLY SUBSYSLOCK LOG_VERBOSITY/; my @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOAD_HELPERS_ONLY SUBSYSLOCK LOG_VERBOSITY/;
@ -1855,6 +1851,33 @@ sub set_action_param( $$ ) {
$actparms[$i] = shift; $actparms[$i] = shift;
} }
#
# Expand shell variables and action parameters in the passed scalar
#
sub expand_variables( \$ ) {
my ( $line, $count ) = ( $_[0], 0 );
# $1 $2 $3 - $4
while ( $$line =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) {
my ( $first, $var, $rest ) = ( $1, $3, $4);
my $val;
if ( $var =~ /^\d+$/ ) {
fatal_error "Undefined parameter (\$$var)" unless $var > 0 && defined $actparms[$var];
$val = $actparms[$var];
} else {
fatal_error "Undefined shell variable (\$$var)" unless exists $params{$var};
$val = $params{$var};
}
$val = '' unless defined $val;
$$line = join( '', $first , $val , $rest );
fatal_error "Variable Expansion Loop" if ++$count > 100;
}
}
# #
# Read a line from the current include stack. # Read a line from the current include stack.
# #
@ -1931,28 +1954,8 @@ sub read_a_line(;$$) {
# #
# Expand Shell Variables using %params and @actparms # Expand Shell Variables using %params and @actparms
# #
if ( $expand_variables ) { expand_variables( $currentline ) if $expand_variables;
# $1 $2 $3 - $4
while ( $currentline =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) {
my ( $first, $var, $rest ) = ( $1, $3, $4);
my $val;
if ( $var =~ /^\d+$/ ) {
fatal_error "Undefined parameter (\$$var)" unless $var > 0 && defined $actparms[$var];
$val = $actparms[$var];
} else {
fatal_error "Undefined shell variable (\$$var)" unless exists $params{$var};
$val = $params{$var};
}
$val = '' unless defined $val;
$currentline = join( '', $first , $val , $rest );
fatal_error "Variable Expansion Loop" if ++$count > 100;
}
}
if ( $currentline =~ /^\s*INCLUDE\s/ ) { if ( $currentline =~ /^\s*INCLUDE\s/ ) {
my @line = split ' ', $currentline; my @line = split ' ', $currentline;
@ -2883,6 +2886,9 @@ sub conditional_quote( $ ) {
$val; $val;
} }
#
# Update the shorewall[6].conf file. Save the current file with a .bak suffix.
#
sub update_config_file( $ ) { sub update_config_file( $ ) {
my $annotate = shift; my $annotate = shift;
@ -2925,7 +2931,7 @@ sub update_config_file( $ ) {
# #
# Option assignment -- get value and default # Option assignment -- get value and default
# #
my ($var, $val, $default ) = ( $1, $rawconfig{$1}, $2 ); my ($var, $val, $default ) = ( $1, $config{$1}, $2 );
unless ( supplied $val ) { unless ( supplied $val ) {
# #
@ -2959,7 +2965,7 @@ sub update_config_file( $ ) {
my $heading_printed; my $heading_printed;
for ( @undocumented ) { for ( @undocumented ) {
if ( defined ( my $val = $rawconfig{$_} ) ) { if ( defined ( my $val = $config{$_} ) ) {
unless ( $heading_printed ) { unless ( $heading_printed ) {
print $output <<'EOF'; print $output <<'EOF';
@ -2982,7 +2988,7 @@ EOF
$heading_printed = 0; $heading_printed = 0;
for ( keys %deprecated ) { for ( keys %deprecated ) {
if ( supplied( my $val = $rawconfig{$_} ) ) { if ( supplied( my $val = $config{$_} ) ) {
if ( lc $val ne $deprecated{$_} ) { if ( lc $val ne $deprecated{$_} ) {
unless ( $heading_printed ) { unless ( $heading_printed ) {
print $output <<'EOF'; print $output <<'EOF';
@ -3022,7 +3028,6 @@ EOF
sub process_shorewall_conf( $$ ) { sub process_shorewall_conf( $$ ) {
my ( $update, $annotate ) = @_; my ( $update, $annotate ) = @_;
my $file = find_file "$product.conf"; my $file = find_file "$product.conf";
my $config = $update ? \%rawconfig : \%config;
if ( -f $file ) { if ( -f $file ) {
$globals{CONFIGDIR} = $configfile = $file; $globals{CONFIGDIR} = $configfile = $file;
@ -3043,7 +3048,7 @@ sub process_shorewall_conf( $$ ) {
next; next;
} }
$config->{$var} = ( $val =~ /\"([^\"]*)\"$/ ? $1 : $val ); $config{$var} = ( $val =~ /\"([^\"]*)\"$/ ? $1 : $val );
} else { } else {
fatal_error "Unrecognized entry"; fatal_error "Unrecognized entry";
} }
@ -3055,42 +3060,15 @@ sub process_shorewall_conf( $$ ) {
fatal_error "$file does not exist!"; fatal_error "$file does not exist!";
} }
if ( $config ) {
#
# Now that we have the raw values stored, we expand shell variables and store the expanded values
#
while ( my ( $opt, $v ) = each %rawconfig ) {
my $count = 0;
unless ( $v =~ /^'(.*?)'$/ ) {
# $1 $2 $3 - $4
while ( $v =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) {
my ( $first, $var, $rest ) = ( $1, $3, $4);
my $val;
if ( $var =~ /^\d+$/ ) {
fatal_error "Undefined parameter (\$$var)" unless $var > 0 && defined $actparms[$var];
$val = $actparms[$var];
} else {
fatal_error "Undefined shell variable (\$$var)" unless exists $params{$var};
$val = $params{$var};
}
$val = '' unless defined $val;
$v = join( '', $first , $val , $rest );
fatal_error "Variable Expansion Loop in option $opt" if ++$count > 100;
}
}
$config{$opt} = $v;
}
}
# #
# Now update the config file if asked # Now update the config file if asked
# #
update_config_file( $annotate) if $update; if ( $update ) {
update_config_file( $annotate) if $update;
supplied $_ && expand_variables( $_ ) for values %config;
}
} }
# #