use HTTPS for downloading GeoIP database files

[ipfire-2.x.git] / src / scripts / xt_geoip_update

diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 3ad34d0c6d74633c818a66261cce6bec0f7367a0..93884dcf5b67de12467c467b67a4af0f0cca32dd 100644 (file)
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014 IPFire Development Team <info@ipfire.org>                #
+# Copyright (C) 2019 IPFire Development Team <info@ipfire.org>                #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -20,60 +20,75 @@
 ###############################################################################
 
 TMP_PATH=$(mktemp -d)
-TMP_FILE=$(mktemp)
+TMP_FILE=$(mktemp -p $TMP_PATH)
 
-SCRIPT_PATH=/usr/libexec/xtables-addons
+SCRIPT_PATH=/usr/local/bin
 DEST_PATH=/usr/share/xt_geoip
+DB_PATH=/var/lib/GeoIP
 
-DL_URL=http://geolite.maxmind.com/download/geoip/database
-DL_FILE=GeoIPCountryCSV.zip
+DL_URL=https://geolite.maxmind.com/download/geoip/database
+DL_FILE=GeoLite2-Country-CSV.zip
 
-CSV_FILE=GeoIPCountryWhois.csv
-
-ARCH=LE
+eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
 
 function download() {
        echo "Downloading latest GeoIP ruleset..."
 
+       # Create temporary directory.
+       mkdir -pv $TMP_PATH
+
+       # Proxy settings.
+       # Check if a proxy should be used.
+       if [[ $UPSTREAM_PROXY ]]; then
+               PROXYSETTINGS="-e https_proxy=http://"
+
+               # Check if authentication against the proxy is configured.
+               if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then
+                       PROXYSETTINGS="$PROXYSETTINGS$UPSTREAM_USER:$UPSTREAM_PASSWORD@"
+               fi
+
+               # Add proxy server.
+               PROXYSETTINGS="$PROXYSETTINGS$UPSTREAM_PROXY"
+       fi
+
        # Get the latest GeoIP database from server.
-       wget $DL_URL/$DL_FILE -O $TMP_PATH/$TMP_FILE
+       wget $DL_URL/$DL_FILE $PROXYSETTINGS -O $TMP_FILE
 
-       # Extract files.
-       unzip $TMP_PATH/$TMP_FILE -d $TMP_PATH
+       # 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_DIR/$CSV_FILE -D $TMP_DIR; 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
 
@@ -94,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
 }