webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

firewall.cgi: replace space by tab and OS rebuild for wireguard

Browse Source 
wireguard feature has changes in followg lfs, so remove the build
log below for OS rebuild to include wireguard

rm log_loongarch64/web-user-interface-ipfire
rm log_loongarch64/configroot
rm log_loongarch64/iproute2-6.10.0
rm log_loongarch64/initscripts
rm log_loongarch64/stage2
rm log_loongarch64/misc-progs

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
This commit is contained in:
Vincent Li
2025-06-27 22:21:33 -07:00
parent 4b3adf85e0
commit d27b458cab
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -883,10 +883,10 @@ sub checkrule
} }
}else{ }else{
$errormessage .= $sip; $errormessage .= $sip;
$errormessage .= $scidr; $errormessage .= $scidr;
$errormessage .= $tip; $errormessage .= $tip;
$errormessage .= $tcidr; $errormessage .= $tcidr;
if ( &General::IpInSubnet($networkip2,$sip,&General::iporsubtodec($scidr)) ){ if ( &General::IpInSubnet($networkip2,$sip,&General::iporsubtodec($scidr)) ){
$errormessage.=$Lang::tr{'fwdfw err samesub'} . $fwdfwsettings{'grp1'} .$fwdfwsettings{$fwdfwsettings{'grp1'}} . $fwdfwsettings{'grp2'} . $fwdfwsettings{$fwdfwsettings{'grp2'}}; $errormessage.=$Lang::tr{'fwdfw err samesub'} . $fwdfwsettings{'grp1'} .$fwdfwsettings{$fwdfwsettings{'grp1'}} . $fwdfwsettings{'grp2'} . $fwdfwsettings{$fwdfwsettings{'grp2'}};
@@ -1321,11 +1321,11 @@ sub get_ip
&General::readhash("$configovpn",\%ovpnsettings); &General::readhash("$configovpn",\%ovpnsettings);
($a,$b) = split (/\//, $ovpnsettings{'DOVPN_SUBNET'}); ($a,$b) = split (/\//, $ovpnsettings{'DOVPN_SUBNET'});
$b=&General::iporsubtocidr($b); $b=&General::iporsubtocidr($b);
# WireGuard
} elsif ($fwdfwsettings{$fwdfwsettings{$grp}} eq "WGRW") {
return $Wireguard::settings{'CLIENT_POOL'};
} }
# WireGuard
} elsif ($fwdfwsettings{$fwdfwsettings{$grp}} eq "WGRW") {
return $Wireguard::settings{'CLIENT_POOL'};
}
}elsif($fwdfwsettings{$grp} eq 'cust_net_'.$val){ }elsif($fwdfwsettings{$grp} eq 'cust_net_'.$val){
&General::readhasharray("$confignet", \%customnetwork); &General::readhasharray("$confignet", \%customnetwork);
foreach my $key (keys %customnetwork){ foreach my $key (keys %customnetwork){
@@ -1476,8 +1476,8 @@ sub getcolor
$tdcolor="style='background-color: $Header::colourvpn;color:white;'"; $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
return; return;
}elsif ($val eq "WGRW") { }elsif ($val eq "WGRW") {
$tdcolor="style='background-color: $Header::colourwg; color: white;'"; $tdcolor="style='background-color: $Header::colourwg; color: white;'";
return; return;
}elsif($val =~ /^(.*?)\/(.*?)$/){ }elsif($val =~ /^(.*?)\/(.*?)$/){
my ($sip,$scidr) = split ("/",$val); my ($sip,$scidr) = split ("/",$val);
if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
@@ -1545,13 +1545,13 @@ sub getcolor
} }
} }
# WireGuard Roadwarrior # WireGuard Roadwarrior
if ($Wireguard::settings{'CLIENT_POOL'}) { if ($Wireguard::settings{'CLIENT_POOL'}) {
if (&Network::ip_address_in_network($c, $Wireguard::settings{'CLIENT_POOL'})) { if (&Network::ip_address_in_network($c, $Wireguard::settings{'CLIENT_POOL'})) {
$tdcolor="style='background-color: $Header::colourwg; color:white;'"; $tdcolor="style='background-color: $Header::colourwg; color:white;'";
return; return;
} }
} }
} }
#VPN networks #VPN networks
if ($nettype eq 'wg_peer_src' || $nettype eq 'wg_peer_tgt'){ if ($nettype eq 'wg_peer_src' || $nettype eq 'wg_peer_tgt'){
@@ -1566,6 +1566,7 @@ sub getcolor
$tdcolor="style='background-color: $Header::colourvpn;color:white;'"; $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
return; return;
} }
#ALIASE #ALIASE
foreach my $alias (sort keys %aliases) foreach my $alias (sort keys %aliases)
{ {
@@ -2635,12 +2636,11 @@ END
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
$coloryellow='on'; $coloryellow='on';
} }
}elsif ($$hash{$key}[3] eq 'wg_peer_src') { }elsif($$hash{$key}[3] eq 'wg_peer_src') {
if (!defined &Wireguard::get_peer_by_name($host)) { if (!defined &Wireguard::get_peer_by_name($host)) {
$coloryellow = 'on'; $coloryellow = 'on';
} }
} }
} }
foreach my $host (@tmptgt){ foreach my $host (@tmptgt){
if($$hash{$key}[5] eq 'ipsec_net_tgt'){ if($$hash{$key}[5] eq 'ipsec_net_tgt'){
@@ -2659,7 +2659,7 @@ END
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){ if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
$coloryellow='on'; $coloryellow='on';
} }
}elsif ($$hash{$key}[3] eq 'wg_peer_tgt') { }elsif($$hash{$key}[3] eq 'wg_peer_tgt') {
if (!defined &Wireguard::get_peer_by_name($host)) { if (!defined &Wireguard::get_peer_by_name($host)) {
$coloryellow = 'on'; $coloryellow = 'on';
} }