feat(*): Do not bounce admin ajax request and fix bad and clean resync value reset

Author: julienloizelet

CHANGELOG.md

@@ -5,6 +5,20 @@ 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.1.0](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.1.0) - 2023-02-16
+[_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v2.0.0...v2.1.0)
+
+### Changed
+
+- Do not bounce admin AJAX request
+
+### Fixed
+- Fix bad memcached dsn check
+- Fix clean and bad ip resync values when disabling stream mode
+
+
+---
+
 ## [2.0.0](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.0.0) - 2023-02-09
 [_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v1.11.0...v2.0.0)
 

inc/Bouncer.php

@@ -267,6 +267,10 @@ public function shouldBounceCurrentIp(): bool
         if (PHP_SAPI === 'cli') {
             return false;
         }
+        // Don't bounce admin ajax request
+        if(defined('DOING_AJAX')){
+            return false;
+        }
 
         // when the "crowdsec_public_website_only" is disabled...
         if ($this->shouldNotBounceWpAdmin) {

inc/admin/advanced-settings.php

@@ -190,24 +190,34 @@ function adminAdvancedSettings()
 
     // Field "crowdsec_clean_ip_cache_duration"
     addFieldString('crowdsec_clean_ip_cache_duration', 'Recheck clean IPs each<br>(live mode only)', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_cache', function ($input) {
-        if (!get_option('crowdsec_stream_mode') && (int) $input <= 0) {
-            add_settings_error('Recheck clean IPs each', 'crowdsec_error', 'Recheck clean IPs each: Minimum is 1 second.');
+        if(!empty($input)){
+            if (!get_option('crowdsec_stream_mode') && (int) $input <= 0) {
+                add_settings_error('Recheck clean IPs each', 'crowdsec_error', 'Recheck clean IPs each: Minimum is 1 second.');
 
-            return '1';
+                return '1';
+            }
+
+            return (int) $input > 0 ? (int) $input : 1 ;
         }
+        $saved = (int) get_option('crowdsec_clean_ip_cache_duration');
+        return $saved > 0 ? $saved : 1;
 
-        return (int) $input > 0 ? (int) $input : 1 ;
     }, ' seconds. <p>The duration between re-asking Local API about an already checked clean IP.<br>Minimum 1 second.<br> Note that this setting can not be apply in stream mode.', '...', 'width: 115px;', 'number', (bool) get_option('crowdsec_stream_mode'));
 
     // Field "crowdsec_bad_ip_cache_duration"
     addFieldString('crowdsec_bad_ip_cache_duration', 'Recheck bad IPs each<br>(live mode only)', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_cache', function ($input) {
-        if (!get_option('crowdsec_stream_mode') && (int) $input <= 0) {
-            add_settings_error('Recheck bad IPs each', 'crowdsec_error', 'Recheck bad IPs each: Minimum is 1 second.');
+        if(!empty($input)) {
+            if (!get_option('crowdsec_stream_mode') && !empty($input) && (int)$input <= 0) {
+                add_settings_error('Recheck bad IPs each', 'crowdsec_error', 'Recheck bad IPs each: Minimum is 1 second.');
+
+                return '1';
+            }
 
-            return '1';
+            return (int)$input > 0 ? (int)$input : 1;
         }
+        $saved = (int) get_option('crowdsec_bad_ip_cache_duration');
+        return $saved > 0 ? $saved : 1;
 
-        return (int) $input > 0 ? (int) $input : 1 ;
     }, ' seconds. <p>The duration between re-asking Local API about an already checked bad IP.<br>Minimum 1 second.<br> Note that this setting can not be apply in stream mode.', '...', 'width: 115px;', 'number', (bool) get_option('crowdsec_stream_mode'));
 
     // Field "crowdsec_captcha_cache_duration"