Skip to content

Commit 39bbc53

Browse files
committed
Change Class Default in CommonPasswordPolicy
1 parent 7e95078 commit 39bbc53

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ build/*
2020
# Exclude dompdf font cache
2121
library/vendor/dompdf/lib/fonts/*.php
2222
library/vendor/dompdf/lib/fonts/log.htm
23+
24+
#locale änderung für Tests sollen nicht gepushed werden
25+
composer.json

application/forms/Account/ChangePasswordForm.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
namespace Icinga\Forms\Account;
55

66
use Icinga\Application\Config;
7-
use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
7+
use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
8+
use Icinga\Application\ProvidedHook\NoPasswordPolicy;
89
use Icinga\Authentication\PasswordValidator;
910
use Icinga\Authentication\User\DbUserBackend;
1011
use Icinga\Data\Filter\Filter;
@@ -40,7 +41,7 @@ public function createElements(array $formData)
4041
$passwordPolicy = Config::app()->get(
4142
'global',
4243
'password_policy',
43-
DefaultPasswordPolicy::class
44+
NoPasswordPolicy::class
4445
);
4546
$passwordPolicyObject = new $passwordPolicy();
4647
$passwordPolicyDescription = $passwordPolicyObject->getDescription();

application/forms/Config/General/PasswordPolicyConfigForm.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
namespace Icinga\Forms\Config\General;
55

66
use Icinga\Application\Hook;
7-
use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
7+
use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
8+
use Icinga\Application\ProvidedHook\NoPasswordPolicy;
89
use Icinga\Web\Form;
910

1011
/**
@@ -36,7 +37,7 @@ public function createElements(array $formData): self
3637
'Enforce strong password requirements for new passwords'
3738
),
3839
'label' => $this->translate('Password Policy'),
39-
'value' => DefaultPasswordPolicy::class,
40+
'value' => NoPasswordPolicy::class,
4041
'multiOptions' =>$passwordPolicies
4142
]
4243
);

application/forms/Config/User/UserForm.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
use Icinga\Application\Config;
77
use Icinga\Application\Hook\ConfigFormEventsHook;
8-
use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
8+
use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
9+
use Icinga\Application\ProvidedHook\NoPasswordPolicy;
910
use Icinga\Authentication\PasswordValidator;
1011
use Icinga\Data\Filter\Filter;
1112
use Icinga\Forms\RepositoryForm;
@@ -23,7 +24,7 @@ protected function createInsertElements(array $formData)
2324
$passwordPolicy = Config::app()->get(
2425
'global',
2526
'password_policy',
26-
DefaultPasswordPolicy::class
27+
NoPasswordPolicy::class
2728
);
2829
$passwordPolicyObject = new $passwordPolicy();
2930
$passwordPolicyDescription = $passwordPolicyObject->getDescription();

library/Icinga/Application/ApplicationBootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use ErrorException;
88
use Exception;
99
use Icinga\Application\ProvidedHook\DbMigration;
10-
use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
10+
use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
1111
use Icinga\Application\ProvidedHook\NoPasswordPolicy;
1212
use ipl\I18n\GettextTranslator;
1313
use ipl\I18n\StaticTranslator;
@@ -742,7 +742,7 @@ public function hasLocales()
742742
protected function registerApplicationHooks(): self
743743
{
744744
Hook::register('DbMigration', DbMigration::class, DbMigration::class);
745-
Hook::register('passwordpolicy', DefaultPasswordPolicy::class, DefaultPasswordPolicy::class);
745+
Hook::register('passwordpolicy', CommonPasswordPolicy::class, CommonPasswordPolicy::class);
746746
Hook::register('passwordpolicy', NoPasswordPolicy::class, NoPasswordPolicy::class);
747747

748748
return $this;

library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php renamed to library/Icinga/Application/ProvidedHook/CommonPasswordPolicy.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use ipl\I18n\Translation;
88

99
/**
10-
* Default implementation of a password policy
10+
* Common implementation of a password policy
1111
*
1212
* Enforces:
1313
* - Minimum length of 12 characters
@@ -16,13 +16,13 @@
1616
* - At least one uppercase letter
1717
* - At least one lowercase letter
1818
*/
19-
class DefaultPasswordPolicy implements PasswordPolicyHook
19+
class CommonPasswordPolicy implements PasswordPolicyHook
2020
{
2121
use Translation;
2222

2323
public function getName(): string
2424
{
25-
return $this->translate('Default');
25+
return $this->translate('Common');
2626
}
2727

2828
public function getDescription(): string

0 commit comments

Comments
 (0)