Append PPolicyNone message & Unit test & Update manifest

lemonldap-ng-manager/MANIFEST

@@ -37,6 +37,8 @@ README
 REST-API.md
 scripts/lmConfigEditor
 scripts/testConfBackend.pl
+site/api/api.fcgi
+site/api/api.psgi
 site/coffee/2ndfa.coffee
 site/coffee/diff.coffee
 site/coffee/filterFunctions.coffee
@@ -46,8 +48,6 @@ site/coffee/notifications.coffee
 site/coffee/sessions.coffee
 site/coffee/viewDiff.coffee
 site/coffee/viewer.coffee
-site/api/api.fcgi
-site/api/api.psgi
 site/htdocs/manager.fcgi
 site/htdocs/manager.psgi
 site/htdocs/static/bwr/angular-animate/angular-animate.js

lemonldap-ng-portal/MANIFEST

@@ -467,6 +467,7 @@ site/templates/common/script.tpl
 t/01-AuthDemo.t
 t/01-CSP-and-CORS-headers.t
 t/01-pdata.t
+t/02-Password-Demo-Local-noPpolicy.t
 t/02-Password-Demo-Local-Ppolicy.t
 t/02-Password-Demo.t
 t/03-ConfTimeout.t

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm

@@ -204,6 +204,13 @@ sub display {
         $speChars =~ s/(?:^\s|\s$)//g;
         $skinfile = 'menu';
 
+        my $isPP =
+             $self->conf->{passwordPolicyMinSize}
+          || $self->conf->{passwordPolicyMinLower}
+          || $self->conf->{passwordPolicyMinUpper}
+          || $self->conf->{passwordPolicyMinDigit}
+          || $speChars;
+
         #utf8::decode($auth_user);
         %templateParams = (
             MAIN_LOGO => $self->conf->{portalMainLogo},
@@ -220,6 +227,7 @@ sub display {
             PPOLICY_MINLOWER    => $self->conf->{passwordPolicyMinLower},
             PPOLICY_MINUPPER    => $self->conf->{passwordPolicyMinUpper},
             PPOLICY_MINDIGIT    => $self->conf->{passwordPolicyMinDigit},
+            PPOLICY_NOPOLICY    => !$isPP,
             PPOLICY_ALLOWEDSPECHAR => $speChars,
             (
                 $speChars

lemonldap-ng-portal/site/htdocs/static/languages/ar.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"المصادقات المتبقية، غير كلمة المرور الخاصة بك!",
 "proxyError":"بوابة سيئة: غير قادر على الانضمام لالخادم البعيد",

lemonldap-ng-portal/site/htdocs/static/languages/de.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"verbleibende Authentifizierungen, bitte Passwort ändern !",
 "proxyError":"Bad gateway: Der Remote-Server kann nicht verbunden werden",

lemonldap-ng-portal/site/htdocs/static/languages/en.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",

lemonldap-ng-portal/site/htdocs/static/languages/es.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Mayúsculas, como mínimo:",
 "passwordPolicyMinDigit":"Dígitos, como mínimo:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"autenticaciones restantes, ¡cambie su contraseña!.",
 "proxyError":"Puerta de enlace no válida: servidor remoto inalcanzable",

lemonldap-ng-portal/site/htdocs/static/languages/fi.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",

lemonldap-ng-portal/site/htdocs/static/languages/fr.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper": "Minimum de majuscules :",
 "passwordPolicyMinDigit": "Minimum de chiffres :",
 "passwordPolicyMinSpeChar":"Minimum de caractères spéciaux :",
+"passwordPolicyNone":"Vous êtes libre de choisir votre mot de passe !",
 "passwordPolicySpecialChar":"Caractères spéciaux autorisés :",
 "ppGrace": "authentifications restantes, changez votre mot de passe !",
 "proxyError": "Mauvaise passerelle : impossible de joindre le serveur amont",

lemonldap-ng-portal/site/htdocs/static/languages/it.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"autenticazioni restanti, modifica la tua password!",
 "proxyError":"Gateway errata: impossibile associarsi a un server remoto",

lemonldap-ng-portal/site/htdocs/static/languages/nl.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",

lemonldap-ng-portal/site/htdocs/static/languages/pt.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",

lemonldap-ng-portal/site/htdocs/static/languages/ro.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"Bad gateway: unable to join remote server",

lemonldap-ng-portal/site/htdocs/static/languages/tr.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimum büyük harf karakter sayısı :",
 "passwordPolicyMinDigit":"Minimum rakam karakter sayısı :",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"kimlik doğrulaması kaldı, parolanızı değiştirin!",
 "proxyError":"Kötü ağ geçidi: uzak sunucuya katılamıyor",

lemonldap-ng-portal/site/htdocs/static/languages/vi.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"chứng thực vẫn còn, thay đổi mật khẩu của bạn!",
 "proxyError":"Gateway không chính xác: không thể kết nối máy chủ từ xa",

lemonldap-ng-portal/site/htdocs/static/languages/zh.json

@@ -228,6 +228,7 @@
 "passwordPolicyMinUpper":"Minimal upper characters:",
 "passwordPolicyMinDigit":"Minimal digit characters:",
 "passwordPolicyMinSpeChar":"Minimal special characters:",
+"passwordPolicyNone":"You are free to choose your password!",
 "passwordPolicySpecialChar":"Allowed special characters:",
 "ppGrace":"authentications remaining, change your password!",
 "proxyError":"错误的网关：无法连接远程服务器",

lemonldap-ng-portal/site/templates/bootstrap/passwordpolicy.tpl

@@ -20,4 +20,7 @@
     <li><span trspan="passwordPolicySpecialChar">Allowed special characters:</span> <TMPL_VAR NAME="PPOLICY_ALLOWEDSPECHAR"></li>
     </TMPL_IF>
   </ul>
+  <TMPL_IF NAME="PPOLICY_NOPOLICY">
+    <span trspan="passwordPolicyNone">You are free to choose your password! ;-)</span>
+  </TMPL_IF>
 </div>

lemonldap-ng-portal/t/02-Password-Demo-Local-noPpolicy.t

@@ -0,0 +1,62 @@
+use Test::More;
+use strict;
+use IO::String;
+use JSON;
+use Lemonldap::NG::Portal::Main::Constants qw(
+  PE_PP_PASSWORD_TOO_SHORT PE_PP_INSUFFICIENT_PASSWORD_QUALITY
+  PE_PP_NOT_ALLOWED_CHARACTER PE_PP_NOT_ALLOWED_CHARACTERS
+);
+
+require 't/test-lib.pm';
+
+my $res;
+
+my $client = LLNG::Manager::Test->new( {
+        ini => {
+            logLevel                    => 'error',
+            passwordDB                  => 'Demo',
+            portalRequireOldPassword    => 1,
+            passwordPolicyMinSize       => 0,
+            passwordPolicyMinLower      => 0,
+            passwordPolicyMinUpper      => 0,
+            passwordPolicyMinDigit      => 0,
+            passwordPolicyMinSpeChar    => 2,
+            passwordPolicySpecialChar   => '',
+            portalDisplayPasswordPolicy => 1
+        }
+    }
+);
+
+# Try to authenticate
+# -------------------
+ok(
+    $res = $client->_post(
+        '/',
+        IO::String->new('user=dwho&password=dwho'),
+        length => 23
+    ),
+    'Auth query'
+);
+count(1);
+expectOK($res);
+my $id = expectCookie($res);
+
+ok(
+    $res =
+      $client->_get( '/', cookie => "lemonldap=$id", accept => 'text/html' ),
+    'Get Menu'
+);
+ok( $res->[2]->[0] =~ m%<input id="oldpassword" name="oldpassword"%,
+    ' Old password input' )
+  or print STDERR Dumper( $res->[2]->[0] );
+ok( $res->[2]->[0] =~ m%<span trspan="passwordPolicyNone">%,
+    ' passwordPolicyNone' )
+  or print STDERR Dumper( $res->[2]->[0] );
+count(3);
+
+# Test $client->logout
+$client->logout($id);
+
+clean_sessions();
+
+done_testing( count() );