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

Forbid both single and double quotes in config file entries (single quotes ok in comments)

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6311 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-09 20:55:54 +00:00
parent 85a36a02d4
commit 79972e028d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall-perl/Shorewall/Chains.pm
View File

@ -264,7 +264,6 @@ my $chainseq;
sub process_comment() {
if ( $capabilities{COMMENTS} ) {
( $comment = $line ) =~ s/^\s*COMMENT\s*//;
fatal_error "COMMENT lines may not contain double quotes" if $comment =~ /"/;
fatal_error "Invalid COMMENT line" if length $line >= 2 && substr( $line, -1) eq '\\';
} else {
warning_message "COMMENT ignored -- requires comment support in iptables/Netfilter";
@ -315,7 +314,7 @@ sub add_file( $$ ) {
my $file = find_file $_[1];
if ( -f $file ) {
open EF , '<', $file or fatal_error "Unable to open $file";
open EF , '<', $file or fatal_error "Unable to open $file: $!";
add_commands( $chainref,
qq(progress_message "Processing $file..."),

4
Shorewall-perl/Shorewall/Config.pm
View File

@ -309,10 +309,14 @@ my %no_pad = ( COMMENT => 1,
sub split_line( $$$ ) {
my ( $mincolumns, $maxcolumns, $description ) = @_;
fatal_error "Shorewall Configuration file entries may not contain double quotes" if $line =~ /"/;
my @line = split /\s+/, $line;
return @line if $no_pad{$line[0]};
fatal_error "Shorewall Configuration file entries may not contain single quotes" if $line =~ /'/;
fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns;
fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns;