From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH] display GeoIP information on ipinfo.cgi
Date: Tue, 07 Nov 2017 21:04:50 +0100
Message-ID: <20171107210450.081bf696.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3599476369089519106=="
List-Id: <development.lists.ipfire.org>

--===============3599476369089519106==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Display GeoIP flag on ipinfo.cgi in the WebUI.

This might make firewall rule debugging easier and fixes bug #10946.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 html/cgi-bin/ipinfo.cgi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index 16541f126..689d05a0e 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -21,6 +21,7 @@
=20
 use CGI;
 use IO::Socket;
+use Geo::IP::PurePerl;
 use strict;
=20
 # enable only the following on debugging purpose
@@ -30,6 +31,7 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/geoip-functions.pl";
=20
 my %cgiparams=3D();
=20
@@ -49,6 +51,11 @@ if (&General::validip($addr)) {
 	my $iaddr =3D inet_aton($addr);
 	my $hostname =3D gethostbyaddr($iaddr, AF_INET);
 	if (!$hostname) { $hostname =3D $Lang::tr{'lookup failed'}; }
+=09
+	my $gi =3D Geo::IP::PurePerl->new();
+	my $ccode =3D $gi->country_code_by_name($addr);
+	my $fcode =3D lc($ccode);
+	my $flag_icon =3D &GeoIP::get_flag_icon($fcode);
=20
 	my $sock =3D new IO::Socket::INET ( PeerAddr =3D> $whoisname, PeerPort =3D>=
 43, Proto =3D> 'tcp');
 	if ($sock)
@@ -81,7 +88,7 @@ if (&General::validip($addr)) {
 		@lines =3D ( "$Lang::tr{'unable to contact'} $whoisname" );
 	}
=20
-	&Header::openbox('100%', 'left', $addr . ' (' . $hostname . ') : '.$whoisna=
me);
+	&Header::openbox('100%', 'left', $addr . " <a href=3D'country.cgi#$fcode'><=
img src=3D'$flag_icon' border=3D'0' align=3D'absmiddle' title=3D'$ccode' /></=
a> (" . $hostname . ') : '.$whoisname);
 	print "<pre>\n";
 	foreach my $line (@lines) {
 		print &Header::cleanhtml($line,"y");
--=20
2.13.6

--===============3599476369089519106==--