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

Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically

Browse Source
This commit is contained in:
Alexander Marx
2014-03-13 13:53:39 +01:00
parent 09d7ae9471
commit b3c53248d9
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
html/cgi-bin/firewall.cgi
View File

@@ -2375,26 +2375,18 @@ END
if($$hash{$key}[3] eq 'ipsec_net_src'){ if($$hash{$key}[3] eq 'ipsec_net_src'){
if(&fwlib::get_ipsec_net_ip($host,11) eq ''){ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
}elsif($$hash{$key}[3] eq 'ovpn_net_src'){ }elsif($$hash{$key}[3] eq 'ovpn_net_src'){
if(&fwlib::get_ovpn_net_ip($host,1) eq ''){ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
}elsif($$hash{$key}[3] eq 'ovpn_n2n_src'){ }elsif($$hash{$key}[3] eq 'ovpn_n2n_src'){
if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
}elsif($$hash{$key}[3] eq 'ovpn_host_src'){ }elsif($$hash{$key}[3] eq 'ovpn_host_src'){
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
} }
} }
@@ -2402,26 +2394,18 @@ END
if($$hash{$key}[5] eq 'ipsec_net_tgt'){ if($$hash{$key}[5] eq 'ipsec_net_tgt'){
if(&fwlib::get_ipsec_net_ip($host,11) eq ''){ if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
}elsif($$hash{$key}[5] eq 'ovpn_net_tgt'){ }elsif($$hash{$key}[5] eq 'ovpn_net_tgt'){
if(&fwlib::get_ovpn_net_ip($host,1) eq ''){ if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
}elsif($$hash{$key}[5] eq 'ovpn_n2n_tgt'){ }elsif($$hash{$key}[5] eq 'ovpn_n2n_tgt'){
if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){ if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
}elsif($$hash{$key}[5] eq 'ovpn_host_tgt'){ }elsif($$hash{$key}[5] eq 'ovpn_host_tgt'){
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
} }
} }
@@ -2429,15 +2413,11 @@ END
foreach my $netgroup (sort keys %customgrp){ foreach my $netgroup (sort keys %customgrp){
if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){ if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
} }
foreach my $srvgroup (sort keys %customservicegrp){ foreach my $srvgroup (sort keys %customservicegrp){
if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){ if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){
$coloryellow='on'; $coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
} }
} }
$$hash{'ACTIVE'}=$$hash{$key}[2]; $$hash{'ACTIVE'}=$$hash{$key}[2];

2
html/cgi-bin/ovpnmain.cgi
View File

@@ -2159,7 +2159,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
} else { } else {
$errormessage = $Lang::tr{'invalid key'}; $errormessage = $Lang::tr{'invalid key'};
} }
&General::firewall_reload();
### ###
### Download PKCS12 file ### Download PKCS12 file

2
html/cgi-bin/vpnmain.cgi
View File

@@ -1225,7 +1225,7 @@ END
} else { } else {
$errormessage = $Lang::tr{'invalid key'}; $errormessage = $Lang::tr{'invalid key'};
} }
&General::firewall_reload();
### ###
### Choose between adding a host-net or net-net connection ### Choose between adding a host-net or net-net connection
### ###