From e772cf6ff57b4bd211f028569e4a58d174dd5b9f Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Wed, 14 Apr 2021 10:19:50 +0200 Subject: [PATCH 1/3] doc: fix typo --- doc/sources/admin/applications.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sources/admin/applications.rst b/doc/sources/admin/applications.rst index 430499e97..509869c9c 100644 --- a/doc/sources/admin/applications.rst +++ b/doc/sources/admin/applications.rst @@ -121,7 +121,7 @@ Application Configuration .. image:: applications/sympa_logo.png :doc:`Sympa` ✔ .. image:: applications/tomcat_logo.png :doc:`Tomcat` ✔ .. image:: applications/wekan-logo.png :doc:`Wekan` ✔ -.. image:: applications/wiki.js.svg :doc:`Wekan` ✔ +.. image:: applications/wiki.js.svg :doc:`Wiki.js` ✔ .. image:: applications/wordpress_logo.png :doc:`Wordpress` ✔ .. image:: applications/xwiki.png :doc:`XWiki` ✔ .. image:: applications/zimbra_logo.png :doc:`Zimbra` ✔ From fbd99f8a7fa27db64c79eec5194dfde72ffc1291 Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Wed, 14 Apr 2021 10:19:50 +0200 Subject: [PATCH 2/3] doc: fix typo --- doc/sources/admin/applications/wikijs.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/sources/admin/applications/wikijs.rst b/doc/sources/admin/applications/wikijs.rst index ab44bdf23..15f93898a 100644 --- a/doc/sources/admin/applications/wikijs.rst +++ b/doc/sources/admin/applications/wikijs.rst @@ -35,17 +35,17 @@ Make a note of the "Callback URL" and the bottom of the screen and save the conf Configuring LemonLDAP ~~~~~~~~~~~~~~~~~~~~~ -We now have to configure LemonLDAP::NG to recognize wiki.js as a valid OIDC relaying party. +We now have to configure LemonLDAP::NG to recognize wiki.js as a valid OIDC relying party. -Add a :doc:`new OpenID Connect relaying party<..//idpopenidconnect>` +Add a :doc:`new OpenID Connect relying party<..//idpopenidconnect>` with the following parameters (Options -> Basic) : * **Client ID**: the same you set in Wiki.js configuration. * **Client Secret**: the same you set in Wiki.js configuration. * **Allowed redirection addresses for login**: The "Callback URL" defined in wiki.js. -\_Portal with internal CA -^^^^^^^^^^^^^^^^^^^^^^^^^ +Portal with internal CA +^^^^^^^^^^^^^^^^^^^^^^^ .. danger:: From 21ced5dbad10712174ab48e19b845bd1c4d04c26 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 14 Apr 2021 13:15:26 +0200 Subject: [PATCH 3/3] Fix speChars test, typos & display (#2509) --- doc/sources/admin/portalcustom.rst | 3 +-- .../site/htdocs/static/languages/fr.json | 4 ++-- .../lib/Lemonldap/NG/Portal/Main/Display.pm | 7 ++++--- .../lib/Lemonldap/NG/Portal/Password/Base.pm | 20 ++++++++++--------- .../t/02-Password-Demo-Local-noPpolicy.t | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/doc/sources/admin/portalcustom.rst b/doc/sources/admin/portalcustom.rst index 3f3cb3dc1..98769fe18 100644 --- a/doc/sources/admin/portalcustom.rst +++ b/doc/sources/admin/portalcustom.rst @@ -346,8 +346,7 @@ Password Policy - **Minimal upper characters**: leave 0 to bypass the check - **Minimal digit characters**: leave 0 to bypass the check - **Minimal special characters**: leave 0 to bypass the check -- **Allowed special characters**: set blanck to forbid special - characters (``_`` is not a special character) +- **Allowed special characters**: set '__ALL__' value to allow ALL special characters. A blanck value forbids ALL special characters (Note that ``_`` is not a special character) - **Display policy in password form**: enable this to display an information message about password policy constraints diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 82754efa0..8d224a7f3 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -759,9 +759,9 @@ "passwordPolicyMinDigit":"Minimum de chiffres", "passwordPolicyMinLower":"Minimum de minuscules", "passwordPolicyMinSize":"Taille minimale", -"passwordPolicyMinSpeChar":"Minimum de caractètes spéciaux", +"passwordPolicyMinSpeChar":"Minimum de caractères spéciaux", "passwordPolicyMinUpper":"Minimum de majuscules", -"passwordPolicySpecialChar":"Caractètes spéciaux autorisés", +"passwordPolicySpecialChar":"Caractères spéciaux autorisés", "passwordResetAllowedRetries":"Nombre d'essais pour réinitialiser le mot de passe", "persistent":"Persistantes", "persistentSessions":"Sessions persistantes", diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm index 1577a3679..4586b6243 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm @@ -2,7 +2,7 @@ # Display functions for LemonLDAP::NG Portal package Lemonldap::NG::Portal::Main::Display; -our $VERSION = '2.0.11'; +our $VERSION = '2.0.12'; package Lemonldap::NG::Portal::Main; use strict; @@ -53,6 +53,7 @@ sub displayInit { || $self->conf->{passwordPolicyMinLower} || $self->conf->{passwordPolicyMinUpper} || $self->conf->{passwordPolicyMinDigit} + || $self->conf->{passwordPolicyMinSpeChar} || $speChars; $self->isPP($isPP); } @@ -252,7 +253,7 @@ sub display { PPOLICY_MINDIGIT => $self->conf->{passwordPolicyMinDigit}, PPOLICY_MINSPECHAR => $self->conf->{passwordPolicyMinSpeChar}, ( - $self->conf->{passwordPolicyMinSpeChar} + $self->conf->{passwordPolicyMinSpeChar} || $self->speChars() ? ( PPOLICY_ALLOWEDSPECHAR => $self->speChars() ) : () ), @@ -449,7 +450,7 @@ sub display { PPOLICY_MINDIGIT => $self->conf->{passwordPolicyMinDigit}, PPOLICY_MINSPECHAR => $self->conf->{passwordPolicyMinSpeChar}, ( - $self->conf->{passwordPolicyMinSpeChar} + $self->conf->{passwordPolicyMinSpeChar} || $self->speChars() ? ( PPOLICY_ALLOWEDSPECHAR => $self->speChars() ) : () ), diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm index f5f34f3ee..928329c67 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm @@ -17,7 +17,7 @@ use Lemonldap::NG::Portal::Main::Constants qw( extends 'Lemonldap::NG::Portal::Main::Plugin'; -our $VERSION = '2.0.10'; +our $VERSION = '2.0.12'; # INITIALIZATION @@ -195,14 +195,16 @@ sub checkPasswordQuality { } ## Fobidden special characters - $password =~ s/[\Q$speChars\E\w]//g; - if ($password) { - $self->logger->error( 'Password contains ' - . length($password) - . " forbidden character(s): $password" ); - return length($password) > 1 - ? PE_PP_NOT_ALLOWED_CHARACTERS - : PE_PP_NOT_ALLOWED_CHARACTER; + unless ( $speChars eq '__ALL__' ) { + $password =~ s/[\Q$speChars\E\w]//g; + if ($password) { + $self->logger->error( 'Password contains ' + . length($password) + . " forbidden character(s): $password" ); + return length($password) > 1 + ? PE_PP_NOT_ALLOWED_CHARACTERS + : PE_PP_NOT_ALLOWED_CHARACTER; + } } return PE_OK; diff --git a/lemonldap-ng-portal/t/02-Password-Demo-Local-noPpolicy.t b/lemonldap-ng-portal/t/02-Password-Demo-Local-noPpolicy.t index 1e2e7fdf9..b8a04281e 100644 --- a/lemonldap-ng-portal/t/02-Password-Demo-Local-noPpolicy.t +++ b/lemonldap-ng-portal/t/02-Password-Demo-Local-noPpolicy.t @@ -48,8 +48,8 @@ ok( ok( $res->[2]->[0] =~ m%[2]->[0] ); -ok( $res->[2]->[0] =~ m%%, - ' passwordPolicyNone' ) +ok( $res->[2]->[0] =~ m%Minimal special characters: 2%, + ' passwordPolicyMinSpeChar' ) or print STDERR Dumper( $res->[2]->[0] ); count(3);