Move CrowdSec plugin to Security menu (#2451)

2021-02-20 19:18:25 +01:00 · 2021-02-20 19:18:25 +01:00 · f7caff32c7
commit f7caff32c7
parent 861463f987
16 changed files with 25 additions and 29 deletions
--- a/doc/sources/admin/security.rst
+++ b/doc/sources/admin/security.rst
@ -332,12 +332,8 @@ Go in Manager, ``General parameters`` » ``Advanced parameters`` »
 -  **Form timeout**: Form token timeout (default to 120 seconds)
 -  **Use global storage**: Local cache is used by default for one time
   tokens. To use global storage, set it to 'On'
-  **Brute-Force Attack protection**: set to 'On' to enable it. The aim
-   of a brute force attack is to gain access to user accounts by
-   repeatedly trying to guess the password of a user. If it is disabled,
-   automated tools may submit thousands of password attempts in a matter
-   of seconds, making it easy for an attacker to beat a password-based
-   authentication system.
+-  **CrowdSec Bouncer**: set to 'On' to enable :doc:`CrowdSec Bouncer plugin<crowdsec>`
+-  **Brute-Force Attack protection**: set to 'On' to enable :doc:`Brute-force protection plugin<bruteforceprotection>`
 -  **LWP::UserAgent and SSL options**: insert here options to pass to
   LWP::UserAgent object (used by SAML or OpenID-Connect to query
   partners and AuthSSL or AuthBasic handler to request Portal URL).
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
@ -1124,11 +1124,11 @@ sub attributes {
        },
        lwpOpts => {
            type          => 'keyTextContainer',
-            documentation => 'Options given to LWP::UserAgent',
+            documentation => 'Options passed to LWP::UserAgent',
        },
        lwpSslOpts => {
            type          => 'keyTextContainer',
-            documentation => 'SSL options given to LWP::UserAgent',
+            documentation => 'SSL options passed to LWP::UserAgent',
        },

        # CrowdSec plugin
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
@ -775,13 +775,6 @@ sub tree {
                            form  => 'simpleInputContainer',
                            nodes => [ 'checkState', 'checkStateSecret', ],
                        },
-                        {
-                            title => 'CrowdSecPlugin',
-                            nodes => [
-                                'crowdsec',    'crowdsecAction',
-                                'crowdsecUrl', 'crowdsecKey',
-                            ],
-                        },
                        {
                            title => 'checkUsers',
                            help  => 'checkuser.html',
@ -1035,6 +1028,14 @@ sub tree {
                                'requireToken',
                                'formTimeout',
                                'tokenUseGlobalStorage',
+                                {
+                                    title => 'CrowdSecPlugin',
+                                    help  => 'crowdsec.html',
+                                    nodes => [
+                                        'crowdsec',    'crowdsecAction',
+                                        'crowdsecUrl', 'crowdsecKey',
+                                    ],
+                                },
                                {
                                    title => 'bruteForceAttackProtection',
                                    help  => 'bruteforceprotection.html',
@ -1049,7 +1050,6 @@ sub tree {
                                },
                                'lwpOpts',
                                'lwpSslOpts',
-
                                {
                                    title => 'contentSecurityPolicy',
                                    help  => 'security.html#portal',
--- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"الإعدادات الحالية",
 "customAddParams":"معايير إضافية",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Current configuration",
 "customAddParams":"Additional parameters",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Current configuration",
 "customAddParams":"Additional parameters",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Configuración actual",
 "customAddParams":"Parámetros adicionales",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"Clef de l'API",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"URL de base de l'API locale",
 "currentConfiguration":"Configuration actuelle",
 "customAddParams":"Paramètres additionnels",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Configurazione attuale",
 "customAddParams":"Parametri aggiuntivi",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Aktualna konfiguracja",
 "customAddParams":"Dodatkowe parametry",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Mevcut yapılandırma",
 "customAddParams":"Ek parametreler",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Cấu hình hiện tại",
 "customAddParams":"Tham số bổ sung",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"Current configuration",
 "customAddParams":"Additional parameters",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
@ -240,7 +240,7 @@
 "crowdsec":"Activation",
 "crowdsecAction":"Action",
 "crowdsecKey":"API key",
-"CrowdSecPlugin":"CrowdSec",
+"CrowdSecPlugin":"CrowdSec Bouncer",
 "crowdsecUrl":"Base URL of local API",
 "currentConfiguration":"目前的設定",
 "customAddParams":"額外參數",
--- a/lemonldap-ng-manager/site/htdocs/static/reverseTree.json
+++ b/lemonldap-ng-manager/site/htdocs/static/reverseTree.json
--- a/lemonldap-ng-manager/site/htdocs/static/struct.json
+++ b/lemonldap-ng-manager/site/htdocs/static/struct.json