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

Tweak VALIATE_PORTS

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6612 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-20 03:25:43 +00:00
parent 03bfac751e
commit 5d22f907d2
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -756,12 +756,12 @@ sub clearrule() {
sub validate_proto( $ ) { sub validate_proto( $ ) {
my $proto = $_[0]; my $proto = $_[0];
return $proto unless $config{VALIDATE_PORTS};
my $value = $protocols{$proto}; my $value = $protocols{$proto};
return $value if defined $value; return $value if defined $value;
return $proto if $proto =~ /^(\d+)$/ && $proto <= 65535; return $proto if $proto =~ /^(\d+)$/ && $proto <= 65535;
return $proto if $proto eq 'all'; return $proto if $proto eq 'all';
fatal_error "Invalid/Unknown protocol ($proto)" if $config{VALIDATE_PORTS}; fatal_error "Invalid/Unknown protocol ($proto)";
return $proto
} }
sub validate_portpair( $ ) { sub validate_portpair( $ ) {
@ -772,25 +772,22 @@ sub validate_portpair( $ ) {
$portpair = "0$portpair" if substr( $portpair, 0, 1 ) eq ':'; $portpair = "0$portpair" if substr( $portpair, 0, 1 ) eq ':';
$portpair = "${portpair}65535" if substr( $portpair, -1, 1 ) eq ':'; $portpair = "${portpair}65535" if substr( $portpair, -1, 1 ) eq ':';
my @ports = split/:/, $portpair, 3; my @ports = split/:/, $portpair, 2;
fatal_error "Invalid port range ($portpair)" if @ports == 3; if ( $config{VALIDATE_PORTS} ) {
for my $port ( @ports ) {
my $value = $services{$port};
for my $port ( @ports ) { unless ( defined $value ) {
my $value = $services{$port}; $value = $port if $port =~ /^(\d+)$/ && $port <= 65535;
}
unless ( defined $value ) {
$value = $port if $port =~ /^(\d+)$/ && $port <= 65535;
}
if ( $config{VALIDATE_PORTS} ) {
fatal_error "Invalid/Unknown port/service ($port)" unless defined $value; fatal_error "Invalid/Unknown port/service ($port)" unless defined $value;
$port = $value;
} }
}
if ( @ports == 2 ) { if ( @ports == 2 ) {
fatal_error "Invalid port range ($portpair)" unless $ports[0] < $ports[1]; fatal_error "Invalid port range ($portpair)" unless $ports[0] < $ports[1];
}
} }
join ':', @ports; join ':', @ports;