Fix maxmind downloading mechanism.

plugins/UserCountry/GeoIPAutoUpdater.php

@@ -84,7 +84,7 @@ class Piwik_UserCountry_GeoIPAutoUpdater
      *                    from this URL.
      * @throws Exception
      */
-    private function downloadFile($dbType, $url)
+    protected function downloadFile($dbType, $url)
     {
         $ext = Piwik_UserCountry_GeoIPAutoUpdater::getGeoIPUrlExtension($url);
         $zippedFilename = Piwik_UserCountry_LocationProvider_GeoIp::$dbNames[$dbType][0] . '.' . $ext;
@@ -421,15 +421,34 @@ class Piwik_UserCountry_GeoIPAutoUpdater
     {
         // check for &suffix= query param that is special to MaxMind URLs
         if (preg_match('/suffix=([^&]+)/', $url, $matches)) {
-            return $matches[1];
+            $ext = $matches[1];
         }
 
         // use basename of url
         $filenameParts = explode('.', basename($url), 2);
         if (count($filenameParts) > 1) {
-            return end($filenameParts);
+            $ext = end($filenameParts);
         } else {
-            return reset($filenameParts);
+            $ext = reset($filenameParts);
+        }
+
+        self::checkForSupportedArchiveType($ext);
+
+        return $ext;
+    }
+
+    /**
+     * Avoid downloading archive types we don't support. No point in downloading it,
+     * if we can't unzip it...
+     * 
+     * @param string $ext The URL file's extension.
+     */
+    private static function checkForSupportedArchiveType($ext)
+    {
+        if ($ext != 'tar.gz'
+            && $ext != 'gz'
+        ) {
+            throw new Exception(Piwik_Translate('UserCountry_UnsupportedArchiveType', "'$ext'"));
         }
     }
 

tests/PHPUnit/Plugins/UserCountryTest.php

@@ -69,7 +69,12 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
         }
     }
 
-    // test that redundant checks work
+    /**
+     * Test that redundant checks work.
+     * 
+     * @group Plugins
+     * @group UserCountry
+     */
     public function testGeoIpUpdaterRedundantChecks()
     {
         Piwik_UserCountry_LocationProvider_GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
@@ -79,7 +84,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
         $this->createEmptyISPOrgFiles();
 
         // run redundant checks
-        $updater = new Piwik_UserCountry_GeoIPAutoUpdater_publictestRedundantChecks();
+        $updater = new Piwik_UserCountry_GeoIPAutoUpdater_publictest();
         $updater->performRedundantDbChecks();
 
         // check that files are renamed correctly
@@ -93,6 +98,29 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
         $this->checkBrokenGeoIPState();
     }
 
+    /**
+     * @group Plugins
+     * @group UserCountry
+     * @dataProvider getInvalidGeoIpUrlsToTest
+     */
+    public function testGeoIpDownloadInvalidUrl($url)
+    {
+        $updater = new Piwik_UserCountry_GeoIPAutoUpdater_publictest();
+        try {
+            $updater->downloadFile('loc', $url);
+            $this->fail("Downloading invalid url succeeded!");
+        } catch (Exception $ex) {
+            $this->assertEquals("UserCountry_UnsupportedArchiveType", $ex->getMessage());
+        }
+    }
+
+    public function getInvalidGeoIpUrlsToTest()
+    {
+        return array(array("http://localhost/tests/resources/geoip.tar"),
+                     array("http://localhost/tests/resources/geoip.tar.bz2"),
+                     array("http://localhost/tests/resources/geoip.dat"));
+    }
+
     public function setUp()
     {
         Piwik::$shouldLog = null;
@@ -136,10 +164,15 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
     }
 }
 
-class Piwik_UserCountry_GeoIPAutoUpdater_publictestRedundantChecks extends Piwik_UserCountry_GeoIPAutoUpdater
+class Piwik_UserCountry_GeoIPAutoUpdater_publictest extends Piwik_UserCountry_GeoIPAutoUpdater
 {
     public function performRedundantDbChecks()
     {
         parent::performRedundantDbChecks();
     }
+
+    public function downloadFile($type, $url)
+    {
+        parent::downloadFile($type, $url);
+    }
 }