Merge pull request #164 from dwightwatson/maxmind-database

Fix MaxMind database fetching

Author: Torann

config/geoip.php

@@ -54,7 +54,7 @@
         'maxmind_database' => [
             'class' => \Torann\GeoIP\Services\MaxMindDatabase::class,
             'database_path' => storage_path('app/geoip.mmdb'),
-            'update_url' => 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz',
+            'update_url' => sprintf('https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=%s&suffix=tar.gz', env('MAXMIND_LICENSE_KEY')),
             'locales' => ['en'],
         ],
 
@@ -72,7 +72,7 @@
             'continent_path' => storage_path('app/continents.json'),
             'lang' => 'en',
         ],
-        
+
         'ipgeolocation' => [
             'class' => \Torann\GeoIP\Services\IPGeoLocation::class,
             'secure' => true,

src/Services/MaxMindDatabase.php

@@ -2,6 +2,7 @@
 
 namespace Torann\GeoIP\Services;
 
+use PharData;
 use Exception;
 use GeoIp2\Database\Reader;
 
@@ -66,27 +67,97 @@ public function update()
             throw new Exception('Database path not set in config file.');
         }
 
-        // Get settings
-        $url = $this->config('update_url');
-        $path = $this->config('database_path');
+        $this->withTemporaryDirectory(function ($directory) {
+            $tarFile = sprintf('%s/maxmind.tar.gz', $directory);
 
-        // Get header response
-        $headers = get_headers($url);
+            file_put_contents($tarFile, fopen($this->config('update_url'), 'r'));
 
-        if (substr($headers[0], 9, 3) != '200') {
-            throw new Exception('Unable to download database. (' . substr($headers[0], 13) . ')');
+            $archive = new PharData($tarFile);
+
+            $file = $this->findDatabaseFile($archive);
+
+            $relativePath = "{$archive->getFilename()}/{$file->getFilename()}";
+
+            $archive->extractTo($directory, $relativePath);
+
+            file_put_contents($this->config('database_path'), fopen("{$directory}/{$relativePath}", 'r'));
+        });
+
+        return "Database file ({$this->config('database_path')}) updated.";
+    }
+
+    /**
+     * Provide a temporary directory to perform operations in and and ensure
+     * it is removed afterwards.
+     *
+     * @param  callable  $callback
+     * @return void
+     */
+    protected function withTemporaryDirectory(callable $callback)
+    {
+        $directory = tempnam(sys_get_temp_dir(), 'maxmind');
+
+        if (file_exists($directory)) {
+            unlink($directory);
+        }
+
+        mkdir($directory);
+
+        try {
+            $callback($directory);
+        } finally {
+            $this->deleteDirectory($directory);
+        }
+    }
+
+    /**
+     * Recursively search the given archive to find the .mmdb file.
+     *
+     * @param  \PharData  $archive
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function findDatabaseFile($archive)
+    {
+        foreach ($archive as $file) {
+            if ($file->isDir()) {
+                return $this->findDatabaseFile(new PharData($file->getPathName()));
+            }
+
+            if (pathinfo($file, PATHINFO_EXTENSION) === 'mmdb') {
+                return $file;
+            }
         }
 
-        // Download zipped database to a system temp file
-        $tmpFile = tempnam(sys_get_temp_dir(), 'maxmind');
-        file_put_contents($tmpFile, fopen($url, 'r'));
+        throw new Exception('Database file could not be found within archive.');
+    }
 
-        // Unzip and save database
-        file_put_contents($path, gzopen($tmpFile, 'r'));
+    /**
+     * Recursively delete the given directory.
+     *
+     * @param  string  $directory
+     * @return mixed
+     */
+    protected function deleteDirectory(string $directory)
+    {
+        if (!file_exists($directory)) {
+            return true;
+        }
 
-        // Remove temp file
-        @unlink($tmpFile);
+        if (!is_dir($directory)) {
+            return unlink($directory);
+        }
+
+        foreach (scandir($directory) as $item) {
+            if ($item == '.' || $item == '..') {
+                continue;
+            }
+
+            if (!$this->deleteDirectory($directory . DIRECTORY_SEPARATOR . $item)) {
+                return false;
+            }
+        }
 
-        return "Database file ({$path}) updated.";
+        return rmdir($directory);
     }
 }

tests/Services/MaxMindDatabaseTest.php

@@ -46,18 +46,6 @@ public function shouldReturnInvalidLocation()
         }
     }
 
-    /**
-     * @test
-     */
-    public function shouldUpdateLocalDatabase()
-    {
-        list($service, $config) = $this->getService();
-
-        $this->assertEquals($service->update(), "Database file ({$config['database_path']}) updated.");
-
-        @unlink($config['database_path']);
-    }
-
     protected function getService()
     {
         $config = $this->getConfig()['services']['maxmind_database'];
@@ -66,4 +54,4 @@ protected function getService()
 
         return [$service, $config];
     }
-}
+}