composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

n°524 - password policy

Browse Source 
- The code now uses the standard extension method (using interfaces)
 - the metamodel can now filter on iModuleExtension in order to leverage extensions modularity (see MetaModel::EnumPlugins second param)
 - during the setup, there is no pawsord policy control
 - there is now a default policy
 - new (more precie) translation reflecting the default policy
 - fix CI?
This commit is contained in:
bruno DA SILVA
2019-11-25 16:25:38 +01:00
parent 85932eab98
commit 70dfbbc15e
11 changed files with 148 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/authent-local/datamodel.authent-local.xml
View File

@@ -3,7 +3,7 @@
<module_parameters>
<parameters id="authent-local" _delta="define">
<password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,15}$</password_validation.pattern>
<password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>
<password_validation.classes></password_validation.classes>
</parameters>
</module_parameters>

2
datamodels/2.x/authent-local/en.dict.authent-local.php
View File

@@ -41,5 +41,5 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:UserLocal/Attribute:password' => 'Password',
'Class:UserLocal/Attribute:password+' => 'user authentication string',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex/validation_failed' => 'The password does not respect the policy',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex/validation_failed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.',
));

2
datamodels/2.x/authent-local/fr.dict.authent-local.php
View File

@@ -25,5 +25,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:UserLocal/Attribute:password' => 'Mot de passe',
'Class:UserLocal/Attribute:password+' => '',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex/validation_failed' => 'Le mot de passe ne respecte pas la politique de mot de passe.',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex/validation_failed' => 'Le mot de passe doit contenir au moins 8 caractères, avec minuscule, majuscule, nombre et caractère spécial.',
));

77
datamodels/2.x/authent-local/model.authent-local.php
View File

@@ -157,60 +157,41 @@ class UserLocal extends UserInternal
public function IsPasswordValid()
{
if (ContextTag::Check('Setup'))
{
// during the setup, the admin account can have whatever password you want ...
return true;
}
return (empty($this->m_oPasswordValidity)) || ($this->m_oPasswordValidity->isPasswordValid());
}
/**
* set the $m_oPasswordValidity
* set the $m_oPasswordValidity based on UserLocalPasswordValidator instances vote.
*
* @param string $proposedValue
* @param \Config|null $config
* @param Config|null $config internal use (unit tests)
* @param null|UserLocalPasswordValidator[] $aValidatorCollection internal use (unit tests)
*
* @return void
*/
public function ValidatePassword($proposedValue, $config = null)
public function ValidatePassword($proposedValue, $config = null, $aValidatorCollection = null)
{
if (null == $config)
{
$config = MetaModel::GetConfig();
}
$aPasswordValidationClasses = $config->GetModuleSetting('authent-local', 'password_validation.classes');
if (empty($aPasswordValidationClasses))
if (null == $aValidatorCollection)
{
$aPasswordValidationClasses = array();
$aValidatorCollection = MetaModel::EnumPlugins('iModuleExtension', 'UserLocalPasswordValidator');
}
$sUserPasswordPolicyRegexPattern = $config->GetModuleSetting('authent-local', 'password_validation.pattern');
if ($sUserPasswordPolicyRegexPattern)
foreach ($aValidatorCollection as $oUserLocalPasswordValidator)
{
if (array_key_exists('UserPasswordPolicyRegex', $aPasswordValidationClasses))
{
$this->m_oPasswordValidity = new UserLocalPasswordValidity(
false,
"Invalid configuration: 'UserPasswordPolicyRegex' was defined twice (once into UserLocal.password_validation_advanced, once into UserLocal.password_validation)."
);
return;
}
$aPasswordValidationClasses['UserPasswordPolicyRegex'] = array('pattern' => $sUserPasswordPolicyRegexPattern);
}
foreach ($aPasswordValidationClasses as $sClass => $aOptions)
{
if (!is_subclass_of($sClass, 'UserLocalPasswordValidator'))
{
$this->m_oPasswordValidity = new UserLocalPasswordValidity(
false,
"Invalid configuration: '{$sClass}' must implements ".UserLocalPasswordValidator::class
);
return;
}
/** @var \UserLocalPasswordValidator */
$oInstance = new $sClass();
$this->m_oPasswordValidity = $oInstance->ValidatePassword($proposedValue, $aOptions, $this);
$this->m_oPasswordValidity = $oUserLocalPasswordValidator->ValidatePassword($proposedValue, $this, $config);
if (!$this->m_oPasswordValidity->isPasswordValid())
{
@@ -258,18 +239,16 @@ class UserLocal extends UserInternal
interface UserLocalPasswordValidator
interface UserLocalPasswordValidator extends iModuleExtension
{
public function __construct();
/**
* @param string $proposedValue
* @param array $aOptions
* @param UserLocal $oUserLocal
* @param Config $config
*
* @return UserLocalPasswordValidity
*/
public function ValidatePassword($proposedValue, $aOptions, UserLocal $oUserLocal);
public function ValidatePassword($proposedValue, UserLocal $oUserLocal, $config);
}
class UserPasswordPolicyRegex implements UserLocalPasswordValidator
@@ -280,34 +259,27 @@ class UserPasswordPolicyRegex implements UserLocalPasswordValidator
/**
* @param string $proposedValue
* @param array $aOptions
* @param UserLocal $oUserLocal
* @param Config $config
*
* @return UserLocalPasswordValidity
*/
public function ValidatePassword($proposedValue, $aOptions, UserLocal $oUserLocal)
public function ValidatePassword($proposedValue, UserLocal $oUserLocal, $config)
{
$sPattern = $config->GetModuleSetting('authent-local', 'password_validation.pattern');
if (! array_key_exists('pattern', $aOptions) )
{
return new UserLocalPasswordValidity(
false,
"Invalid configuration: key 'pattern' is mandatory"
);
}
$sPattern = $aOptions['pattern'];
if ('' == $sPattern)
{
return new UserLocalPasswordValidity(true);
}
$isMatched = preg_match("/{$sPattern}/", $proposedValue);
if ($isMatched === false)
{
return new UserLocalPasswordValidity(
false,
'Unknown error : Failed to check the password, please verify the password\'s Data Model.'
'Unknown error : Failed to check the password.'
);
}
@@ -324,4 +296,3 @@ class UserPasswordPolicyRegex implements UserLocalPasswordValidator
);
}
}