Modify type (#2266)

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -2485,10 +2485,7 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         },
         'passwordPolicy' => {
             'default' => 1,
-            'test'    => sub {
-                return perlExpr(@_);
-            },
-            'type' => 'text'
+            'type'    => 'boolOrExpr'
         },
         'passwordPolicyMinDigit' => {
             'default' => 0,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -1455,8 +1455,7 @@ sub attributes {
             documentation => 'Hide old password in portal',
         },
         passwordPolicy => {
-            type          => 'text',
-            test          => sub { return perlExpr(@_) },
+            type          => 'boolOrExpr',
             default       => 1,
             documentation => 'Enable password policy',
         },

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@@ -79,6 +79,7 @@ sub tree {
                                         'portalRequireOldPassword',
                                         'hideOldPassword',
                                         'mailOnPasswordChange',
+                                        'passwordPolicy',
                                         'passwordPolicyMinSize',
                                         'passwordPolicyMinLower',
                                         'passwordPolicyMinUpper',

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm

@@ -42,17 +42,26 @@ sub _modifyPassword {
     return PE_PASSWORD_MISMATCH
       unless ( $req->data->{newpassword} eq $req->param('confirmpassword') );
 
-    my $rule = $self->p->HANDLER->buildSub(
+    my $oldPwdRule = $self->p->HANDLER->buildSub(
         $self->p->HANDLER->substitute(
             $self->conf->{portalRequireOldPassword}
         )
     );
-    unless ($rule) {
+    unless ($oldPwdRule) {
+        my $error = $self->p->HANDLER->tsv->{jail}->error || '???';
+    }
+
+    my $pwdPolicyRule = $self->p->HANDLER->buildSub(
+        $self->p->HANDLER->substitute(
+            $self->conf->{passwordPolicy}
+        )
+    );
+    unless ($pwdPolicyRule) {
         my $error = $self->p->HANDLER->tsv->{jail}->error || '???';
     }
 
     # Check if portal require old password
-    if ( $rule->( $req, $req->userData ) or $requireOldPwd ) {
+    if ( $oldPwdRule->( $req, $req->userData ) or $requireOldPwd ) {
 
         # TODO: verify oldpassword
         unless ( $req->data->{oldpassword} = $req->param('oldpassword') ) {
@@ -66,7 +75,7 @@ sub _modifyPassword {
     }
 
     my $cpq =
-        $self->conf->{passwordPolicy}
+        $pwdPolicyRule->( $req, $req->userData )
       ? $self->checkPasswordQuality( $req->data->{newpassword} )
       : PE_OK;
     return $cpq unless ( $cpq == PE_OK );