From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 6/6] geoip-functions.pl: Re-write code to lookup the iso
 country code of a given IP-address.
Date: Thu, 10 Jan 2019 13:00:17 +0100
Message-ID: <20190110120017.6595-6-stefan.schantl@ipfire.org>
In-Reply-To: <20190110120017.6595-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4968076567423055537=="
List-Id: <development.lists.ipfire.org>

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

Drop the usage of the old legacy GeoIP perl module which was not able to hand=
le the
new GeoLite2 databases.

Write some code to directly access the databases and extract the required dat=
a.

Usage of the GeoIP2 perl module would provide a lot of more functionality whi=
ch is not
used/needed. Unfortunately ir requires at lot of additional perl modules whic=
h are
not available on IPFire and would only be build and shipped for this module. =
Buildig all
of them will slow down the entire build process, mess up the system and requi=
res a lot
more space on disk.

Fixes #11962.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/geoip-functions.pl | 75 ++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 7 deletions(-)

diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functio=
ns.pl
index be50d5e14..e8ce8377f 100644
--- a/config/cfgroot/geoip-functions.pl
+++ b/config/cfgroot/geoip-functions.pl
@@ -23,21 +23,82 @@
=20
 package GeoIP;
=20
-use Geo::IP::PurePerl;
+require '/var/ipfire/network-functions.pl';
+
 use Locale::Codes::Country;
=20
-my $database;
+# Path where all the GeoIP related databases are stored.
+my $geoip_database_dir =3D "/var/lib/GeoIP";
+
+# Database which contains all IPv4 networks.
+my $address_ipv4_database =3D "GeoLite2-Country-Blocks-IPv4.csv";
+
+# Database wich contains the locations data.
+my $location_database =3D "GeoLite2-Country-Locations-en.csv";
=20
 sub lookup($) {
 	my $address =3D shift;
+	my $location_id;
+	my $country_code;
+
+	# Check if the given address is valid.
+	unless(&Network::check_ip_address($address)) {
+		return;
+	}
+
+	# Open the address database.
+	open(ADDRESS, "$geoip_database_dir/$address_ipv4_database") or die "Could n=
ot open $geoip_database_dir/$address_ipv4_database. $!\n";
+
+	# Loop through the file.
+	while(my $line =3D <ADDRESS>) {
+		# Remove newlines.
+		chomp($line);
+
+		# Split the line content.
+		my ($network, $geoname_id, $registered_country_geoname_id, $represented_co=
untry_geoname_id, $is_anonymous_proxy, $is_satellite_provider) =3D split(/\,/=
, $line);
+
+		# Check if the given address is part of the current processed network.
+		if (&Network::ip_address_in_network($address, $network)) {
+			# Store the geoname_id for this address.
+			$location_id =3D $geoname_id;
+
+			# Break loop.
+			last;
+		}
+	}
+
+	# Return nothing if no location_id could be found.
+	return unless($location_id);
+
+	# Close filehandle.
+	close(ADDRESS);
+
+	# Open the location database.
+	open(LOCATION, "$geoip_database_dir/$location_database") or die "Could not =
open $geoip_database_dir/$location_database. $!\n";
=20
-	# Load the database into memory if not already done
-	if (!$database) {
-		$database =3D Geo::IP::PurePerl->new(GEOIP_MEMORY_CACHE);
+	# Loop through the file.
+	while(my $line =3D <LOCATION>) {
+		# Remove newlines.
+		chomp($line);
+
+		# Split the line content.
+		my ($geoname_id, $locale_code, $continent_code, $continent_name, $country_=
iso_code, $country_name, $is_in_european_union) =3D split(/\,/, $line);
+
+		# Check if the correct location_id has been found.
+		if ($geoname_id eq $location_id) {
+			# Store the county code.
+			$country_code =3D $country_iso_code;
+
+			# Break loop.
+			last;
+		}
 	}
=20
-	# Return the name of the country
-	return $database->country_code_by_name($address);
+	# Close filehandle.
+	close(LOCATION);
+
+	# Return the obtained country code.
+	return $country_code;
 }
=20
 # Function to get the flag icon for a specified country code.
--=20
2.19.1


--===============4968076567423055537==--