webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-19 07:23:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

firewall: Fix using aliases.

Browse Source 
Fix coding errors, actually read aliases configuration
and fall back to default RED IP address if no suitable
alias was found.
This commit is contained in:
Michael Tremer
2014-04-05 17:09:56 +02:00
parent 1d9c1c3079
commit 085a20ec8b
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/firewall/firewall-lib.pl
View File

@@ -64,6 +64,7 @@ my $netsettings = "${General::swroot}/ethernet/settings";
&General::readhasharray("$configipsec", \%ipsecconf);
&General::readhasharray("$configsrv", \%customservice);
&General::readhasharray("$configsrvgrp", \%customservicegrp);
&General::get_aliases(\%aliases);
sub get_srv_prot
{
@@ -388,9 +389,9 @@ sub get_address
# Aliases
} else {
my %alias = &get_alias($value);
if (%alias) {
push(@ret, $alias{"IPT"});
my $alias = &get_alias($value);
if ($alias) {
push(@ret, $alias);
}
}
@@ -423,12 +424,12 @@ sub get_alias
foreach my $alias (sort keys %aliases) {
if ($id eq $alias) {
return $aliases{$alias};
return $aliases{$alias}{"IPT"};
}
}
}
sub get_nat_address
{
sub get_nat_address {
my $zone = shift;
my $source = shift;
@@ -451,15 +452,20 @@ sub get_nat_address
} elsif ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") {
return $netsettings{$zone . "_ADDRESS"};
} elsif ($zone eq "Default IP") {
} elsif ($zone ~~ ["Default IP", "ALL"]) {
return &get_external_address();
} else {
return &get_alias($zone);
my $alias = &get_alias($zone);
unless ($alias) {
$alias = &get_external_address();
}
return $alias;
}
print_error("Could not find NAT address");
}
sub get_internal_firewall_ip_addresses
{
my $use_orange = shift;

2
config/firewall/rules.pl
View File

@@ -53,7 +53,6 @@ my %customgrp=();
my %configinputfw=();
my %configoutgoingfw=();
my %confignatfw=();
my %aliases=();
my @p2ps=();
my $configfwdfw = "${General::swroot}/firewall/config";
@@ -69,7 +68,6 @@ my $netsettings = "${General::swroot}/ethernet/settings";
&General::readhasharray($configinput, \%configinputfw);
&General::readhasharray($configoutgoing, \%configoutgoingfw);
&General::readhasharray($configgrp, \%customgrp);
&General::get_aliases(\%aliases);
my @log_limit_options = &make_log_limit_options();