diff --git a/.wordpress-org/screenshot-11.png b/.wordpress-org/screenshot-11.png
new file mode 100644
index 00000000..b5fecddb
Binary files /dev/null and b/.wordpress-org/screenshot-11.png differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286febc8..d4b2acff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
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.11.0](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.11.0) - 2025-06-02
+[_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v2.10.0...v2.11.0)
+
+
+### Added
+
+- Add Blocklist as a Service (BLaaS) subscription button
+
+
---
## [2.10.0](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.10.0) - 2025-05-09
@@ -312,7 +323,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v1.11.0...v2.0.0)
### Changed
-- All source code has been refactored using new CrowdSec PHP librairies:
+- All source code has been refactored using new CrowdSec PHP libraries:
- Logs messages have been changed
- User Agent sent to CrowdSec LAPI has been changed to `csphplapi_WordPress/vX.Y.Z`
diff --git a/README.md b/README.md
index 13570d1e..14c666f1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,16 @@
+
+
+**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [CrowdSec WordPress Bouncer](#crowdsec-wordpress-bouncer)
+ - [Usage](#usage)
+ - [Installation](#installation)
+ - [Technical notes](#technical-notes)
+ - [Developer guide](#developer-guide)
+ - [License](#license)
+
+
+
# CrowdSec WordPress Bouncer
diff --git a/crowdsec.php b/crowdsec.php
index 7dcc468f..7a49c5bd 100644
--- a/crowdsec.php
+++ b/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: security, captcha, ip-blocker, crowdsec, hacker-protection, appsec
- * Version: 2.10.0
+ * Version: 2.11.0
* 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.8
- * Stable tag: 2.10.0
+ * Stable tag: 2.11.0
* Text Domain: crowdsec-wp
* First release: 2021.
*/
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
index ade552f2..4fd59869 100644
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@@ -12,7 +12,7 @@
- [Usage](#usage)
- [Features](#features)
- [Apply a remediation: captcha or ban](#apply-a-remediation-captcha-or-ban)
- - [Usage metrics](#usage-metrics)
+ - [Remediation metrics](#remediation-metrics)
- [Understanding the limitations of the bouncer](#understanding-the-limitations-of-the-bouncer)
- [Configurations](#configurations)
- [General settings](#general-settings)
@@ -71,9 +71,9 @@ Please note that it is possible to customize all the colors of these pages in a
On the other hand, all texts are also fully customizable. This will allow you, for example, to present translated pages in your users’ language.
-#### Usage metrics
+#### Remediation metrics
-If you activate usage metrics push, the bouncer will provide usage data to the Local API, allowing for a unified view of its behavior and insights.
+If you activate remediation metrics push, the bouncer will provide usage data to the Local API, allowing for a unified view of its behavior and insights.
Please see [below setting](#advanced-settings) and [CrowdSec documentation](https://doc.crowdsec.net/docs/next/observability/usage_metrics/) for more information.
@@ -140,8 +140,8 @@ If you are using a Block as a Service (BLaaS) LAPI URL (i.e. starting with `http
note the following:
- The Authentication type must be "Bouncer API key"
-- Stream mode must be enabled (see Communication mode with the Local API in Advanced Settings)
-- Usage Metrics cannot be sent (see Usage Metrics in [Advanced settings](#advanced-settings)).
+- Stream mode must be enabled (see Communication mode with the Local API in [Advanced settings](#advanced-settings)).
+- Remediation Metrics cannot be sent (see Remediation Metrics in [Advanced settings](#advanced-settings)).
- AppSec component cannot be used (see Appsec Component in [Advanced settings](#advanced-settings))
***
@@ -272,7 +272,7 @@ In the `Theme customization` part, you can modify texts and colors of ban and ca
#### Advanced settings
-In the `Advanced` part, you can enable/disable the stream mode, enable/disable usage metrics, choose your cache system for your CrowdSec Local API, handle your remediation policy, manage geolocation feature, adjust some debug parameters and testing parameters.
+In the `Advanced` part, you can enable/disable the stream mode, enable/disable remediation metrics, choose your cache system for your CrowdSec Local API, handle your remediation policy, manage geolocation feature, adjust some debug parameters and testing parameters.
@@ -298,17 +298,17 @@ With the stream mode, every decision is retrieved in an asynchronous way. Here y
***
-
+
***
-`Usage Metrics → Enable the Usage Metrics`
+`Remediation Metrics → Enable the Remediation Metrics`
-Enable usage metrics to gain visibility: monitor incoming traffic and blocked threats for better security insights.
+Enable remediation metrics to gain visibility: monitor incoming traffic and blocked threats for better security insights.
-If this option is enabled, a cron job will push usage metrics to the Local API every 15 minutes.
+If this option is enabled, a cron job will push remediation metrics to the Local API every 15 minutes.
-**N.B** : There is also a push button if you want to push usage metrics manually.
+**N.B** : There is also a push button if you want to push remediation metrics manually.
***
@@ -322,7 +322,7 @@ Choose the cache technology that will use your CrowdSec Local API.
The File system cache is faster than calling Local API. Redis or Memcached is faster than the File System cache.
-**N.B**. : There are also a `Clear now` button fo all cache technologies and a `Prune now` button dedicated to the file system cache.
+**N.B**. : There are also a `Clear now` button for all cache technologies and a `Prune now` button dedicated to the file system cache.
***
@@ -330,7 +330,7 @@ The File system cache is faster than calling Local API. Redis or Memcached is fa
The duration between re-asking Local API about an already checked clean IP.
-Minimum 1 second. Note that this setting can not be apply in stream mode.
+Minimum 1 second. Note that this setting cannot be used in stream mode.
***
@@ -338,7 +338,7 @@ Minimum 1 second. Note that this setting can not be apply in stream mode.
The duration between re-asking Local API about an already checked bad IP.
-Minimum 1 second. Note that this setting can not be apply in stream mode.
+Minimum 1 second. Note that this setting cannot be used in stream mode.
***
@@ -378,7 +378,7 @@ Example of DSN: memcached://localhost:11211.
Enable if you want to ask the AppSec component for a remediation based on the current request, in case the initial LAPI remediation is a bypass.
-Not available if you use TLS certficates as authentication type.
+Not available if you use TLS certificates as authentication type.
For more information on the AppSec component, please refer to the [documentation](https://docs.crowdsec.net/docs/appsec/intro/).
diff --git a/docs/images/screenshots/config-usage-metrics.png b/docs/images/screenshots/config-usage-metrics.png
index 15c9be27..b5fecddb 100644
Binary files a/docs/images/screenshots/config-usage-metrics.png and b/docs/images/screenshots/config-usage-metrics.png differ
diff --git a/inc/Admin/advanced-settings.php b/inc/Admin/advanced-settings.php
index fda5768a..cf778a98 100644
--- a/inc/Admin/advanced-settings.php
+++ b/inc/Admin/advanced-settings.php
@@ -157,15 +157,16 @@ function crowdsec_multi_save_advanced_settings()
** Section "Usage Metrics" **
**************************/
$isUsageMetricsEnabled = is_multisite() ? get_site_option('crowdsec_usage_metrics') : get_option('crowdsec_usage_metrics');
- add_settings_section('crowdsec_admin_advanced_usage_metrics', 'Usage Metrics', function () {
+ add_settings_section('crowdsec_admin_advanced_usage_metrics', 'Remediation Metrics', function () {
}, 'crowdsec_advanced_settings',['after_section' => '']);
// Field "crowdsec_usage_metrics"
- addFieldCheckbox('crowdsec_usage_metrics', 'Enable Usage Metrics', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_usage_metrics', function () {
+ addFieldCheckbox('crowdsec_usage_metrics', 'Enable Remediation Metrics', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_usage_metrics', function () {
// Usage metrics push just activated.
$lapiUrl = is_multisite() ? get_site_option('crowdsec_api_url') : get_option('crowdsec_api_url');
if (0 === strpos($lapiUrl, Constants::BAAS_URL)) {
- AdminNotice::displayError('Pushing usage metrics with a Block as a Service LAPI ('.esc_html($lapiUrl).') is not supported. ');
+ AdminNotice::displayError('Pushing remediation metrics with a Block as a Service LAPI ('.esc_html
+ ($lapiUrl).') is not supported. ');
return false;
}
scheduleUsageMetricsPush();
@@ -175,9 +176,9 @@ function crowdsec_multi_save_advanced_settings()
unscheduleUsageMetricsPush();
return false;
}, '
-
Enable usage metrics to gain visibility: monitor incoming traffic and blocked threats for better security insights.
-
If this option is enabled, a cron job will push usage metrics to the Local API every 15 minutes.
-
For more information about usage metrics, please refer to the documentation.
+
Enable remediation metrics to gain visibility: monitor incoming traffic and blocked threats for better security insights.
+
If this option is enabled, a cron job will push remediation metrics to the Local API every 15 minutes.
+
For more information about remediation metrics, please refer to the documentation.
'.displayBouncerMetricsInAdminPage().'
diff --git a/inc/Admin/init.php b/inc/Admin/init.php
index d6c825fc..0b5e6855 100644
--- a/inc/Admin/init.php
+++ b/inc/Admin/init.php
@@ -32,7 +32,7 @@ function clearBouncerCacheInAdminPage()
{
try {
$configs = getDatabaseConfigs();
- // If usage metrics are enabled, we need to push them before clearing the cache.
+ // If remediation metrics are enabled, we need to push them before clearing the cache.
$isUsageMetricsEnabled = is_multisite() ? get_site_option('crowdsec_usage_metrics') : get_option('crowdsec_usage_metrics');
$bouncer = new Bouncer($configs);
if ($isUsageMetricsEnabled) {
@@ -42,7 +42,7 @@ function clearBouncerCacheInAdminPage()
$bouncer->clearCache();
$message = __('CrowdSec cache has just been cleared.');
if ($isUsageMetricsEnabled){
- $message .= __(' As usage metrics push is enabled, metrics have been pushed before clearing the cache.');
+ $message .= __(' As remediation metrics push is enabled, metrics have been pushed before clearing the cache.');
}
// In stream mode, immediately warm the cache up.
$streamMode = is_multisite() ? get_site_option('crowdsec_stream_mode') : get_option('crowdsec_stream_mode');
@@ -106,7 +106,7 @@ function pushBouncerMetricsInAdminPage()
$configs = getDatabaseConfigs();
$bouncer = new Bouncer($configs);
$bouncer->pushUsageMetrics(Constants::BOUNCER_NAME, Constants::VERSION);
- AdminNotice::displaySuccess(__('CrowdSec usage metrics have just been pushed.'));
+ AdminNotice::displaySuccess(__('CrowdSec remediation metrics have just been pushed.'));
} catch (Exception $e) {
if(isset($bouncer) && $bouncer->getLogger()) {
$bouncer->getLogger()->error('', [
@@ -117,7 +117,7 @@ function pushBouncerMetricsInAdminPage()
'line' => $e->getLine(),
]);
}
- AdminNotice::displayError('Technical error while pushing usage metrics: '.$e->getMessage());
+ AdminNotice::displayError('Technical error while pushing remediation metrics: '.$e->getMessage());
}
}
@@ -127,7 +127,7 @@ function resetBouncerMetricsInAdminPage()
$configs = getDatabaseConfigs();
$bouncer = new Bouncer($configs);
$bouncer->resetUsageMetrics();
- AdminNotice::displaySuccess(__('CrowdSec usage metrics have been reset successfully.'));
+ AdminNotice::displaySuccess(__('CrowdSec remediation metrics have been reset successfully.'));
} catch (Exception $e) {
if(isset($bouncer) && $bouncer->getLogger()) {
$bouncer->getLogger()->error('', [
@@ -138,7 +138,7 @@ function resetBouncerMetricsInAdminPage()
'line' => $e->getLine(),
]);
}
- AdminNotice::displayError('Technical error while resetting usage metrics: '.$e->getMessage());
+ AdminNotice::displayError('Technical error while resetting remediation metrics: '.$e->getMessage());
}
}
@@ -258,7 +258,7 @@ function displayBouncerMetricsInAdminPage()
]);
}
- AdminNotice::displayError('Technical error while displaying usage metrics: ' . esc_html($e->getMessage()));
+ AdminNotice::displayError('Technical error while displaying remediation metrics: ' . esc_html($e->getMessage()));
return '';
}
}
@@ -270,7 +270,7 @@ function displayResetMetricsInAdminPage()
$configs = getDatabaseConfigs();
$bouncer = new Bouncer($configs);
if ($bouncer->hasBaasUri()) {
- return '';
+ return '';
}
return '';
@@ -301,9 +301,9 @@ function displayPushMetricsInAdminPage($isPushEnabled = false)
return '';
}
if( $isPushEnabled) {
- return '';
+ return '';
}
- return '';
+ return '';
}
catch (Exception $e) {
diff --git a/inc/Admin/settings.php b/inc/Admin/settings.php
index c0474206..c6a60a9c 100644
--- a/inc/Admin/settings.php
+++ b/inc/Admin/settings.php
@@ -59,9 +59,22 @@ function crowdsec_multi_save_settings()
** Section "Connection details" **
*********************************/
+ function getIntro()
+ {
+
+ $intro ='
The Instant WordPress Blocklist is an exclusive feature available through the CrowdSec plugin.
+
'
+ ;
+
+ return $intro;
+ }
+
add_settings_section('crowdsec_admin_connection', 'Connection details', function () {
echo 'Connect WordPress to your CrowdSec Local API.';
- }, 'crowdsec_settings', ['after_section' => '']);
+ }, 'crowdsec_settings', ['after_section' => '', 'before_section' => getIntro()]);
// Field "crowdsec_api_url"
addFieldString('crowdsec_api_url', 'Local API URL', 'crowdsec_plugin_settings', 'crowdsec_settings', 'crowdsec_admin_connection', function ($input, $default ='') {
diff --git a/inc/Constants.php b/inc/Constants.php
index c671d9fb..d51a4dc3 100644
--- a/inc/Constants.php
+++ b/inc/Constants.php
@@ -7,7 +7,7 @@
use CrowdSecBouncer\Constants as LibConstants;
/**
- * Every constant of the plugin are set here.
+ * All plugin constants are defined here.
*
* @author CrowdSec team
*
@@ -21,5 +21,5 @@ class Constants extends LibConstants
public const BOUNCER_NAME = 'wordpress-bouncer';
public const DEFAULT_BASE_FILE_PATH = __DIR__ . '/../../../../wp-content/uploads/crowdsec/';
public const STANDALONE_CONFIG_PATH = __DIR__ . '/standalone-settings.php';
- public const VERSION = 'v2.10.0';
+ public const VERSION = 'v2.11.0';
}
diff --git a/inc/assets/crowdsec.css b/inc/assets/crowdsec.css
index ee81a35a..34421c47 100644
--- a/inc/assets/crowdsec.css
+++ b/inc/assets/crowdsec.css
@@ -108,3 +108,40 @@ div.ui-toggle label>div:hover {
.time-text {
width: 5%;
}
+
+.crowdsec-button.button-primary {
+ height: 48px;
+ box-shadow: 0 2px 24px 0 rgba(248,171,19,.1),0 2px 12px 0 rgba(248,171,19,.25),0 2px 8px 0 rgba(248,171,19,.3),0 2px 4px 0 rgba(4,4,31,.15),0 1px 2px 0 rgba(4,4,31,.2),inset 0 1px 2px 0 hsla(48,95%,74%,.5);
+ background-image: linear-gradient(180deg,hsla(0,0%,100%,.1) 0,hsla(0,0%,100%,0) 92%),linear-gradient(180deg,#f8ab13,#f8ab13);
+ display: inline-flex;
+ cursor: pointer;
+ align-items: center;
+ justify-content: center;
+ border-radius: .5rem;
+ padding: .5rem 1.25rem;
+ font-size: 1rem;
+ font-weight: 500;
+ line-height: 1.5rem;
+ color: rgb(17, 24, 28);
+ transition-property: all;
+ transition-timing-function: cubic-bezier(.4,0,.2,1);
+ transition-duration: .3s;
+ opacity: .9;
+}
+
+.crowdsec-button.button-primary:hover, .crowdsec-button.button-primary:focus, .crowdsec-button.button-primary:active {
+ opacity: 1;
+ background-image: linear-gradient(180deg,hsla(0,0%,100%,.1) 0,hsla(0,0%,100%,0) 92%),linear-gradient(180deg,#f8ab13,#f8ab13);
+ color: rgb(17, 24, 28);
+}
+
+.crowdsec-button.button-primary:focus{
+ box-shadow: 0 2px 24px 0 rgba(248,171,19,.1),0 2px 12px 0 rgba(248,171,19,.25),0 2px 8px 0 rgba(248,171,19,.3),0 2px 4px 0 rgba(4,4,31,.15),0 1px 2px 0 rgba(4,4,31,.2),inset 0 1px 2px 0 hsla(48,95%,74%,.5);
+}
+
+p.submit.blaas-button {
+ margin-right: 10px;
+ padding: 0;
+ display: inline;
+}
+
diff --git a/readme.txt b/readme.txt
index ef8ab69b..b7f50e04 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://crowdsec.net/
Tags: security, captcha, ip-blocker, crowdsec, hacker-protection
Requires at least: 4.9
Tested up to: 6.8
-Stable tag: 2.10.0
+Stable tag: 2.11.0
Requires PHP: 7.2
License: MIT
License URI: https://opensource.org/licenses/MIT
@@ -13,21 +13,39 @@ This plugin blocks detected attackers or displays them a captcha to check they a
== Description ==
-Note: You must first have CrowdSec [installed on your server. The installation is very simple](https://docs.crowdsec.net/docs/next/bouncers/wordpress/).
+The CrowdSec plugin proactively blocks requests coming from known attackers.
+It does so by either directly using CrowdSec Blocklists Integration or by connecting to your CrowdSec Security Engine.
-CrowdSec is composed of a behavior detection engine, able to block classical attacks like credential bruteforce, port scans, web scans, etc.
+= Key Features: =
+- **Instant CrowdSec Blocklist**: Quickly block known WordPress attackers in a few clicks.
+- **Detect and block** admin bruteforce attempts and scans of your WordPress Site.
+- Remediation metrics: Enabling you to see the efficiency of the protection.
+- (Console Users) Plug any of your existing Blocklist Integrations.
+- (CrowdSec Security Engine Users) Apply decisions and subscribed blocklist of your security engine within WordPress.
-Based on the type and number of blocked attacks, and after curation of those signals to avoid false positives and poisoning, a global IP reputation DB is maintained and shared with all network members.
+You can:
+
+1. Block aggressive IPs
+2. Display a captcha for less aggressive IPs
-This WordPress plugin is a "bouncer", which purpose is to block detected attacks with two remediation systems: ban or challenge detected attackers with a Captcha.
+== Installation ==
+Check [Full Documentation](https://doc.crowdsec.net/u/bouncers/wordpress) for more details
+
+Multiple ways you can use the plugin
+- [Instant WordPress Blocklist](https://doc.crowdsec.net/u/bouncers/wordpress/#instant-wordpress-blocklist) - easiest
+- [Blocklist as a Service Integration](https://doc.crowdsec.net/u/bouncers/wordpress/#blocklist-as-a-service-integration) - your blocklist catalog
+- [Connect it to your CrowdSec Security Engine](https://doc.crowdsec.net/u/bouncers/wordpress/#crowdsec-wordpress-bouncer-plugin---user-guide) - advanced & most complete
== Frequently Asked Questions ==
-= What do I need to make CrowdSec work? =
+= Do I need to install CrowdSec Security Engine? =
+
+- Not necessarily, you can connect it directly to a CrowdSec Blocklist Integration endpoint
+ - Via [Instant WordPress Blocklist](https://doc.crowdsec.net/u/bouncers/wordpress/#instant-wordpress-blocklist)
+ - Or [Blocklist as a Service Integration](https://doc.crowdsec.net/u/bouncers/wordpress/#blocklist-as-a-service-integration)
-- You have to install a CrowdSec instance on this server.
-- You have to generate a bouncer key on the server on which CrowdSec is running.
+- You can of course [connect it to a security engine](https://doc.crowdsec.net/u/bouncers/wordpress/#crowdsec-wordpress-bouncer-plugin---user-guide) if you have one
== Screenshots ==
@@ -35,15 +53,20 @@ This WordPress plugin is a "bouncer", which purpose is to block detected attacks
2. Customize the wall pages - Adapt the "captcha wall" page text content with your own
3. Customize the wall pages - Adapt the "ban wall" page text content with your own
4. Customize the wall pages - Adapt the pages with your colors. You can also add custom CSS rules.
-5. Advanced settings - Select the live or the stream mode. Select a cache engine (Classical file system, Redis or Memcached). Adjust the cache durations.
+5. Advanced settings - Select live or stream mode. Select a cache engine (Classical file system, Redis or Memcached). Adjust the cache durations.
6. Advanced settings - Set the CDN or Reverse Proxies to trust and configure Geolocation feature.
7. The standard Captcha page
8. The standard Ban page
-9. A Captcha wall page customization (text and colors)
-10. A Ban wall page customization (text and colors)
+9. Captcha wall page customization (text and colors)
+10. Ban wall page customization (text and colors)
+11. The remediation metrics table
== Changelog ==
+= 2.11 (2025-06-02) =
+
+- Add Blocklist as a Service (BLaaS) subscription button
+
= 2.10 (2025-05-09) =
- Add Usage Metrics table in UI
@@ -176,12 +199,3 @@ If you are using the standalone mode, you should upgrade as this release fixes s
= 1.1 =
With this release, you can enable debug log without throwing error on browser as there are now two separate configurations.
-
-== CrowdSec ==
-
-You can:
-
-1. Block aggressive IPs
-2. Display a captcha for less aggressive IPs
-
-Get more info on the [CrowdSec official website](https://crowdsec.net).
diff --git a/tests/e2e-ddev/__tests__/14-blaas.js b/tests/e2e-ddev/__tests__/14-blaas.js
index 4e1425f8..1206a75e 100644
--- a/tests/e2e-ddev/__tests__/14-blaas.js
+++ b/tests/e2e-ddev/__tests__/14-blaas.js
@@ -39,7 +39,7 @@ describe("Check BLaaS URL behavior", () => {
});
it("Should activate WP-CRON", async () => {
- // Enable and disable usage metrics before all to make WP-cron working
+ // Enable and disable remediation metrics before all to make WP-cron working
await goToAdmin();
await onAdminGoToAdvancedPage();
await onAdvancedPageEnableUsageMetrics();
@@ -129,7 +129,7 @@ describe("Check BLaaS URL behavior", () => {
}
});
- it("Should block Usage Metrics", async () => {
+ it("Should block remediation metrics", async () => {
await goToAdmin();
await onAdminGoToAdvancedPage();
await setToggle("crowdsec_usage_metrics", true);
@@ -137,7 +137,7 @@ describe("Check BLaaS URL behavior", () => {
await onAdminSaveSettings(false);
await expect(page).toHaveText(
".notice-error",
- `Pushing usage metrics with a Block as a Service LAPI (${FAKE_BLAAS_URL}) is not supported.`,
+ `Pushing remediation metrics with a Block as a Service LAPI (${FAKE_BLAAS_URL}) is not supported.`,
);
});
@@ -153,7 +153,7 @@ describe("Check BLaaS URL behavior", () => {
);
});
- it("Should interact with usage metrics", async () => {
+ it("Should interact with remediation metrics", async () => {
await goToAdmin();
await onAdminGoToAdvancedPage();
await expect(page).toHaveText("#metrics-cscli-ban", "ban: 1");
@@ -167,7 +167,7 @@ describe("Check BLaaS URL behavior", () => {
await expect(page).toHaveText(
"#wpbody-content > div.wrap > div.notice.notice-success",
- "CrowdSec usage metrics have been reset successfully.",
+ "CrowdSec remediation metrics have been reset successfully.",
);
await expect(page).toHaveText("#metrics-no-new", "No new metrics");
});
diff --git a/tests/e2e-ddev/__tests__/3-live-mode-more.js b/tests/e2e-ddev/__tests__/3-live-mode-more.js
index a3406918..d65cdc75 100644
--- a/tests/e2e-ddev/__tests__/3-live-mode-more.js
+++ b/tests/e2e-ddev/__tests__/3-live-mode-more.js
@@ -130,7 +130,7 @@ describe(`Run in Live mode`, () => {
await expect(page).toMatchText("#metrics-total-bypass", /bypass: 2|4/);
});
- it("Should push usage metrics", async () => {
+ it("Should push remediation metrics", async () => {
await deleteFileContent(DEBUG_LOG_PATH);
let logContent = await getFileContent(DEBUG_LOG_PATH);
await expect(logContent).toBe("");
@@ -158,11 +158,11 @@ describe(`Run in Live mode`, () => {
await expect(page).toHaveText(
"#wpbody-content > div.wrap > div.notice.notice-success",
- "CrowdSec usage metrics have just been pushed.",
+ "CrowdSec remediation metrics have just been pushed.",
);
await expect(page).toHaveText("#metrics-no-new", "No new metrics");
- // Disable usage metrics for future tests
+ // Disable remediation metrics for future tests
await goToAdmin();
await onAdminGoToAdvancedPage();
await onAdvancedPageDisableUsageMetrics();
diff --git a/tests/e2e-ddev/__tests__/5-stream-mode.js b/tests/e2e-ddev/__tests__/5-stream-mode.js
index 08990723..ff6a2969 100644
--- a/tests/e2e-ddev/__tests__/5-stream-mode.js
+++ b/tests/e2e-ddev/__tests__/5-stream-mode.js
@@ -31,7 +31,7 @@ describe(`Run in Stream mode`, () => {
});
it("Should activate WP-CRON", async () => {
- // Enable and disable usage metrics before all to make WP-cron working
+ // Enable and disable remediation metrics before all to make WP-cron working
await goToAdmin();
await onAdminGoToAdvancedPage();
await onAdvancedPageEnableUsageMetrics();
@@ -106,7 +106,7 @@ describe(`Run in Stream mode`, () => {
);
});
- it("Should push usage metrics", async () => {
+ it("Should push remediation metrics", async () => {
await goToAdmin();
await onAdminGoToAdvancedPage();
await onAdvancedPageEnableUsageMetrics();
@@ -116,7 +116,7 @@ describe(`Run in Stream mode`, () => {
await page.click("#crowdsec_push_usage_metrics");
await expect(page).toHaveText(
"#wpbody-content > div.wrap > div.notice.notice-success",
- "CrowdSec usage metrics have just been pushed.",
+ "CrowdSec remediation metrics have just been pushed.",
);
const logContent = await getFileContent(DEBUG_LOG_PATH);
@@ -127,7 +127,7 @@ describe(`Run in Stream mode`, () => {
),
);
- // Disable usage metrics for future tests
+ // Disable remediation metrics for future tests
await goToAdmin();
await onAdminGoToAdvancedPage();
await onAdvancedPageDisableUsageMetrics();