Merge pull request #129 from julienloizelet/fix/ltrim-expected-string

fix(TypeError): Cast missing database option value to string if neces…

Author: julienloizelet

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
                 uses: actions/checkout@v3
 
             -   name: Check version ${{ env.VERSION_NUMBER }} consistency in files
-                # Check crowdsec.php, readme.txt, inc/Constants.php and CHANGELOG.md
+                # Check crowdsec.php (2), readme.txt (1), inc/Constants.php (1) and CHANGELOG.md (3)
                 run: |
                     CURRENT_DATE=$(date +'%Y-%m-%d')
                     CHANGELOG_VERSION=$(grep -o -E "## \[(.*)\].* - $CURRENT_DATE"  CHANGELOG.md | head -1 | sed 's/ //g')

CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [2.0.2](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.0.2) - 2023-02-16
+[_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v2.0.1...v2.0.2)
+
+### Fixed
+- Cast missing database options to string if necessary ([#127](https://github.com/crowdsecurity/cs-wordpress-bouncer/issues/127))
+
+
+---
+
 ## [2.0.1](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.0.1) - 2023-02-14
 [_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v2.0.0...v2.0.1)
 

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: 2.0.1
+ * Version: 2.0.2
  * Author: CrowdSec
  * Author URI: https://www.crowdsec.net/
  * Github: https://github.com/crowdsecurity/cs-wordpress-bouncer
@@ -13,7 +13,7 @@
  * Requires PHP: 7.2
  * Requires at least: 4.9
  * Tested up to: 6.1
- * Stable tag: 2.0.1
+ * Stable tag: 2.0.2
  * Text Domain: crowdsec-wp
  * First release: 2021.
  */

inc/Bouncer.php

@@ -62,14 +62,14 @@ public function handleRawConfigs(array $rawConfigs): array
     {
         return [
             // LAPI connection
-            'api_key' => $this->escape($rawConfigs['crowdsec_api_key'] ?? ''),
+            'api_key' => $this->escape((string)$rawConfigs['crowdsec_api_key'] ?? ''),
             'auth_type' => (string)($rawConfigs['crowdsec_auth_type'] ?? Constants::AUTH_KEY),
-            'tls_cert_path' => Constants::TLS_DIR . '/' . ltrim($rawConfigs['crowdsec_tls_cert_path'] ?? '', '/'),
-            'tls_key_path' => Constants::TLS_DIR . '/' . ltrim($rawConfigs['crowdsec_tls_key_path'] ?? '', '/'),
+            'tls_cert_path' => Constants::TLS_DIR . '/' . ltrim((string)$rawConfigs['crowdsec_tls_cert_path'] ?? '', '/'),
+            'tls_key_path' => Constants::TLS_DIR . '/' . ltrim((string)$rawConfigs['crowdsec_tls_key_path'] ?? '', '/'),
             'tls_verify_peer' => (bool)($rawConfigs['crowdsec_tls_verify_peer'] ?? false),
             'tls_ca_cert_path' => Constants::TLS_DIR . '/' .
-                                  ltrim($rawConfigs['crowdsec_tls_ca_cert_path'], '/'),
-            'api_url' => $this->escape($rawConfigs['crowdsec_api_url'] ?? ''),
+                                  ltrim((string)$rawConfigs['crowdsec_tls_ca_cert_path'], '/'),
+            'api_url' => $this->escape((string)$rawConfigs['crowdsec_api_url'] ?? ''),
             'use_curl' => (bool)($rawConfigs['crowdsec_use_curl'] ?? false),
             'api_timeout' => (int)($rawConfigs['crowdsec_api_timeout'] ?? Constants::API_TIMEOUT),
             // Debug
@@ -86,10 +86,10 @@ public function handleRawConfigs(array $rawConfigs): array
                                                Constants::REMEDIATION_BYPASS),
             // Cache settings
             'stream_mode' => (bool)($rawConfigs['crowdsec_stream_mode'] ?? false),
-            'cache_system' => $this->escape($rawConfigs['crowdsec_cache_system'] ?? Constants::CACHE_SYSTEM_PHPFS),
+            'cache_system' => $this->escape((string)$rawConfigs['crowdsec_cache_system'] ?? Constants::CACHE_SYSTEM_PHPFS),
             'fs_cache_path' => Constants::CACHE_PATH,
-            'redis_dsn' => $this->escape($rawConfigs['crowdsec_redis_dsn'] ?? ''),
-            'memcached_dsn' => $this->escape($rawConfigs['crowdsec_memcached_dsn'] ?? ''),
+            'redis_dsn' => $this->escape((string)$rawConfigs['crowdsec_redis_dsn'] ?? ''),
+            'memcached_dsn' => $this->escape((string)$rawConfigs['crowdsec_memcached_dsn'] ?? ''),
             'clean_ip_cache_duration' => (int)($rawConfigs['crowdsec_clean_ip_cache_duration'] ??
                                                Constants::CACHE_EXPIRATION_FOR_CLEAN_IP),
             'bad_ip_cache_duration' => (int)($rawConfigs['crowdsec_bad_ip_cache_duration'] ??

inc/Constants.php

@@ -20,7 +20,7 @@ class Constants extends LibConstants
     public const LOG_BASE_PATH = __DIR__ . '/../logs/';
     public const CACHE_PATH = __DIR__ . '/../.cache';
     public const CONFIG_PATH = __DIR__ . '/standalone-settings.php';
-    public const VERSION = 'v2.0.1';
+    public const VERSION = 'v2.0.2';
     public const GEOLOCATION_DIR = __DIR__ . '/../geolocation';
     public const TLS_DIR = __DIR__ . '/../tls';
 }

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.1
-Stable tag: 2.0.1
+Stable tag: 2.0.2
 Requires PHP: 7.2
 License: MIT
 License URI: https://opensource.org/licenses/MIT