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 v2] add GeoIP and rDNS information to used nameservers
Date: Wed, 15 Nov 2017 22:49:00 +0100
Message-ID: <20171115224900.2422e927.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7609982644623675800=="
List-Id: <development.lists.ipfire.org>

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

Add GeoIP and rDNS information to DNS nameserver list at netexternal.cgi

Use newly implemented GeoIP function in /var/ipfire/geoip-functions.pl

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 html/cgi-bin/netexternal.cgi | 27 ++++++++++++++++++++++++++-
 langs/de/cgi-bin/de.pl       |  1 +
 langs/en/cgi-bin/en.pl       |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index 299612d4c..4393393e0 100644
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -25,9 +25,12 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
=20
+use IO::Socket;
+
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/geoip-functions.pl";
 require "${General::swroot}/graphs.pl";
=20
 my %color =3D ();
@@ -99,6 +102,12 @@ if ( $querry[0] ne~ ""){
 						<strong>$Lang::tr{'nameserver'}</strong>
 					</th>
 					<th align=3D"center">
+						<strong>$Lang::tr{'country'}</strong>
+					</th>
+					<th align=3D"center">
+						<strong>$Lang::tr{'rdns'}</strong>
+					</th>
+					<th align=3D"center">
 						<strong>$Lang::tr{'status'}</strong>
 					</th>
 				</tr>
@@ -139,9 +148,25 @@ END
=20
 		my $table_colour =3D ($id++ % 2) ? $color{'color22'} : $color{'color20'};
=20
+		# collect more information about name server (rDNS, GeoIP country code)
+		my $ccode =3D &GeoIP::lookup($nameserver);
+		my $flag_icon =3D &GeoIP::get_flag_icon($ccode);
+
+		my $iaddr =3D inet_aton($nameserver);
+		my $rdns =3D gethostbyaddr($iaddr, AF_INET);
+		if (!$rdns) { $rdns =3D $Lang::tr{'lookup failed'}; }
+
 		print <<END;
 			<tr bgcolor=3D"$table_colour">
-				<td>$nameserver</td>
+				<td>
+					$nameserver
+				</td>
+				<td align=3D"center">
+					<a href=3D'country.cgi#$ccode'><img src=3D"$flag_icon" border=3D"0" alt=
=3D"$ccode" title=3D"$ccode" /></a>
+				</td>
+				<td align=3D"center">
+					$rdns
+				</td>
 				<td bgcolor=3D"$bgcolour" align=3D"center">
 					<font color=3D"$colour"><strong>$message</strong></font>
 				</td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6dff5d781..ae87464d2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1962,6 +1962,7 @@
 'read bytes' =3D> 'Gelesene Bytes',
 'read list' =3D> 'Liste der Leseberechtigten',
 'real address' =3D> 'Reale Addresse',
+'rdns' =3D> 'rDNS',
 'reboot' =3D> 'Neustart',
 'reboot ask' =3D> 'Neustart?',
 'reboot question' =3D> 'Extra Abfrage bei neustart und herunterfahren einsch=
alten',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4efff6e65..3af17d5dc 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1997,6 +1997,7 @@
 'quick playlist' =3D> 'Quick Playlist',
 'ram' =3D> 'RAM',
 'random number generator daemon' =3D> 'Random Number Generator Daemon',
+'rdns' =3D> 'rDNS',
 'read bytes' =3D> 'Read Bytes',
 'read list' =3D> 'list with readonly hosts',
 'real address' =3D> 'Real Address',
--=20
2.13.6

--===============7609982644623675800==--