From b76a8a008dca77f8ea9b68c95b2d04e074dfef64 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 10 Jan 2019 13:00:15 +0100
Subject: [PATCH] xt_geoip_update: Adjust script to download and use the
 GeoLite2 database

Fixes #11961.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/scripts/xt_geoip_update | 63 ++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 0aea4d03ef..73484c7a06 100644
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -24,13 +24,10 @@ TMP_FILE=$(mktemp -p $TMP_PATH)
 
 SCRIPT_PATH=/usr/local/bin
 DEST_PATH=/usr/share/xt_geoip
+DB_PATH=/var/lib/GeoIP
 
-DL_URL=https://geolite.maxmind.com/download/geoip/database
-DL_FILE=GeoIPCountryCSV.zip
-
-CSV_FILE=GeoIPCountryWhois.csv
-
-ARCH=LE
+DL_URL=http://geolite.maxmind.com/download/geoip/database/
+DL_FILE=GeoLite2-Country-CSV.zip
 
 eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
 
@@ -57,42 +54,41 @@ function download() {
 	# Get the latest GeoIP database from server.
 	wget $DL_URL/$DL_FILE $PROXYSETTINGS -O $TMP_FILE
 
-	# Extract files.
+	# Extract files to database path.
 	unzip $TMP_FILE -d $TMP_PATH
 
 	return 0
 }
 
-function build() {
-	echo "Convert database..."
+function install() {
+	echo "Install CSV database..."
 
-	# Check if the csv file exists.
-	if [ ! -e $TMP_PATH/$CSV_FILE ]; then
-		echo "$TMP_PATH/$CSV_FILE not found. Exiting."
-		return 1
+	# Check if the database dir exists.
+	if [ ! -e "$DB_PATH" ]; then
+		mkdir -p $DB_PATH &>/dev/null
 	fi
 
-	# Run script to convert the CSV file into several xtables
-	# compatible binary files.
-	if ! $SCRIPT_PATH/xt_geoip_build $TMP_PATH/$CSV_FILE -D $TMP_PATH; then
-		echo "Could not convert ruleset. Aborting." >&2
+	# Check if the directory for binary databases exists.
+        if [ ! -e "$DEST_PATH" ]; then
+                mkdir -p $DEST_PATH &>/dev/null
+        fi
+
+	# Install CSV databases.
+	if ! cp -af $TMP_PATH/*/* $DB_PATH &>/dev/null; then
+		echo "Could not copy files. Aborting." >&2
 		return 1
 	fi
 
 	return 0
 }
 
-function install() {
-	echo "Install databases..."
-
-	# Check if our destination exist.
-	if [ ! -e "$DEST_PATH" ]; then
-		mkdir -p $DEST_PATH &>/dev/null
-	fi
+function build() {
+	echo "Convert database..."
 
-	# Install databases.
-	if ! cp -af $TMP_PATH/$ARCH $DEST_PATH &>/dev/null; then
-		echo "Could not copy files. Aborting." >&2
+	# Run script to convert the CSV file into several xtables
+	# compatible binary files.
+	if ! $SCRIPT_PATH/xt_geoip_build -S $DB_PATH -D $DEST_PATH; then
+		echo "Could not convert ruleset. Aborting." >&2
 		return 1
 	fi
 
@@ -113,23 +109,18 @@ function main() {
 	# Download ruleset.
 	download || exit $?
 
-	# Convert the ruleset.
-	if ! build; then
-		# Do cleanup.
-		cleanup || exit $?
-		exit 1
-	fi
-
-	# Install the converted ruleset.
 	if ! install; then
 		# Do cleanup.
 		cleanup || exit $?
 		exit 1
 	fi
 
-	# Finaly remove temporary files.
+	# Remove temporary files.
 	cleanup || exit $?
 
+	# Convert the ruleset.
+	build || exit $?
+
 	return 0
 }
 
-- 
2.39.2