Skip to content

Commit 59688c3

Browse files
committed
make public cs mentions hidable
1 parent 4694598 commit 59688c3

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

inc/admin/advanced-settings.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,21 @@ function adminAdvancedSettings()
127127
foreach (Constants::ORDERED_REMEDIATIONS as $remediation) {
128128
$choice[$remediation] = $remediation;
129129
}
130-
addFieldSelect('crowdsec_fallback_remediation', 'Fallback to', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_cache', function ($input) {
130+
addFieldSelect('crowdsec_fallback_remediation', 'Fallback to', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_remediations', function ($input) {
131131
if (!in_array($input, Constants::ORDERED_REMEDIATIONS)) {
132132
$input = CROWDSEC_BOUNCING_LEVEL_DISABLED;
133133
// TODO P3 throw error
134134
}
135135
return $input;
136136
}, '<p>Which remediation to apply when CrowdSec advises unhandled remediation.</p>', $choice);
137+
138+
// Field "crowdsec_hide_mentions"
139+
addFieldCheckbox('crowdsec_hide_mentions', 'Hide CrowdSec mentions', 'crowdsec_plugin_advanced_settings', 'crowdsec_advanced_settings', 'crowdsec_admin_advanced_remediations', function () {
140+
// Stream mode just activated.
141+
scheduleBlocklistRefresh();
142+
}, function () {
143+
// Stream mode just deactivated.
144+
unscheduleBlocklistRefresh();
145+
}, '
146+
<p>Enable if you want to hide CrowdSec mentions on the Ban and Captcha pages</p>');
137147
}

inc/bounce-current-ip.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ function bounceCurrentIp()
1111
function displayCaptchaWall()
1212
{
1313
header('HTTP/1.0 401 Unauthorized');
14-
echo Bouncer::getCaptchaHtmlTemplate($_SESSION["crowdsec_captcha_resolution_failed"], $_SESSION['crowdsec_captcha_inline_image'], '');
14+
echo Bouncer::getCaptchaHtmlTemplate($_SESSION["crowdsec_captcha_resolution_failed"], $_SESSION['crowdsec_captcha_inline_image'], '', !get_option('crowdsec_hide_mentions'));
1515
die();
1616
}
1717

1818
function handleBanRemediation()
1919
{
2020
header('HTTP/1.0 403 Forbidden');
21-
echo Bouncer::getAccessForbiddenHtmlTemplate();
21+
echo Bouncer::getAccessForbiddenHtmlTemplate(!get_option('crowdsec_hide_mentions'));
2222
die();
2323
}
2424

inc/plugin-setup.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ function activate_crowdsec_plugin()
2828
update_option("crowdsec_clean_ip_cache_duration", Constants::CACHE_EXPIRATION_FOR_CLEAN_IP);
2929
update_option("crowdsec_bad_ip_cache_duration", Constants::CACHE_EXPIRATION_FOR_BAD_IP);
3030
update_option("crowdsec_fallback_remediation", Constants::REMEDIATION_CAPTCHA);
31+
32+
update_option("crowdsec_hide_mentions", false);
3133
}
3234

3335

@@ -67,4 +69,6 @@ function deactivate_crowdsec_plugin()
6769
delete_option("crowdsec_clean_ip_cache_duration");
6870
delete_option("crowdsec_bad_ip_cache_duration");
6971
delete_option("crowdsec_fallback_remediation");
72+
73+
delete_option("crowdsec_hide_mentions");
7074
}

0 commit comments

Comments
 (0)