Merge pull request #92 from julienloizelet/fix/add-debug-log-if-no-logger

feat(debug): Add debug log if bouncer logger is not ready

Author: julienloizelet

.github/workflows/end-to-end-auto-prepend-test-suite.yml

@@ -1,6 +1,8 @@
 name: End-to-end auto-prepend-file mode test suite
 on:
   push:
+    branches:
+      - main
     paths-ignore:
       - '**.md'
   workflow_dispatch:

CHANGELOG.md

@@ -4,6 +4,11 @@ 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.4.2] - 2022-05-13
+
+### Added
+- Add WordPress debug log if bouncer logger is not ready
+
 ## [1.4.1] - 2022-04-10
 
 ### Fixed

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.4.1
+ * Version: 1.4.2
  * 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: 5.9
- * Stable tag: 1.4.1
+ * Stable tag: 1.4.2
  * Text Domain: crowdsec-wp
  * First release: 2021.
  */

inc/Bounce.php

@@ -336,13 +336,21 @@ public function safelyBounce(array $configs): bool
             $this->run();
             $result = true;
         } catch (\Exception $e) {
-            $this->logger->error('', [
-                'type' => 'WP_EXCEPTION_WHILE_BOUNCING',
-                'message' => $e->getMessage(),
-                'code' => $e->getCode(),
-                'file' => $e->getFile(),
-                'line' => $e->getLine(),
-            ]);
+            if(!$this->logger){
+                // Try to log in the debug.log file of WordPress if bouncer logger is not ready
+                error_log(print_r('safelyBounce error:' . $e->getMessage() .
+                                  ' in file:' . $e->getFile() .
+                                  '(line ' . $e->getLine() . ')', true
+                ));
+            } else {
+                $this->logger->error('', [
+                    'type' => 'WP_EXCEPTION_WHILE_BOUNCING',
+                    'message' => $e->getMessage(),
+                    'code' => $e->getCode(),
+                    'file' => $e->getFile(),
+                    'line' => $e->getLine(),
+                ]);
+            }
             if ($this->displayErrors) {
                 throw $e;
             }

inc/constants.php

@@ -8,6 +8,6 @@ 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.4.1');
+        define('CROWDSEC_BOUNCER_USER_AGENT', 'WordPress CrowdSec Bouncer/v1.4.2');
     }
 }

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