Merge branch 'develop' into js_event

Author: Benjamin Pick

.travis.yml

@@ -48,7 +48,7 @@ jobs:
       php: 7.2
       env: WP_VERSION=5.9.9 CF7_VERSION=v5.1.6 PHPUNIT_VERSION=^8.0
     - name: bleeding edge
-      php: 8.2
+      php: 8.3
       dist: jammy
       env: CF7_VERSION=master
       addons:
@@ -62,7 +62,7 @@ install:
   - composer show
   - nvm install 16 && nvm use 16
   - yarn install
-  - git clone --depth=50 --branch=${CF7_VERSION} https://github.com/takayukister/contact-form-7.git
+  - git clone --depth=50 --branch=${CF7_VERSION} https://github.com/rocklobster-in/contact-form-7
 
 before_script:
   - mysql -u root -e "CREATE USER ${WP_DB_USER} IDENTIFIED BY '${WP_DB_PASS}';"

README.md

@@ -8,6 +8,8 @@ Tests: [![Build Status](https://api.travis-ci.org/yellowtree/geoip-detect.svg?br
 
 * **Donate Link:** https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BSYUZHS8FH3CL
 
+Provides geographic information detected by an IP adress.
+
 ## Description ##
 
 Provides geographic information detected by an IP adress. This can be used in themes or other plugins, as a shortcode, or via CSS body classes. The city & country names are translated in different languages ([supported languages](https://dev.maxmind.com/geoip/geoip2/web-services/#Languages-8)).
@@ -171,6 +173,8 @@ If you use Maxmind "Automatic download" then you need to upgrade to this plugin
 
 = 5.4.0 =
 * NEW: Infos can be added to a mail sent by WPForms (with Smart Tag `{geoip_detect2_user_info}`)
+* FIX: Remove Fatal Error on uninstall ("Undefined constand GEOIP_DETECT_DEBUG")
+* Library updates
 
 = 5.3.2 =
 * FIX: Some country codes such as "PT" were missing in the (deprecated) legacy API mapping.

data-sources/auto.php

@@ -155,7 +155,7 @@ protected function download_url($url, $modified = 0) {
 			$headers['If-Modified-Since'] = date('r', $modified);
 		}
 
-		$response = wp_safe_remote_get( $url, [ 'timeout' => 300, 'stream' => true, 'filename' => $tmpfname, 'headers' => $headers  ] );
+		$response = wp_safe_remote_get( $url, [ 'timeout' => 300, 'stream' => true, 'filename' => $tmpfname, 'headers' => $headers, 'redirection' => 5 ] );
 		$http_response_code = wp_remote_retrieve_response_code( $response );
 		if (304 === $http_response_code) {
 			return new \WP_Error( 'http_304', __('It has not changed since the last update.', 'geoip-detect') );

geoip-detect.php

@@ -5,7 +5,7 @@
 Description:     Provides geographic information detected by an IP adress.
 Author:          Yellow Tree (Benjamin Pick)
 Author URI:      http://www.yellowtree.de
-Version:         5.4.0-beta2
+Version:         5.4.0
 License:         GPLv3 or later
 License URI:     http://www.gnu.org/licenses/gpl-3.0.html
 Text Domain:     geoip-detect
@@ -16,7 +16,7 @@
 Requires PHP:    7.2.5
 */
 
-define('GEOIP_DETECT_VERSION', '5.4.0-beta2');
+define('GEOIP_DETECT_VERSION', '5.4.0');
 
 /*
 Copyright 2013-2023 Yellow Tree, Siegen, Germany

lib/geonames/generators/vendor/guzzlehttp/ringphp/docs/requirements.txt

@@ -1,3 +1,5 @@
 sphinx_rtd_theme
 sphinx>=3.0.4 # not directly required, pinned by Snyk to avoid a vulnerability
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
+requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
+urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability

package.json

@@ -20,20 +20,20 @@
   },
   "private": false,
   "dependencies": {
-    "@babel/runtime": "7.24.4",
+    "@babel/runtime": "7.24.7",
     "emoji-flags": "1.3.0",
     "just-compare": "2.3.0",
     "just-intersect": "4.3.0",
     "just-safe-get": "4.2.0",
     "just-safe-set": "4.2.1"
   },
   "devDependencies": {
-    "@babel/core": "7.24.4",
-    "@babel/plugin-transform-runtime": "7.24.3",
-    "@babel/preset-env": "7.24.4",
+    "@babel/core": "7.24.7",
+    "@babel/plugin-transform-runtime": "7.24.7",
+    "@babel/preset-env": "7.24.7",
     "babel-jest": "29.7.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "eslint": "8.55.0",
+    "eslint": "8.57.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "^29.4.2",
     "parcel": "2.9.3"

readme.txt

@@ -2,13 +2,15 @@
 Contributors: benjaminpick
 Tags: geolocation, locator, geoip, maxmind, ipstack
 Requires at least: 5.0
-Tested up to: 6.4
+Tested up to: 6.6
 Requires PHP: 7.2
-Stable tag: 5.3.2
+Stable tag: 5.4.0
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BSYUZHS8FH3CL
 
+Provides geographic information detected by an IP adress.
+
 == Description ==
 
 Provides geographic information detected by an IP adress. This can be used in themes or other plugins, as a shortcode, or via CSS body classes. The city & country names are translated in different languages ([supported languages](https://dev.maxmind.com/geoip/geoip2/web-services/#Languages-8)).

tests/GeoLite2-Country.mmdb.tar.gz

@@ -5,8 +5,6 @@ class UpdateTest extends WP_UnitTestCase_GeoIP_Detect {
 	function set_up() {
 		parent::set_up();
 
-		add_filter('pre_option_geoip-detect-auto_license_key', [ $this, 'filter_set_user_secret' ], 101);
-
 		// unlink uploads file if exists
 		if (function_exists('geoip_detect_get_database_upload_filename')) {
 			$filename = geoip_detect_get_database_upload_filename();
@@ -17,10 +15,16 @@ function set_up() {
 
 	function tear_down() {
 		remove_filter('pre_option_geoip-detect-auto_license_key', [ $this, 'filter_set_user_secret' ], 101);
+		remove_filter('pre_option_geoip-detect-auto_license_key', [ $this, 'filter_set_invalid_user_secret' ], 100);
+		remove_filter('geoip_detect2_download_url', [ $this, 'filter_set_test_file' ], 101);
 
 		parent::tear_down();
 	}
 
+	function filter_set_invalid_user_secret() { 
+		return 'bla';
+	}
+
 	function filter_set_user_secret() {
 		$id = getenv('WP_MAXMIND_USER_SECRET');
 		if ($id)
@@ -30,11 +34,21 @@ function filter_set_user_secret() {
 			return 'asdfsadf';
 		}
 	}
+
+	function filter_set_test_file() {
+		// Yes, use http instead of https to test redirect
+		return 'http://github.com/yellowtree/geoip-detect/raw/develop/tests/GeoLite2-Country.mmdb.tar.gz';
+	}
 
 	/**
 	 * @group external-http
 	 */
 	function testUpdate() {
+		add_filter('pre_option_geoip-detect-auto_license_key', [ $this, 'filter_set_user_secret' ], 101);
+		$this->assertUpdateWorks();
+	}
+
+	function assertUpdateWorks() {
 		$s = new \YellowTree\GeoipDetect\DataSources\Auto\AutoDataSource();
 
 		$this->assertTrue( $s->maxmindUpdate(true) );
@@ -43,4 +57,18 @@ function testUpdate() {
 		$record = geoip_detect2_get_info_from_ip(GEOIP_DETECT_TEST_IP);
 		$this->assertValidGeoIP2Record($record, GEOIP_DETECT_TEST_IP);
 	}
+
+	/**
+	 * @group external-http
+	 */
+	function testUpdateWithTestFile() {
+		add_filter('pre_option_geoip-detect-auto_license_key', [ $this, 'filter_set_invalid_user_secret' ], 100);
+		add_filter('geoip_detect2_download_url', [ $this, 'filter_set_test_file' ], 101);
+		$this->assertUpdateWorks();
+	}
+
+	function testUrlConsideredSafe() {
+		$url = 'https://mm-prod-geoip-databases.a2649acb697e2c09b632799562c076f2.r2.cloudflarestorage.com/bla.tar.gz';
+		$this->assertSame(wp_http_validate_url($url), $url, 'URL ' . $url . ' is not considered safe by wordpress, update of Maxmind data will fail');
+	}
 }

tests/test-updater.php

@@ -22,6 +22,8 @@ public static function getLoader()
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInit18fc54d84025f2e5d2b2ac2dd487f107', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit18fc54d84025f2e5d2b2ac2dd487f107', 'loadClassLoader'));