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

logs.cgi/*: Use new location lookup method.

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2019-12-06 14:30:39 +01:00
parent 87bc6401bc
commit 50494dfd6e
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,9 @@ require "${General::swroot}/geoip-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 = &GeoIP::init();
my %color = (); my %color = ();
my %mainsettings = (); my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -351,7 +354,7 @@ 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 = &GeoIP::lookup($srcaddr); my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $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,6 +22,9 @@ require "${General::swroot}/geoip-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 = &GeoIP::init();
use POSIX(); use POSIX();
my %cgiparams=(); my %cgiparams=();
@@ -308,7 +311,7 @@ foreach $_ (@log)
# Traffic from red # Traffic from red
if($srcaddr ne '') { if($srcaddr ne '') {
# srcaddr is set # srcaddr is set
my $ccode = &GeoIP::lookup($srcaddr); my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $srcaddr);
if ($ccode eq '') { if ($ccode eq '') {
$ccode = 'unknown'; $ccode = 'unknown';
} }

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

@@ -22,6 +22,9 @@ require "${General::swroot}/geoip-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 = &GeoIP::init();
use POSIX(); use POSIX();
my %cgiparams=(); my %cgiparams=();
@@ -435,7 +438,7 @@ for($s=0;$s<$lines;$s++)
$col="bgcolor='$color{\"color$colorIndex\"}'"; $col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>"; print "<tr>";
my $ccode = &GeoIP::lookup($key[$s]); my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $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>";

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

@@ -19,6 +19,9 @@ require "${General::swroot}/geoip-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 = &GeoIP::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
@@ -178,7 +181,7 @@ if (!$skip)
} }
elsif($srcaddr ne '') { elsif($srcaddr ne '') {
# or srcaddr matches country code # or srcaddr matches country code
my $ccode = &GeoIP::lookup($srcaddr); my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $srcaddr);
if($ccode eq uc($country)){ if($ccode eq uc($country)){
$log[$lines] = $_; $log[$lines] = $_;
$lines++; $lines++;