From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] display GeoIP information on active network connections in WebUI Date: Thu, 09 Nov 2017 22:34:45 +0000 Message-ID: <1510266885.2945.7.camel@ipfire.org> In-Reply-To: <20171108225248.204ac963.peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4767903482689279138==" List-Id: --===============4767903482689279138== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, I just posted a patch that does this. Please have a look at it. Best, -Michael On Wed, 2017-11-08 at 22:52 +0100, Peter M=C3=BCller wrote: > Hello Michael, >=20 > > Basically this patch looks simple and good to me. >=20 > Thanks, finally. :-) > >=20 > > But since we are using the perl module quite a bit, could we not put > > those few lines into a function so that if we need to change anything > > we do that everywhere at once? > >=20 > > And secondly, I have some systems that have thousands of open > > connections very often to the same IP addresses. Could we not add a > > caching layer so that this isn't being looked up multiple times for the > > same IP address if that is an expensive operation? >=20 > Could you (or somebody else) do this, please? I am afraid this is > one step to far for me at the moment. >=20 > Thanks and best regards, > Peter M=C3=BCller > >=20 > > -Michael > >=20 > > On Tue, 2017-11-07 at 20:42 +0100, Peter M=C3=BCller wrote: > > > Display the GeoIP flag for source and destination IP address > > > on the connection tracking table in WebUI. > > >=20 > > > This could possibly make network or firewall rule debugging easier. > > >=20 > > > Signed-off-by: Peter M=C3=BCller > > > --- > > > html/cgi-bin/connections.cgi | 26 ++++++++++++++++++++++++++ > > > 1 file changed, 26 insertions(+) > > >=20 > > > diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi > > > index 96f09012b..06dc74877 100644 > > > --- a/html/cgi-bin/connections.cgi > > > +++ b/html/cgi-bin/connections.cgi > > > @@ -23,6 +23,7 @@ use strict; > > > =20 > > > use Net::IPv4Addr qw( :all ); > > > use Switch; > > > +use Geo::IP::PurePerl; > > > =20 > > > # enable only the following on debugging purpose > > > #use warnings; > > > @@ -31,6 +32,7 @@ use Switch; > > > require '/var/ipfire/general-functions.pl'; > > > require "${General::swroot}/lang.pl"; > > > require "${General::swroot}/header.pl"; > > > +require "${General::swroot}/geoip-functions.pl"; > > > =20 > > > my $colour_multicast =3D "#A0A0A0"; > > > =20 > > > @@ -372,6 +374,7 @@ print < > > 3D"" > > > 3D"" > > > > > > +   > > > > > > 3D"" > > > 3D"" > > > @@ -386,6 +389,7 @@ print < > > 3D"" > > > 3D"" > > > > > > +   > > > > > > 3D"" > > > 3D"" > > > @@ -409,10 +413,16 @@ print < > > > > > $Lang::tr{'source ip and port'} > > > > > > + > > > + $Lang::tr{'country'} > > > + > > > > > > $Lang::tr{'dest ip and port'} > > > > > > > > > + $Lang::tr{'country'} > > > + > > > + > > > $Lang::tr{'download'} / > > >
$Lang::tr{'upload'} > > > > > > @@ -540,6 +550,16 @@ foreach my $line (@conntrack) { > > > my $bytes_in =3D format_bytes($bytes[0]); > > > my $bytes_out =3D format_bytes($bytes[1]); > > > =20 > > > + my $gi1 =3D Geo::IP::PurePerl->new(); > > > + my $ccode1 =3D $gi1->country_code_by_name($sip_ret); > > > + my $fcode1 =3D lc($ccode1); > > > + my $flag_icon1 =3D &GeoIP::get_flag_icon($fcode1); > > > + > > > + my $gi2 =3D Geo::IP::PurePerl->new(); > > > + my $ccode2 =3D $gi2->country_code_by_name($dip_ret); > > > + my $fcode2 =3D lc($ccode2); > > > + my $flag_icon2 =3D &GeoIP::get_flag_icon($fcode2); > > > +=09 > > > # Format TTL > > > $ttl =3D format_time($ttl); > > > =20 > > > @@ -601,6 +621,9 @@ foreach my $line (@conntrack) { > > > > > > $sport_extra > > > > > > + > > > + > > > + > > > > > > > > > $dip > > > @@ -613,6 +636,9 @@ foreach my $line (@conntrack) { > > > > > > $dport_extra > > > > > > + > > > + > > > + > > > > > > $bytes_in / $bytes_out > > > =20 >=20 >=20 --===============4767903482689279138== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxvRTJBVUFDZ2tRZ0hudy8yK1EKQ1FlUHdnLy9kQklQRlJ2NmxT cFVwbnRkcHFTVEJ1UHUyNHRoOU1YVFoyb0IvMFBkV1hmUVFBQjhXd0hjdkFRcAppTDRDS1pJSFhM WmJWcldYb2pxTDlZaEdoVW15djlQcmpVMW9lL2dJUXU3eHZNYi9vNmxZbWRWSXEwbUZJdEk4CllF U1R6MkpjMlhhM2k2dDNhd0JVcEYzKzB2WXhSZG5MNHY2ekc3RFJMMGZ0NE9XNDhCT1JlOTM3QWlE eWNDRkcKLzdnNERDQjJUWm5za09IWVVvdmRNZEYrWkMwT0hnK1REbS8za2dVaVlCSGpnVER6WDB0 QXRHZHgveUhyTFBRawo3WVp2OTQxdjFOd0UybXlQMGFNV0prVjZMZmN1ZkZqZlB1QnZJN0lEdjlL L2RTQkRIS1hQdm50TjVIaWZ5THIzCkxCemtPUk5NL3RsOE0rUHZHV3M0ZlNleTNVdnJwKzZia3N5 Q1RqUkRyMll1ZWFGa3ZhUmVOUzREck9aRkZZUG8KNm8zcytyWUJLVDBLME92c0VZVXBDdGpMei9l alJIZzVkSzZrd0xCcGkrNW85ZCs2NkFHYkFzK1F0elVBMHRGWgpCUkxlbVpuSWxqb2xLcmM3emFY L2hZamsvVHIwQkUwZk9hRXQ3NG1sbURNd3Z4REdBaXJ4Y0srUkg3YVl6bE5YCmsxaTVvbklEbURt enRDeWF0eVFoRlZJQVRwOGozUjBMaUlwVlUwS1hwd0o2dW5XbEpFaGI2M1ZJQ3FNVUl1a3gKVjho Vmg1QklGTlFTczY4TTlTcDhzZXZJcWhYWVNUdEtUU0JSTzhGc1AzTEhMaldGdnhYQUg0K3F6L0hL dUgrVgpKVnJlWlpUR1RqY3pUSVdOb0R3REF0U21HVEVnc2RHR2hSeHBQOHVNR3FLbFVWajM4T1E9 Cj1pVTh1Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============4767903482689279138==--