X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllogip.dat;h=c73d24fd663fee6af86ff0cc31e669f7acf217b0;hp=8175d5bf062dca94f8d2442f90f89e537917e0ea;hb=00793c27c929b68a21c4ef07044fbbb68942a192;hpb=76dd79d156e4aed6f35e53f9a156c36fd478af69 diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 8175d5bf06..c73d24fd66 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -7,10 +7,10 @@ # JC HERITIER # page inspired from the initial firewalllog.dat # -# Modified for IPFire by Christian Schmidt (www.ipfire.org) +# Modified for IPFire by Christian Schmidt +# and Michael Tremer (www.ipfire.org) use strict; -use Geo::IP::PurePerl; use Getopt::Std; # enable only the following on debugging purpose @@ -18,15 +18,12 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; use POSIX(); -#workaround to suppress a warning when a variable is used only once -my @dummy = ( ${Header::table2colour} ); -undef (@dummy); - my %cgiparams=(); my %settings=(); my $pienumber; @@ -71,7 +68,7 @@ if ($cgiparams{'sortcolumn'} != 0) { $settings{'sortcolumn'} = $cgiparams{'sortc if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { - &General::writehash("${General::swroot}/fwlogs/ipsettings", \%settings); + &General::writehash("${General::swroot}/fwlogs/ipsettings", \%settings); } my $start = -1; @@ -91,61 +88,61 @@ if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) || } elsif($cgiparams{'ACTION'} eq '>>') { - my @temp_then=(); - my @temp_now = localtime(time); - $temp_now[4] = $cgiparams{'MONTH'}; - $temp_now[3] = $cgiparams{'DAY'}; - @temp_then = localtime(POSIX::mktime(@temp_now) + 86400); - ## Retrieve the same time on the next day - - ## 86400 seconds in a day - $cgiparams{'MONTH'} = $temp_then[4]; - $cgiparams{'DAY'} = $temp_then[3]; + my @temp_then=(); + my @temp_now = localtime(time); + $temp_now[4] = $cgiparams{'MONTH'}; + $temp_now[3] = $cgiparams{'DAY'}; + @temp_then = localtime(POSIX::mktime(@temp_now) + 86400); + ## Retrieve the same time on the next day - + ## 86400 seconds in a day + $cgiparams{'MONTH'} = $temp_then[4]; + $cgiparams{'DAY'} = $temp_then[3]; } elsif($cgiparams{'ACTION'} eq '<<') { - my @temp_then=(); - my @temp_now = localtime(time); - $temp_now[4] = $cgiparams{'MONTH'}; - $temp_now[3] = $cgiparams{'DAY'}; - @temp_then = localtime(POSIX::mktime(@temp_now) - 86400); - ## Retrieve the same time on the previous day - - ## 86400 seconds in a day - $cgiparams{'MONTH'} = $temp_then[4]; - $cgiparams{'DAY'} = $temp_then[3]; + my @temp_then=(); + my @temp_now = localtime(time); + $temp_now[4] = $cgiparams{'MONTH'}; + $temp_now[3] = $cgiparams{'DAY'}; + @temp_then = localtime(POSIX::mktime(@temp_now) - 86400); + ## Retrieve the same time on the previous day - + ## 86400 seconds in a day + $cgiparams{'MONTH'} = $temp_then[4]; + $cgiparams{'DAY'} = $temp_then[3]; } if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4])) { - my @then = (); - if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) || - ( $cgiparams{'MONTH'} > $now[4] ) ) { - @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 )); - } else { - @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 )); - } - $tdoy = $then[7]; - my $lastleap=($year-1)%4; - if ($tdoy>$doy) { - if ($lastleap == 0 && $tdoy < 60) { - $doy=$tdoy+366; - } else { - $doy=$doy+365; - } - } + my @then = (); + if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) || + ( $cgiparams{'MONTH'} > $now[4] ) ) { + @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 )); + } else { + @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 )); + } + $tdoy = $then[7]; + my $lastleap=($year-1)%4; + if ($tdoy>$doy) { + if ($lastleap == 0 && $tdoy < 60) { + $doy=$tdoy+366; + } else { + $doy=$doy+365; + } + } } my $datediff=0; my $dowd=0; my $multifile=0; if ($tdoy ne $doy) { - $datediff=int(($doy-$tdoy)/7); - $dowd=($doy-$tdoy)%7; - if (($dow-$dowd)<1) { - $datediff=$datediff+1; - } - if (($dow-$dowd)==0) { - $multifile=1; - } + $datediff=int(($doy-$tdoy)/7); + $dowd=($doy-$tdoy)%7; + if (($dow-$dowd)<1) { + $datediff=$datediff+1; + } + if (($dow-$dowd)==0) { + $multifile=1; + } } my $monthstr = $shortmonths[$cgiparams{'MONTH'}]; @@ -161,48 +158,48 @@ else { my $skip=0; my $filestr=''; if ($datediff==0) { - $filestr="/var/log/messages"; + $filestr="/var/log/messages"; } else { $filestr="/var/log/messages.$datediff"; $filestr = "$filestr.gz" if -f "$filestr.gz"; } if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) { - $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}"; - $skip=1; - # Note: This is in case the log does not exist for that date + $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}"; + $skip=1; + # Note: This is in case the log does not exist for that date } my $lines = 0; my @log=(); if (!$skip) { - while () - { - if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { + while () + { + if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { $log[$lines] = $_; $lines++; } } - close (FILE); + close (FILE); } $skip=0; if ($multifile) { - $datediff=$datediff-1; - if ($datediff==0) { - $filestr="/var/log/messages"; - } else { - $filestr="/var/log/messages.$datediff"; - $filestr = "$filestr.gz" if -f "$filestr.gz"; - } - if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) { - $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}"; - $skip=1; - } - if (!$skip) { + $datediff=$datediff-1; + if ($datediff==0) { + $filestr="/var/log/messages"; + } else { + $filestr="/var/log/messages.$datediff"; + $filestr = "$filestr.gz" if -f "$filestr.gz"; + } + if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) { + $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}"; + $skip=1; + } + if (!$skip) { while () { - if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { + if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { $log[$lines] = $_; $lines++; } @@ -214,7 +211,7 @@ if ($multifile) { my $MODNAME="fwlogs"; &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log ip'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -224,7 +221,7 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'settings'}"); print < @@ -240,7 +237,8 @@ for ($month = 0; $month < 12; $month++) { print "\t\n"; } print <$day\n"; } @@ -269,21 +268,21 @@ print < - + + + + $Lang::tr{'Number of IPs for the pie chart'}: + + - - - - -
$Lang::tr{'Number of IPs for the pie chart'}:
- + END ; &Header::closebox(); -&Header::openbox('100%', 'left', 'Firewall Logs'); +&Header::openbox('100%', 'left', $Lang::tr{'firewall graph ip'}); print "

$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines

"; my $linesjc = 0; @@ -293,11 +292,12 @@ if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber = $lines = 0; foreach $_ (@log) { - if($_ =~ /SRC\=([\d\.]+)/){ - $tabjc{$1} = $tabjc{$1} + 1 ; - if(($tabjc{$1} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; } - $linesjc++; - } + # Extract ipv4 or ipv6 address + if (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { + $tabjc{$1} = $tabjc{$1} + 1 ; + if(($tabjc{$1} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; } + $linesjc++; + } } $pienumber = $lines; @@ -338,15 +338,15 @@ my $v; if ($sortcolumn == 1) { for ($v=0;$v<$pienumber;$v++){ - findkey($tabjc2[$v]); + findkey($tabjc2[$v]); } } else { foreach $v (@tabjc2) { - $key[$indice] = $v; - $value[$indice] = $tabjc{$v}; - $indice++; + $key[$indice] = $v; + $value[$indice] = $tabjc{$v}; + $indice++; } } @@ -362,7 +362,7 @@ if($cgiparams{'otherspie'} == 2 ){} else{ my $numothers; for($o=0;$o<$pienumber;$o++){ - $numothers = $numothers + $numb[$o]; + $numothers = $numothers + $numb[$o]; } $numothers = $linesjc - $numothers; if ($numothers > 0) { @@ -373,7 +373,12 @@ else{ my @data = (\@ips,\@numb); use GD::Graph::colour qw( :files ); -GD::Graph::colour::read_rgb( "/srv/web/ipfire/cgi-bin/logs.cgi/colours.txt" ); + +my $color=0; +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { my $mygraph = GD::Graph::pie->new(500, 350); @@ -381,154 +386,123 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { 'title' => '', 'pie_height' => 50, 'start_angle' => 89 - ) or warn $mygraph->error; + ) or warn $mygraph->error; $mygraph->set_value_font(GD::gdMediumBoldFont); - $mygraph->set( dclrs => [ "colour1" , "colour2" , "colour3" , "colour4" , "colour5" , "colour6" , "colour7" , "colour8" , "colour9" , "colour10" ] ); + $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] ); my $myimage = $mygraph->plot(\@data) or die $mygraph->error; - my @filenames = glob("/srv/web/ipfire/html/fwlogs/ip*.png"); + my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-ip*.png"); unlink(@filenames); my $imagerandom = rand(1000000); - my $imagename = "/srv/web/ipfire/html/fwlogs/ip$imagerandom.png"; + my $imagename = "/srv/web/ipfire/html/graphs/fwlog-ip$imagerandom.png"; open(FILE,">$imagename"); print FILE $myimage->png; close(FILE); ##################################################### - print "
"; - print ""; - print "
"; + print "
"; + print ""; + print "
"; } print < - - -IP -Flag -Count -Percent - + + + + + + + + END ; my $total=0; my $show=0; -my @colour; -my $colour1; -my $colour2; -my $colour3; -my $colour4; -my $colour5; -my $colour6; -my $colour7; -my $colour8; -my $colour9; -my $colour10; - -@colour = GD::Graph::colour::_rgb("colour1"); -$colour1 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour2"); -$colour2 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour3"); -$colour3 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour4"); -$colour4 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour5"); -$colour5 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour6"); -$colour6 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour7"); -$colour7 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour8"); -$colour8 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour9"); -$colour9 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour10"); -$colour10 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); my $s; my $percent; +my $col=""; + for($s=0;$s<$lines;$s++) { - $show++; - $percent = $value[$s] * 100 / $linesjc; - $percent = sprintf("%.3f", $percent); - $total = $total + $value[$s]; - if ( ($colour % 10) == 1 ){print "\n";} - if ( ($colour % 10) == 2 ){print "\n";} - if ( ($colour % 10) == 3 ){print "\n";} - if ( ($colour % 10) == 4 ){print "\n";} - if ( ($colour % 10) == 5 ){print "\n";} - if ( ($colour % 10) == 6 ){print "\n";} - if ( ($colour % 10) == 7 ){print "\n";} - if ( ($colour % 10) == 8 ){print "\n";} - if ( ($colour % 10) == 9 ){print "\n";} - if ( ($colour % 10) == 0 ){print "\n";} + $show++; + $percent = $value[$s] * 100 / $linesjc; + $percent = sprintf("%.f", $percent); + $total = $total + $value[$s]; + # colors are numbered 1 to 10 + my $colorIndex = ($color % 10) + 1; + $col="bgcolor='$color{\"color$colorIndex\"}'"; + print ""; + + my $ccode = &GeoIP::lookup($key[$s]); - my $gi = Geo::IP::PurePerl->new(); - my $ccode = $gi->country_code_by_name($key[$s]); - my $fcode = lc($ccode); - - $colour++; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; + $color++; + print ""; + print ""; + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($ccode); + + if ( $flag_icon ) { + print ""; + } else { + print ""; + } + + print ""; + print ""; + print ""; } if($cgiparams{'otherspie'} == 2 ){} else{ -if ( ($colour % 10) == 1 ){print "\n";} -if ( ($colour % 10) == 2 ){print "\n";} -if ( ($colour % 10) == 3 ){print "\n";} -if ( ($colour % 10) == 4 ){print "\n";} -if ( ($colour % 10) == 5 ){print "\n";} -if ( ($colour % 10) == 6 ){print "\n";} -if ( ($colour % 10) == 7 ){print "\n";} -if ( ($colour % 10) == 8 ){print "\n";} -if ( ($colour % 10) == 9 ){print "\n";} -if ( ($colour % 10) == 0 ){print "\n";} - -my $dif; -$dif = $linesjc - $total; -$percent = $dif * 100 / $linesjc; -$percent = sprintf("%.3f", $percent); -print < - - - - - + # colors are numbered 1 to 10 + my $colorIndex = ($color % 10) + 1; + $col="bgcolor='$color{\"color$colorIndex\"}'"; + print ""; + + if ( $linesjc ne "0") + { + my $dif; + $dif = $linesjc - $total; + $percent = $dif * 100 / $linesjc; + $percent = sprintf("%.f", $percent); + print < + + + + + END -; + ; + } } print < +
$Lang::tr{'ip address'}$Lang::tr{'country'}$Lang::tr{'count'}$Lang::tr{'percentage'}
$key[$s]$ccode$value[$s]$percent
$key[$s]$ccode$value[$s]$percent
$Lang::tr{'otherip'}$dif$percent
$Lang::tr{'otherip'}$dif$percent
END ; &Header::closebox(); - &Header::closebigbox(); - &Header::closepage(); sub findkey { - my $v; - foreach $v (@keytabjc) { - if ($tabjc{$v} eq $_[0]) { - delete $tabjc{$v}; - $key[$indice] = "$v"; - $value[$indice] = $_[0]; - $indice++; - last; - } - } -}sub checkversion { + my $v; + foreach $v (@keytabjc) { + if ($tabjc{$v} eq $_[0]) { + delete $tabjc{$v}; + $key[$indice] = "$v"; + $value[$indice] = $_[0]; + $indice++; + last; + } + } +} + +sub checkversion { #Automatic Updates is disabled return "0","0"; - } +} +