feat(*): Prepare release 1.7.0

Author: julienloizelet

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.7.0] - 2022-07-21
+
+### Added
+- Add geolocation feature
+
+### Changed
+- Do not throw exception if empty api url as it is the default after a fresh install and activation
+- Changed default value for some boolean value as WordPress config are always string
 
 ## [1.6.0] - 2022-06-30
 

crowdsec.php

@@ -4,7 +4,7 @@
  * Plugin URI: https://github.com/crowdsecurity/cs-wordpress-bouncer
  * Description: Safer Together. Protect your WordPress application with CrowdSec.
  * Tags: crowdsec-bouncer, wordpress, security, firewall, captcha, ip-scanner, ip-blocker, ip-blocking, ip-address, ip-database, ip-range-check, crowdsec, ban-hosts, ban-management, anti-hacking, hacker-protection, captcha-image, captcha-generator, captcha-generation, captcha-service
- * Version: 1.6.0
+ * Version: 1.7.0
  * Author: CrowdSec
  * Author URI: https://www.crowdsec.net/
  * Github: https://github.com/crowdsecurity/cs-wordpress-blocker
@@ -13,7 +13,7 @@
  * Requires PHP: 7.2
  * Requires at least: 4.9
  * Tested up to: 6.0
- * Stable tag: 1.6.0
+ * Stable tag: 1.7.0
  * Text Domain: crowdsec-wp
  * First release: 2021.
  */

inc/Bounce.php

@@ -231,7 +231,7 @@ public function shouldBounceCurrentIp(): bool
 			return false;
 		}
 
-        $shouldNotBounceWpAdmin = !empty($this->getStringSettings('crowdsec_public_website_only'));
+        $shouldNotBounceWpAdmin = $this->getBoolSettings('crowdsec_public_website_only');
         // when the "crowdsec_public_website_only" is disabled...
         if ($shouldNotBounceWpAdmin) {
             // In standalone context, is_admin() does not work. So we check admin section with another method.

inc/constants.php

@@ -8,7 +8,7 @@ function crowdsecDefineConstants(string $crowdsecRandomLogFolder)
         define('CROWDSEC_DEBUG_LOG_PATH', __DIR__."/../logs/$crowdsecRandomLogFolder/debug.log");
         define('CROWDSEC_CACHE_PATH', __DIR__.'/../.cache');
         define('CROWDSEC_CONFIG_PATH', __DIR__.'/standalone-settings.php');
-        define('CROWDSEC_BOUNCER_USER_AGENT', 'WordPress CrowdSec Bouncer/v1.6.0');
+        define('CROWDSEC_BOUNCER_USER_AGENT', 'WordPress CrowdSec Bouncer/v1.7.0');
         define('CROWDSEC_BOUNCER_GEOLOCATION_DIR', __DIR__.'/../geolocation');
     }
 }

inc/options-config.php

@@ -8,8 +8,8 @@ function getCrowdSecOptionsConfig()
         ['name' => 'crowdsec_api_url', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_api_key', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_bouncing_level', 'default' => Constants::BOUNCING_LEVEL_NORMAL, 'autoInit' => true],
-        ['name' => 'crowdsec_public_website_only', 'default' => true, 'autoInit' => true],
-        ['name' => 'crowdsec_stream_mode', 'default' => false, 'autoInit' => true],
+        ['name' => 'crowdsec_public_website_only', 'default' => 'on', 'autoInit' => true],
+        ['name' => 'crowdsec_stream_mode', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_stream_mode_refresh_frequency', 'default' => 60, 'autoInit' => true],
         ['name' => 'crowdsec_cache_system', 'default' => Constants::CACHE_SYSTEM_PHPFS, 'autoInit' => true],
         ['name' => 'crowdsec_redis_dsn', 'default' => '', 'autoInit' => true],
@@ -21,7 +21,7 @@ function getCrowdSecOptionsConfig()
         ['name' => 'crowdsec_geolocation_cache_duration', 'default' => Constants::CACHE_EXPIRATION_FOR_GEO,
             'autoInit' => true],
         ['name' => 'crowdsec_fallback_remediation', 'default' => Constants::REMEDIATION_CAPTCHA, 'autoInit' => true],
-        ['name' => 'crowdsec_hide_mentions', 'default' => false, 'autoInit' => true],
+        ['name' => 'crowdsec_hide_mentions', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_trust_ip_forward_array', 'default' => [], 'autoInit' => true],
         ['name' => 'crowdsec_theme_color_text_primary', 'default' => 'black', 'autoInit' => true],
         ['name' => 'crowdsec_theme_color_text_secondary', 'default' => '#AAA', 'autoInit' => true],
@@ -45,12 +45,12 @@ function getCrowdSecOptionsConfig()
         ['name' => 'crowdsec_theme_text_ban_wall_footer', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_theme_custom_css', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_random_log_folder', 'default' => bin2hex(random_bytes(64)), 'autoInit' => false],
-        ['name' => 'crowdsec_debug_mode', 'default' => false, 'autoInit' => true],
-		['name' => 'crowdsec_display_errors', 'default' => false, 'autoInit' => true],
-        ['name' => 'crowdsec_forced_test_ip', 'default' => "", 'autoInit' => true],
-        ['name' => 'crowdsec_forced_test_forwarded_ip', 'default' => "", 'autoInit' => true],
-        ['name' => 'crowdsec_geolocation_enabled', 'default' => false, 'autoInit' => true],
-        ['name' => 'crowdsec_geolocation_save_result', 'default' => false, 'autoInit' => true],
+        ['name' => 'crowdsec_debug_mode', 'default' => '', 'autoInit' => true],
+		['name' => 'crowdsec_display_errors', 'default' => '', 'autoInit' => true],
+        ['name' => 'crowdsec_forced_test_ip', 'default' => '', 'autoInit' => true],
+        ['name' => 'crowdsec_forced_test_forwarded_ip', 'default' => '', 'autoInit' => true],
+        ['name' => 'crowdsec_geolocation_enabled', 'default' => '', 'autoInit' => true],
+        ['name' => 'crowdsec_geolocation_save_result', 'default' => '', 'autoInit' => true],
         ['name' => 'crowdsec_geolocation_type', 'default' => Constants::GEOLOCATION_TYPE_MAXMIND, 'autoInit' => true],
         ['name' => 'crowdsec_geolocation_maxmind_database_type', 'default' => Constants::MAXMIND_COUNTRY, 'autoInit' => true],
         ['name' => 'crowdsec_geolocation_maxmind_database_path', 'default' => '', 'autoInit' => true],

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://crowdsec.net/
 Tags: crowdsec-bouncer, wordpress, security, firewall, captcha, ip-scanner, ip-blocker, ip-blocking, ip-address, ip-database, ip-range-check, crowdsec, ban-hosts, ban-management, anti-hacking, hacker-protection, captcha-image, captcha-generator, captcha-generation, captcha-service
 Requires at least: 4.9
 Tested up to: 6.0
-Stable tag: 1.6.0
+Stable tag: 1.7.0
 Requires PHP: 7.2
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -44,6 +44,10 @@ This WordPress plugin is a "bouncer", which purpose is to block detected attacks
 
 == Changelog ==
 
+= 1.7 (2022-07-20) =
+
+- Add geolocation feature
+
 = 1.6 (2022-06-30) =
 
 - Add "Test bouncing" action in settings view

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'crowdsec/wordpress-bouncer',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '8338134f4c0fae905e3f3a9ddc6fdb5e1a300697',
+        'reference' => '288605677f43acbab27d0d8ae742a6a91af19006',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -31,7 +31,7 @@
         'crowdsec/wordpress-bouncer' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '8338134f4c0fae905e3f3a9ddc6fdb5e1a300697',
+            'reference' => '288605677f43acbab27d0d8ae742a6a91af19006',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),