From mboxrd@z Thu Jan  1 00:00:00 1970
From: IT Superhack <itsuperhack@web.de>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Add GeoIP information to ipinfo.cgi
Date: Mon, 18 Jan 2016 17:56:42 +0100
Message-ID: <569D194A.3040407@web.de>
In-Reply-To: <5686AC3C.8040805@web.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0702331229597584278=="
List-Id: <development.lists.ipfire.org>

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

Hello development-list,

I was just wondering if something is wrong
with the patch (code error/bad style?) because there
was no answer within ~ two weeks.

Best regards,
Timmothy Wilson

IT Superhack:
> Add the GeoIP information to the general ip information
> (address, reverse dns name) on the ipinfo.cgi.
>=20
> The ip address is given to Geo::IP::PurePerl first, then
> the country code and the flag icon path are queried.
>=20
> Fixes a feature request filed under bug #10946
>=20
> Signed-off-by: Timmothy Wilson <itsuperhack(a)web.de>
> ---
> diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
> index 71098a2..cebce23 100644
> --- a/html/cgi-bin/ipinfo.cgi
> +++ b/html/cgi-bin/ipinfo.cgi
> @@ -20,6 +20,7 @@
>  ##########################################################################=
#####
> =20
>  use IO::Socket;
> +use Geo::IP::PurePerl;
>  use strict;
> =20
>  # enable only the following on debugging purpose
> @@ -27,10 +28,13 @@ use strict;
>  #use CGI::Carp 'fatalsToBrowser';
> =20
>  require '/var/ipfire/general-functions.pl';
> +require "${General::swroot}/geoip-functions.pl";
>  require "${General::swroot}/lang.pl";
>  require "${General::swroot}/header.pl";
> =20
>  my %cgiparams=3D();
> +my $s;
> +my @key;
> =20
>  &Header::showhttpheaders();
> =20
> @@ -52,6 +56,14 @@ next if $addr eq "";
>  	my $iaddr =3D inet_aton($addr);
>  	my $hostname =3D gethostbyaddr($iaddr, AF_INET);
>  	if (!$hostname) { $hostname =3D $Lang::tr{'lookup failed'}; }
> +=09
> +	# geoip lookup
> +	my $geoaddr =3D Geo::IP::PurePerl->new();
> +	my $ccode =3D $geoaddr->country_code_by_name($addr);
> +	my $fcode =3D lc($ccode);
> +	# Get flag icon for of the country.
> +	my $flag_icon =3D &GeoIP::get_flag_icon($ccode);
> +=09
> =20
>  	my $sock =3D new IO::Socket::INET ( PeerAddr =3D> $whoisname, PeerPort =
=3D> 43, Proto =3D> 'tcp');
>  	if ($sock)
> @@ -84,7 +96,9 @@ next if $addr eq "";
>  		@lines =3D ( "$Lang::tr{'unable to contact'} $whoisname" );
>  	}
> =20
> -	&Header::openbox('100%', 'left', $addr . ' (' . $hostname . ') : '.$whois=
name);
> +	# include geoip information here
> +	&Header::openbox('100%', 'left', $addr . ' <a href=3D\'/cgi-bin/country.c=
gi#' . $fcode . '\'><img src=3D\'' . $flag_icon . '\' border=3D\'0\' align=3D=
\'absmiddle\' alt=3D\''=20
> +.$ccode .'\' title=3D\'' . $ccode . '\'></a> (' . $hostname . ') : '.$whoi=
sname);
>  	print "<pre>\n";
>  	foreach my $line (@lines) {
>  		print &Header::cleanhtml($line,"y");
>=20



--===============0702331229597584278==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRRWNCQUVCQ2dBR0JRSlduUmxWQUFvSkVP
eUxhMUM1RWF6ckNDRUlBSmxvWGhiTVVwK1BPRFRzSXZydjVDUUMKYjJHZU53NmVYZEZRbmQ5cjM0
SG9BaTRmSFZpY2x0cXVUNUZVSjAxbnR0VUhEZTBEdmdRbVRQMGdXWUs2YnVvUApmbm1aYTc0Ykx6
NFZFTW5TSW9lbVF6a2l6ODIrdnkyQzVXL3ZkS0lYWG5wKzFXZ1ZzRWpyYVJvOWszeFM3dmE2CnBm
Tk1ta1BtV1lLdHdnSjRUVVVNRm9LTDFPRG1VeDFhYTk4dXpBZUl3SFBzQzV1cVFVMkpLa05GZVJm
YXRTSnQKQ21YVnFDakVoWUdaNUUwb09mQzZDeDJkR09BN3FrQ2lHS1h2VG5oOEFZaUdqT0owKzdw
OUlqd3Z6RGlmYU5GcApoWmV4UWVjWEZZWFFQZDBkV2RUa0tiNk12djlUVDE0akxKdlJvelpaV1Ux
QW5UQUVaUzZjTjRPTEZZTVZuWW89Cj1KUE1rCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============0702331229597584278==--