Reorganize code

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

@@ -2,6 +2,9 @@ package Lemonldap::NG::Portal::Lib::Password;
 
 use strict;
 use Mouse::Role;
+use Lemonldap::NG::Portal::Main::Constants qw(
+  PE_OK
+);
 
 our $VERSION = '2.19.0';
 
@@ -12,6 +15,16 @@ has random => (
     }
 );
 
+# Password policy activation rule
+has passwordPolicyActivationRule => (
+    is      => 'ro',
+    lazy    => 1,
+    default => sub {
+        $_[0]->p->buildRule( $_[0]->conf->{passwordPolicyActivation} // 0,
+            'passwordPolicyActivation' );
+    }
+);
+
 # Generate a complex password based on a regular expression
 # @param regexp regular expression
 sub gen_password {
@@ -19,4 +32,47 @@ sub gen_password {
     return $self->random->randregex($regexp);
 }
 
+sub newPassword {
+    my ( $self, $req, $sessionInfo ) = @_;
+
+    # Generate a complex password
+    my $pwdRegEx;
+    if ( $self->passwordPolicyActivationRule->( $req, $sessionInfo )
+        && !$self->conf->{randomPasswordRegexp} )
+    {
+        my $uppers = $self->conf->{passwordPolicyMinUpper} || 3;
+        my $lowers = $self->conf->{passwordPolicyMinLower} || 5;
+        my $digits = $self->conf->{passwordPolicyMinDigit} || 2;
+        my $chars =
+          $self->conf->{passwordPolicyMinSize} -
+          $self->conf->{passwordPolicyMinUpper} -
+          $self->conf->{passwordPolicyMinLower} -
+          $self->conf->{passwordPolicyMinDigit};
+        $chars    = 1 if $chars < 1;
+        $pwdRegEx = "[A-Z]{$uppers}[a-z]{$lowers}\\d{$digits}";
+        $pwdRegEx .=
+          $self->conf->{passwordPolicySpecialChar} eq '__ALL__'
+          ? '\W{$chars}'
+          : "[$self->{conf}->{passwordPolicySpecialChar}]{$chars}";
+        $self->logger->debug("Generated password RegEx: $pwdRegEx");
+    }
+    else {
+        $pwdRegEx =
+          $self->conf->{randomPasswordRegexp} || '[A-Z]{3}[a-z]{5}.\d{2}';
+        $self->logger->debug("Used password RegEx: $pwdRegEx");
+    }
+    return $self->gen_password($pwdRegEx);
+}
+
+sub checkPasswordQuality {
+    my ( $self, $req, $pwd ) = @_;
+    require Lemonldap::NG::Portal::Plugins::BasePasswordPolicy;
+    return PE_OK
+      unless $self->passwordPolicyActivationRule->( $req, $req->sessionInfo );
+    return
+      $self
+      ->Lemonldap::NG::Portal::Plugins::BasePasswordPolicy::checkBasicPolicy(
+        $pwd);
+}
+
 1;

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm

@@ -387,33 +387,7 @@ sub changePwd {
         $self->logger->debug(
             "Reset password request for $req->{sessionInfo}->{_user}");
 
-        # Generate a complex password
+        my $password = $self->newPassword($req, $req->sessionInfo);
-        my $pwdRegEx;
-        if ( $self->passwordPolicyActivationRule->( $req, $req->sessionInfo )
-            && !$self->conf->{randomPasswordRegexp} )
-        {
-            my $uppers = $self->conf->{passwordPolicyMinUpper} || 3;
-            my $lowers = $self->conf->{passwordPolicyMinLower} || 5;
-            my $digits = $self->conf->{passwordPolicyMinDigit} || 2;
-            my $chars =
-              $self->conf->{passwordPolicyMinSize} -
-              $self->conf->{passwordPolicyMinUpper} -
-              $self->conf->{passwordPolicyMinLower} -
-              $self->conf->{passwordPolicyMinDigit};
-            $chars    = 1 if $chars < 1;
-            $pwdRegEx = "[A-Z]{$uppers}[a-z]{$lowers}\\d{$digits}";
-            $pwdRegEx .=
-              $self->conf->{passwordPolicySpecialChar} eq '__ALL__'
-              ? '\W{$chars}'
-              : "[$self->{conf}->{passwordPolicySpecialChar}]{$chars}";
-            $self->logger->debug("Generated password RegEx: $pwdRegEx");
-        }
-        else {
-            $pwdRegEx =
-              $self->conf->{randomPasswordRegexp} || '[A-Z]{3}[a-z]{5}.\d{2}';
-            $self->logger->debug("Used password RegEx: $pwdRegEx");
-        }
-        my $password = $self->gen_password($pwdRegEx);
         $self->logger->debug("Generated password: $password");
         $req->data->{newpassword}     = $password;
         $req->data->{confirmpassword} = $password;
@@ -438,13 +412,7 @@ sub changePwd {
     }
 
     # Check password quality if enabled
-    require Lemonldap::NG::Portal::Plugins::BasePasswordPolicy;
+    my $cpq = $self->checkPasswordQuality($req, $req->data->{newpassword});
-    my $cpq =
-        $self->passwordPolicyActivationRule->( $req, $req->sessionInfo )
-      ? $self
-      ->Lemonldap::NG::Portal::Plugins::BasePasswordPolicy::checkBasicPolicy(
-        $req->data->{newpassword} )
-      : PE_OK;
     unless ( $cpq == PE_OK ) {
         $self->ott->setToken( $req, $req->sessionInfo );
         return $cpq;

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/_PasswordReset.pm

@@ -12,10 +12,10 @@ use Lemonldap::NG::Portal::Main::Constants qw(
 our $VERSION = '2.19.0';
 
 extends 'Lemonldap::NG::Portal::Main::Plugin';
-with 'Lemonldap::NG::Portal::Lib::_tokenRule';
+with qw(
-
+  Lemonldap::NG::Portal::Lib::_tokenRule
-# Password policy activation rule
+  Lemonldap::NG::Portal::Lib::Password
-has passwordPolicyActivationRule => ( is => 'rw', default => sub { 0 } );
+);
 
 # Mail timeout token generator
 # Form timout token generator (used even if requireToken is not set)
@@ -50,14 +50,6 @@ sub init {
         $self->captcha(1);
     }
 
-    # Parse password policy activation rule
-    $self->passwordPolicyActivationRule(
-        $self->p->buildRule(
-            $self->conf->{passwordPolicyActivation},
-            'passwordPolicyActivation'
-        )
-    );
-
     return $self->passwordPolicyActivationRule ? 1 : 0;
 }