From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Add GeoIP information to ipinfo.cgi
Date: Tue, 19 Jan 2016 00:05:16 +0000
Message-ID: <1453161916.5665.124.camel@ipfire.org>
In-Reply-To: <569D194A.3040407@web.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5383185985131452423=="
List-Id: <development.lists.ipfire.org>

--===============5383185985131452423==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Hi,

no I guess this is kind of alright. I just would have expected a bit
more feedback from the others here. Seems to be a bit of a lonely show
at the moment.

I have stated that at an other occasion recently that I do not think
that the information from a whois query and the geoip database is that
much related, but if it helps people that is okay for me.

However this seems to be an issue:

  The rules are pretty simple: If you comply and agree with the IPFire 
  Project Contributor Agreement, then you just add a line saying

    Signed-off-by: Random Developer <random(a)developer.example.org>

  using your real name. No pseudonyms or anonymous contributions.

From: http://wiki.ipfire.org/devel/git/tags

Best,
-Michael

On Mon, 2016-01-18 at 17:56 +0100, IT Superhack wrote:
> 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.
> > 
> > The ip address is given to Geo::IP::PurePerl first, then
> > the country code and the flag icon path are queried.
> > 
> > Fixes a feature request filed under bug #10946
> > 
> > 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 @@
> >  ##################################################################
> > #############
> >  
> >  use IO::Socket;
> > +use Geo::IP::PurePerl;
> >  use strict;
> >  
> >  # enable only the following on debugging purpose
> > @@ -27,10 +28,13 @@ use strict;
> >  #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";
> >  
> >  my %cgiparams=();
> > +my $s;
> > +my @key;
> >  
> >  &Header::showhttpheaders();
> >  
> > @@ -52,6 +56,14 @@ next if $addr eq "";
> >  	my $iaddr = inet_aton($addr);
> >  	my $hostname = gethostbyaddr($iaddr, AF_INET);
> >  	if (!$hostname) { $hostname = $Lang::tr{'lookup failed'};
> > }
> > +	
> > +	# geoip lookup
> > +	my $geoaddr = Geo::IP::PurePerl->new();
> > +	my $ccode = $geoaddr->country_code_by_name($addr);
> > +	my $fcode = lc($ccode);
> > +	# Get flag icon for of the country.
> > +	my $flag_icon = &GeoIP::get_flag_icon($ccode);
> > +	
> >  
> >  	my $sock = new IO::Socket::INET ( PeerAddr => $whoisname,
> > PeerPort => 43, Proto => 'tcp');
> >  	if ($sock)
> > @@ -84,7 +96,9 @@ next if $addr eq "";
> >  		@lines = ( "$Lang::tr{'unable to contact'}
> > $whoisname" );
> >  	}
> >  
> > -	&Header::openbox('100%', 'left', $addr . ' (' . $hostname
> > . ') : '.$whoisname);
> > +	# include geoip information here
> > +	&Header::openbox('100%', 'left', $addr . ' <a href=\'/cgi
> > -bin/country.cgi#' . $fcode . '\'><img src=\'' . $flag_icon . '\'
> > border=\'0\' align=\'absmiddle\' alt=\'' 
> > +.$ccode .'\' title=\'' . $ccode . '\'></a> (' . $hostname . ') :
> > '.$whoisname);
> >  	print "<pre>\n";
> >  	foreach my $line (@lines) {
> >  		print &Header::cleanhtml($line,"y");
> > 
> 
> 

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSlduWDI4QUFvSkVJQjU4UDl2a0FrSFdja1AvMWdpeHpmRXlTQzd4YVNjQVFwemI2M2EK
QjBEZkRJMGVjVzhlWXRkTHdTRUtOSXZGeGZpaXMrLzFmYkM4R1FFalBmYnQ4TzZ3RTRZNzlMRWpM
d1BuM0JXZQpzRnl0cUFLc3VBOHVrT25ldFBERkFCT2pmUjZ3ZldibURGbC9abm5RUG5sZFB3WXR4
dEhrZGRxcXlVNmxuVkM2CkFXcUEyakVSMWU2UXdEbURISzArcVd5eHhNNm1qcnhJeHJEQVVYcUxO
SFFIeVZvQ2hqUU9MQ1hUdnQ5NHVFQUcKTjFaWFNpMWFEa2ExU2RlQ25SellFN1ZTb044K3d3L3ov
cmJLSXZLRkp4SnN2SXNGVEhmSlQxclhURWFTTE1LNApVcWxsSUpNeDM5MWJzd1JucmNiMVVmc0JO
TWp0aE81UStoSGh0WDZ4QUNLS3MzdmpsTC9hNGVCbzI1dEtVcTZ4CmhIS3VBSXdvcFVlSVQzREkz
RllneEk0UExTS2tiaWtqRGJrYUswbXBxNlNEcXl1b014a3R4MEJsMzNOR2ZHSTIKS1RBQ2ZNcnVn
TnY3SFpoNjJ5ckpMcjQxWWgwTjRmNWIwNW90cVhIOGpkdlR0ZmZDSlpjOXp2U1pidUp6UE1mdgpw
MktJS1R1eXhZYXlmTWdGYXRsdXdkMVNodVFoY2pkY2FNWmlSb3dSUC9OWDhzd2MxR2wzUzNvZWtn
aytEUmh6CkRmeDVHRkdOY2ZrTXV0ZlduRWhxejh5aGJNV0RkYll2b2ViUFNDR2o0WkZJL21jOExW
TzFzS0dPT2Ewd0JxM1AKY01kVm96LzIxWlVPbzRTb2crdVVDUWFEVWZaWWtjQjM2ZloxK3Rxa2Za
ejVKd3lhREcvWEVDR1dkL21Hdkh6VQp4aTQ2ZU12SU81ZFdQU3JIMVk1RAo9cTRTYQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============5383185985131452423==--