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

Tighen up editing of ACCOUNT(...)

Browse Source
This commit is contained in:
Tom Eastep 2011-01-31 10:14:10 -08:00
parent ae4d675d0d
commit f8e6c80ca0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/Perl/Shorewall/Accounting.pm
View File

@ -103,11 +103,14 @@ sub process_accounting_rule( ) {
if ( $action eq 'DONE' ) { if ( $action eq 'DONE' ) {
$target = 'RETURN'; $target = 'RETURN';
} elsif ( $action =~ /^ACCOUNT\((.+)\)$/ ) { } elsif ( $action =~ /^ACCOUNT\((.+)\)$/ ) {
my ( $table, $net ) = split/,/, $1;
require_capability 'ACCOUNT_TARGET' , 'ACCOUNT Rules' , ''; require_capability 'ACCOUNT_TARGET' , 'ACCOUNT Rules' , '';
fatal_error "Invalid or Missing Table Name ($table)" unless $table =~ /^([-\w.]+)$/; my ( $table, $net, $rest ) = split/,/, $1;
fatal_error "Invalid Network Address" unless $net =~ '/(\d+)$'; fatal_error "Invalid Network Address (${net}${rest})" if defined $rest;
fatal_error "Netmask ($1) out of range" unless $1 >= 8; fatal_error "Missing Table Name" unless defined $table && $table ne '';;
fatal_error "Invalid Table Name ($table)" unless $table =~ /^([-\w.]+)$/;
fatal_error "Missing Network Address" unless defined $net;
fatal_error "Invalid Network Address ($net)" unless defined $net && $net =~ '/(\d+)$';
fatal_error "Netmask ($1) out of range" unless $1 >= 8;
validate_net $net, 0; validate_net $net, 0;
$target = "ACCOUNT --addr $net --tname $table"; $target = "ACCOUNT --addr $net --tname $table";
} else { } else {

2
Shorewall/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in Shorewall 4.4.17 RC 1
2) Ensure that manual and accounting chains aren't too long. 2) Ensure that manual and accounting chains aren't too long.
3) Tighten up the editing of ACCOUNT(...).
Changes in Shorewall 4.4.17 Beta 3 Changes in Shorewall 4.4.17 Beta 3
1) Allow run-time address variables in the masq file. 1) Allow run-time address variables in the masq file.