webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust CGI files to work with latest location-function.pl changes.

Browse Source 
Fixes #12515.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Stefan Schantl
2020-11-07 19:47:24 +01:00
committed by Michael Tremer
parent 427190d578
commit 07e42be978
11 changed files with 17 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/cgi-bin/connections.cgi
View File

@@ -86,9 +86,6 @@ if ( $debug ){
my @dummy = ( ${Header::table1colour} ); my @dummy = ( ${Header::table1colour} );
undef (@dummy); undef (@dummy);
# Init libloc database connection.
my $libloc_db_handle = &Location::Functions::init();
# check sorting arguments # check sorting arguments
if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) { if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
$SORT_FIELD = $cgiin{'sort_field'}; $SORT_FIELD = $cgiin{'sort_field'};
@@ -554,9 +551,9 @@ foreach my $line (@conntrack) {
my $bytes_out = format_bytes($bytes[1]); my $bytes_out = format_bytes($bytes[1]);
# enumerate location information # enumerate location information
my $srcccode = &Location::Functions::lookup_country_code($libloc_db_handle, $sip_ret); my $srcccode = &Location::Functions::lookup_country_code($sip_ret);
my $src_flag_icon = &Location::Functions::get_flag_icon($srcccode); my $src_flag_icon = &Location::Functions::get_flag_icon($srcccode);
my $dstccode = &Location::Functions::lookup_country_code($libloc_db_handle, $dip_ret); my $dstccode = &Location::Functions::lookup_country_code($dip_ret);
my $dst_flag_icon = &Location::Functions::get_flag_icon($dstccode); my $dst_flag_icon = &Location::Functions::get_flag_icon($dstccode);
# Format TTL # Format TTL

5
html/cgi-bin/country.cgi
View File

@@ -52,11 +52,8 @@ print<<END;
</tr> </tr>
END END
# Init libloc database connection.
my $db_handle = &Location::Functions::init();
# Get a list of all supported country codes. # Get a list of all supported country codes.
my @countries = &Location::database_countries($db_handle); my @countries = &Location::database_countries();
# Loop through whole country list. # Loop through whole country list.
foreach my $country (@countries) { foreach my $country (@countries) {

5
html/cgi-bin/dns.cgi
View File

@@ -269,9 +269,6 @@ my %dns_servers = ();
# Read-in config file. # Read-in config file.
&General::readhasharray("$servers_file", \%dns_servers); &General::readhasharray("$servers_file", \%dns_servers);
# Libloc database handle
my $libloc_db_handle = &Location::Functions::init();
&Header::openpage($Lang::tr{'dns title'}, 1, ''); &Header::openpage($Lang::tr{'dns title'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage); &Header::openbigbox('100%', 'left', '', $errormessage);
@@ -598,7 +595,7 @@ END
} }
# collect more information about name server (rDNS, country code) # collect more information about name server (rDNS, country code)
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $nameserver); my $ccode = &Location::Functions::lookup_country_code($nameserver);
my $flag_icon = &Location::Functions::get_flag_icon($ccode); my $flag_icon = &Location::Functions::get_flag_icon($ccode);
my $rdns; my $rdns;

5
html/cgi-bin/ipinfo.cgi
View File

@@ -62,12 +62,11 @@ if (&General::validip($addr)) {
if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; } if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; }
# enumerate location information for IP address... # enumerate location information for IP address...
my $db_handle = &Location::Functions::init(); my $ccode = &Location::Functions::lookup_country_code($addr);
my $ccode = &Location::Functions::lookup_country_code($db_handle, $addr);
my @network_flags = &Location::Functions::address_has_flags($addr); my @network_flags = &Location::Functions::address_has_flags($addr);
# Try to get the continent of the country code. # Try to get the continent of the country code.
my $continent = &Location::get_continent_code($db_handle, $ccode); my $continent = &Location::Functions::get_continent_code($ccode);
# Check if a whois server for the continent is known. # Check if a whois server for the continent is known.
if($whois_servers_by_continent{$continent}) { if($whois_servers_by_continent{$continent}) {

6
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -24,9 +24,6 @@ require "${General::swroot}/location-functions.pl";
require "${General::swroot}/lang.pl"; require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl"; require "${General::swroot}/header.pl";
# Libloc database handle.
my $libloc_db_handle = &Location::Functions::init();
my %color = (); my %color = ();
my %mainsettings = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -354,7 +351,8 @@ foreach $_ (@log)
$srcport=$1 if $packet =~ /SPT=(\d+)/; $srcport=$1 if $packet =~ /SPT=(\d+)/;
$dstport=$1 if $packet =~ /DPT=(\d+)/; $dstport=$1 if $packet =~ /DPT=(\d+)/;
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr); # Get the country code.
my $ccode = &Location::Functions::lookup_country_code($srcaddr);
my $servi = uc(getservbyport($srcport, lc($proto))); my $servi = uc(getservbyport($srcport, lc($proto)));
if ($servi ne '' && $srcport < 1024) { if ($servi ne '' && $srcport < 1024) {

5
html/cgi-bin/logs.cgi/firewalllogcountry.dat
View File

@@ -22,9 +22,6 @@ require "${General::swroot}/location-functions.pl";
require "${General::swroot}/lang.pl"; require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl"; require "${General::swroot}/header.pl";
# Libloc database handle.
my $libloc_db_handle = &Location::Functions::init();
use POSIX(); use POSIX();
my %cgiparams=(); my %cgiparams=();
@@ -311,7 +308,7 @@ foreach $_ (@log)
# Traffic from red # Traffic from red
if($srcaddr ne '') { if($srcaddr ne '') {
# srcaddr is set # srcaddr is set
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr); my $ccode = &Location::Functions::lookup_country_code($srcaddr);
if ($ccode eq '') { if ($ccode eq '') {
$ccode = 'unknown'; $ccode = 'unknown';
} }

6
html/cgi-bin/logs.cgi/firewalllogip.dat
View File

@@ -22,9 +22,6 @@ require "${General::swroot}/location-functions.pl";
require "${General::swroot}/lang.pl"; require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl"; require "${General::swroot}/header.pl";
# Libloc database handle.
my $libloc_db_handle = &Location::Functions::init();
use POSIX(); use POSIX();
my %cgiparams=(); my %cgiparams=();
@@ -438,7 +435,8 @@ for($s=0;$s<$lines;$s++)
$col="bgcolor='$color{\"color$colorIndex\"}'"; $col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>"; print "<tr>";
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $key[$s]); # Get country code.
my $ccode = &Location::Functions::lookup_country_code($key[$s]);
$color++; $color++;
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>"; print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";

7
html/cgi-bin/logs.cgi/showrequestfromcountry.dat
View File

@@ -19,9 +19,6 @@ require "${General::swroot}/location-functions.pl";
require "${General::swroot}/lang.pl"; require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl"; require "${General::swroot}/header.pl";
# Libloc database handle.
my $libloc_db_handle = &Location::Functions::init();
use POSIX(); use POSIX();
#workaround to suppress a warning when a variable is used only once #workaround to suppress a warning when a variable is used only once
@@ -181,7 +178,7 @@ if (!$skip)
} }
elsif($srcaddr ne '') { elsif($srcaddr ne '') {
# or srcaddr matches country code # or srcaddr matches country code
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr); my $ccode = &Location::Functions::lookup_country_code($srcaddr);
if($ccode eq uc($country)){ if($ccode eq uc($country)){
$log[$lines] = $_; $log[$lines] = $_;
$lines++; $lines++;
@@ -352,7 +349,7 @@ foreach $_ (@slice)
if($iface eq $country || $srcaddr ne '') { if($iface eq $country || $srcaddr ne '') {
my $ccode=''; my $ccode='';
if($iface ne $country) { if($iface ne $country) {
$ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr); $ccode = &Location::Functions::lookup_country_code($srcaddr);
} }
if($iface eq $country || $ccode eq uc($country)) { if($iface eq $country || $ccode eq uc($country)) {
my $chain = ''; my $chain = '';

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

@@ -3002,9 +3002,6 @@ END
&Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbigbox('100%', 'LEFT', '', '');
&Header::openbox('100%', 'LEFT', $Lang::tr{'ovpn con stat'}); &Header::openbox('100%', 'LEFT', $Lang::tr{'ovpn con stat'});
# Libloc database handle.
my $libloc_db_handle = &Location::Functions::init();
# #
# <td><b>$Lang::tr{'protocol'}</b></td> # <td><b>$Lang::tr{'protocol'}</b></td>
# protocol temp removed # protocol temp removed
@@ -3055,7 +3052,7 @@ END
$users[$uid]{'Proto'} = $proto; $users[$uid]{'Proto'} = $proto;
# get country code for "RealAddress"... # get country code for "RealAddress"...
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, (split ':', $users[$uid]{'RealAddress'})[0]); my $ccode = &Location::Functions::lookup_country_code((split ':', $users[$uid]{'RealAddress'})[0]);
my $flag_icon = &Location::Functions::get_flag_icon($ccode); my $flag_icon = &Location::Functions::get_flag_icon($ccode);
$users[$uid]{'Country'} = "<a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a>"; $users[$uid]{'Country'} = "<a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a>";
$uid++; $uid++;

6
html/cgi-bin/remote.cgi
View File

@@ -277,10 +277,6 @@ sub printactivelogins()
print "<tr bgcolor='$table_colour'><td colspan='5'>$Lang::tr{'ssh no active logins'}</td></tr>\n"; print "<tr bgcolor='$table_colour'><td colspan='5'>$Lang::tr{'ssh no active logins'}</td></tr>\n";
} else { } else {
# list active logins... # list active logins...
# Libloc database handle.
my $libloc_db_handle = &Location::Functions::init();
foreach my $line (@output) foreach my $line (@output)
{ {
my @arry = split(/\ +/, $line); my @arry = split(/\ +/, $line);
@@ -291,7 +287,7 @@ sub printactivelogins()
$remoteip =~ s/[()]//g; $remoteip =~ s/[()]//g;
# display more information about that IP adress... # display more information about that IP adress...
my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $remoteip); my $ccode = &Location::Functions::lookup_country_code($remoteip);
my $flag_icon = &Location::Functions::get_flag_icon($ccode); my $flag_icon = &Location::Functions::get_flag_icon($ccode);
# get rDNS... # get rDNS...

7
html/cgi-bin/tor.cgi
View File

@@ -30,9 +30,6 @@ require "${General::swroot}/location-functions.pl";
require "${General::swroot}/lang.pl"; require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl"; require "${General::swroot}/header.pl";
# Init libloc database connection.
my $db_handle = &Location::Functions::init();
#workaround to suppress a warning when a variable is used only once #workaround to suppress a warning when a variable is used only once
my @dummy = ( ${Header::colouryellow} ); my @dummy = ( ${Header::colouryellow} );
undef (@dummy); undef (@dummy);
@@ -322,7 +319,7 @@ END
<select name='TOR_EXIT_COUNTRY'> <select name='TOR_EXIT_COUNTRY'>
<option value=''>- $Lang::tr{'tor exit country any'} -</option> <option value=''>- $Lang::tr{'tor exit country any'} -</option>
END END
my @country_codes = &Location::database_countries($db_handle); my @country_codes = &Location::Functions::get_locations("no_special_locations");
foreach my $country_code (@country_codes) { foreach my $country_code (@country_codes) {
# Convert country code into upper case format. # Convert country code into upper case format.
$country_code = uc($country_code); $country_code = uc($country_code);
@@ -912,7 +909,7 @@ sub TorNodeDescription() {
$node->{'address'} = $3; $node->{'address'} = $3;
$node->{'port'} = $4; $node->{'port'} = $4;
my $country_code = &Location::Functions::lookup_country_code($db_handle, $node->{'address'}); my $country_code = &Location::Functions::lookup_country_code($node->{'address'});
$node->{'country_code'} = $country_code; $node->{'country_code'} = $country_code;
# Flags # Flags