fix if no password policy is set in config.ini

application/forms/Account/ChangePasswordForm.php

@@ -25,13 +25,6 @@ class ChangePasswordForm extends Form
      */
     protected $backend;
 
-    /**
-     *  The password policy object
-     *
-     * @var PasswordPolicyHook
-     */
-    protected ?PasswordPolicyHook $passwordPolicyObject = null;
-
     /**
      * {@inheritdoc}
      */
@@ -45,15 +38,19 @@ class ChangePasswordForm extends Form
      */
     public function createElements(array $formData)
     {
+        $passwordPolicyObject = null;
         $passwordPolicy = Config::app()->get(
-            'global',
+        'global',
-            'password_policy'
+        'password_policy'
         );
-        $this->passwordPolicyObject = new $passwordPolicy();
-        $passwordPolicyDescription = $this->passwordPolicyObject->displayPasswordPolicy();
 
-        if ($passwordPolicyDescription != '') {
+        if(isset($passwordPolicy)){
-            $this->addDescription($passwordPolicyDescription);
+            $passwordPolicyObject = new $passwordPolicy();
+            $passwordPolicyDescription = $passwordPolicyObject->getDescription();
+
+            if ($passwordPolicyDescription != '') {
+                $this->addDescription($passwordPolicyDescription);
+            }
         }
 
         $this->addElement(
@@ -70,9 +67,8 @@ class ChangePasswordForm extends Form
             array(
                 'label'         => $this->translate('New Password'),
                 'required'      => true,
-                'validators' =>
+                'validators' => $passwordPolicyObject !== null ?
-                    $this->passwordPolicyObject !== null ?
+                        [new PasswordValidator($passwordPolicyObject)] : [],
-                        [new PasswordValidator($this->passwordPolicyObject)] : [],
             )
         );
         $this->addElement(

application/forms/Config/User/UserForm.php

@@ -19,10 +19,18 @@ class UserForm extends RepositoryForm
      */
     protected function createInsertElements(array $formData)
     {
-        $passwordPolicy = Config::app()->get('global', 'password_policy');
+        $passwordPolicyObject = null;
-        if (isset($passwordPolicy) && class_exists($passwordPolicy)) {
+        $passwordPolicy = Config::app()->get(
+            'global',
+            'password_policy'
+        );
+        if (isset($passwordPolicy)) {
             $passwordPolicyObject = new $passwordPolicy();
-            $this->addDescription($passwordPolicyObject->displayPasswordPolicy());
+            $passwordPolicyDescription = $passwordPolicyObject->getDescription();
+
+            if ($passwordPolicyDescription != '') {
+                $this->addDescription($passwordPolicyDescription);
+            }
         }
 
         $this->addElement(
@@ -48,7 +56,8 @@ class UserForm extends RepositoryForm
             array(
                 'required'  => true,
                 'label'     => $this->translate('Password'),
-                'validators' => array(new PasswordValidator())
+                'validators' => $passwordPolicyObject !== null ?
+                        [new PasswordValidator($passwordPolicyObject)] : [],
             )
         );
 

library/Icinga/Application/Hook/PasswordPolicyHook.php

@@ -12,19 +12,19 @@ interface PasswordPolicyHook
      */
     public function getName(): string;
 
-/**
+    /**
      * Displays the rules of the password policy for users
      *
      * @return string
      */
-    public function displayPasswordPolicy(): string;
+    public function getDescription(): string;
 
     /**
      * Validate a given password against the defined policy
      *
      * @param string $password
-     * @return string|null Returns null if the password is valid,
+     * @return array Returns an empty array if the password is valid,
      * otherwise returns an error message describing the violations
      */
-    public function validatePassword(string $password): ?array;
+    public function validatePassword(string $password): array;
 }

library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php

@@ -25,7 +25,7 @@ class DefaultPasswordPolicy implements PasswordPolicyHook
         return 'Default';
     }
 
-    public function displayPasswordPolicy(): string
+    public function getDescription(): string
     {
         $message =
             $this->translate(
@@ -35,49 +35,44 @@ class DefaultPasswordPolicy implements PasswordPolicyHook
         return $message;
     }
 
-    public function validatePassword(string $password): ?array
+    public function validatePassword(string $password): array
     {
         $violations = [];
 
-        if (strlen($password) < 12) {
+        if (mb_strlen($password) < 12) {
-            $violations[] =
+            $violations[] = $this->translate(
-                $this->translate(
+                'Password must be at least 12 characters long'
-                    'Password must be at least 12 characters long'
+            );
-                );
         }
 
         if (! preg_match('/[0-9]/', $password)) {
-            $violations[] =
+            $violations[] = $this->translate(
-                $this->translate(
+                'Password must contain at least one number'
-                    'Password must contain at least one number'
+            );
-                );
         }
 
         if (! preg_match('/[^a-zA-Z0-9]/', $password)) {
-            $violations[] =
+            $violations[] = $this->translate(
-                $this->translate(
+                'Password must contain at least one special character'
-                    'Password must contain at least one special character'
+            );
-                );
         }
 
         if (! preg_match('/[A-Z]/', $password)) {
-            $violations[] =
+            $violations[] = $this->translate(
-                $this->translate(
+                'Password must contain at least one uppercase letter'
-                    'Password must contain at least one uppercase letter'
+            );
-                );
         }
 
         if (! preg_match('/[a-z]/', $password)) {
-            $violations[] =
+            $violations[] = $this->translate(
-                $this->translate(
+                'Password must contain at least one lowercase letter'
-                    'Password must contain at least one lowercase letter'
+            );
-                );
         }
 
         if (! empty($violations)) {
             return $violations;
         }
 
-        return null;
+        return [];
     }
 }

library/Icinga/Application/ProvidedHook/NonePasswordPolicy.php

@@ -15,13 +15,13 @@ class NonePasswordPolicy implements PasswordPolicyHook
         return 'None';
     }
 
-    public function displayPasswordPolicy(): string
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function validatePassword(string $password): ?array
+    public function validatePassword(string $password): array
     {
-        return null;
+        return [];
     }
 }

library/Icinga/Authentication/PasswordValidator.php

@@ -35,11 +35,13 @@ class PasswordValidator extends Zend_Validate_Abstract
      */
     public function isValid($value): bool
     {
-        if ($this->passwordPolicyObject->validatePassword($value) === null) {
+        $message = $this->passwordPolicyObject->validatePassword($value);
-            return true;
+
+        if (!empty($message)) {
+            $this->_messages = $message;
+            return false;
         }
 
-        $this->_messages = $this->passwordPolicyObject->validatePassword($value);
+        return true;
-        return false;
     }
 }