Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Feature/force fe user change pw on login #6304

Open
wants to merge 2 commits into
base: 3.5
Choose a base branch
from
Open

Feature/force fe user change pw on login #6304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d899848
add static User::checkCryptPassword() for use in ModuleLogin
ralfhartmann Oct 13, 2013
5e36b53
the FE User can be forced to change his password, now
ralfhartmann Oct 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions system/modules/core/classes/FrontendUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,18 @@ public function authenticate()
// Default authentication
if (parent::authenticate())
{
// Check if the user has to change the password
if ($this->pwChange)
{
// we are here because of the login module, do not logout
if (\Session::getInstance()->get('PASSWORD_CHANGE_REQUIRED'))
{
\Session::getInstance()->remove('PASSWORD_CHANGE_REQUIRED');
return false;
}
$this->logout();
$this->reload();
}
return true;
}

Expand Down Expand Up @@ -184,6 +196,7 @@ public function authenticate()
return false;
}

/* was called by parent */
$this->setUserFromDb();

// Last login date
Expand Down
1 change: 1 addition & 0 deletions system/modules/core/config/autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@
'mod_html' => 'system/modules/core/templates/modules',
'mod_login_1cl' => 'system/modules/core/templates/modules',
'mod_login_2cl' => 'system/modules/core/templates/modules',
'mod_pwchange_1cl' => 'system/modules/core/templates/modules',
'mod_logout_1cl' => 'system/modules/core/templates/modules',
'mod_logout_2cl' => 'system/modules/core/templates/modules',
'mod_message' => 'system/modules/core/templates/modules',
Expand Down
23 changes: 20 additions & 3 deletions system/modules/core/dca/tl_member.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
// Subpalettes
'subpalettes' => array
(
'login' => 'username,password',
'login' => 'pwChange,username,password',
'assignDir' => 'homeDir'
),

Expand Down Expand Up @@ -305,7 +305,7 @@
'exclude' => true,
'filter' => true,
'inputType' => 'checkbox',
'eval' => array('submitOnChange'=>true),
'eval' => array('submitOnChange'=>true, 'tl_class'=>'w50 clr'),
'sql' => "char(1) NOT NULL default ''"
),
'username' => array
Expand All @@ -316,7 +316,7 @@
'sorting' => true,
'flag' => 1,
'inputType' => 'text',
'eval' => array('mandatory'=>true, 'unique'=>true, 'rgxp'=>'extnd', 'nospace'=>true, 'maxlength'=>64, 'feEditable'=>true, 'feViewable'=>true, 'feGroup'=>'login'),
'eval' => array('mandatory'=>true, 'unique'=>true, 'rgxp'=>'extnd', 'nospace'=>true, 'maxlength'=>64, 'feEditable'=>true, 'feViewable'=>true, 'feGroup'=>'login', 'tl_class'=>'w50 clr'),
'sql' => "varchar(64) COLLATE utf8_bin NOT NULL default ''"
),
'password' => array
Expand All @@ -331,6 +331,23 @@
),
'sql' => "varchar(128) NOT NULL default ''"
),
'pwChange' => array
(
'label' => &$GLOBALS['TL_LANG']['tl_member']['pwChange'],
'exclude' => true,
'inputType' => 'checkbox',
'filter' => true,
'sql' => "char(1) NOT NULL default ''",
'eval' => array('tl_class'=>'w50')
),
'oldPasswords' => array
(
'label' => &$GLOBALS['TL_LANG']['MSC']['oldpasswords'],
'exclude' => true,
'inputType' => 'none',
'eval' => array('preserveTags'=>true, 'beEditable' => false, 'feEditable'=>false, 'feGroup'=>'login'),
'sql' => "blob NULL"
),
'assignDir' => array
(
'label' => &$GLOBALS['TL_LANG']['tl_member']['assignDir'],
Expand Down
5 changes: 3 additions & 2 deletions system/modules/core/dca/tl_module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
'login' => '{title_legend},name,headline,type;{config_legend},autologin;{redirect_legend},jumpTo,redirectBack;{template_legend:hide},cols;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'logout' => '{title_legend},name,headline,type;{redirect_legend},jumpTo,redirectBack;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'personalData' => '{title_legend},name,headline,type;{config_legend},editable;{redirect_legend},jumpTo;{template_legend:hide},memberTpl,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'registration' => '{title_legend},name,headline,type;{config_legend},editable,newsletters,disableCaptcha;{account_legend},reg_groups,reg_allowLogin,reg_assignDir;{redirect_legend},jumpTo;{email_legend:hide},reg_activate;{template_legend:hide},memberTpl,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'registration' => '{title_legend},name,headline,type;{config_legend},editable,newsletters,disableCaptcha;{account_legend},reg_groups,reg_allowLogin,reg_pwChange,reg_assignDir;{redirect_legend},jumpTo;{email_legend:hide},reg_activate;{template_legend:hide},memberTpl,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'lostPassword' => '{title_legend},name,headline,type;{config_legend},reg_skipName,disableCaptcha;{redirect_legend},jumpTo;{email_legend:hide},reg_jumpTo,reg_password;{template_legend:hide},tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'closeAccount' => '{title_legend},name,headline,type;{config_legend},reg_close;{redirect_legend},jumpTo;{template_legend:hide},tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
'form' => '{title_legend},name,headline,type;{include_legend},form;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space',
Expand Down Expand Up @@ -632,7 +632,8 @@
'label' => &$GLOBALS['TL_LANG']['tl_module']['reg_allowLogin'],
'exclude' => true,
'inputType' => 'checkbox',
'sql' => "char(1) NOT NULL default ''"
'sql' => "char(1) NOT NULL default ''",
'eval' => array('tl_class'=>'w50 clr')
),
'reg_skipName' => array
(
Expand Down
3 changes: 3 additions & 0 deletions system/modules/core/languages/en/default.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,6 +1424,9 @@ This e-mail has been generated by Contao. You can not reply to it directly.
<trans-unit id="MSC.emptyField">
<source>Please enter your username and password!</source>
</trans-unit>
<trans-unit id="MSC.emptyPasswordField">
<source>Please enter a password!</source>
</trans-unit>
<trans-unit id="MSC.confirmation">
<source>Confirmation</source>
</trans-unit>
Expand Down
6 changes: 6 additions & 0 deletions system/modules/core/languages/en/tl_member.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@
<trans-unit id="tl_member.toggle.1">
<source>Activate/deactivate member ID %s</source>
</trans-unit>
<trans-unit id="tl_member.pwChange.0">
<source>Password change required</source>
</trans-unit>
<trans-unit id="tl_member.pwChange.1">
<source>Make the member change his password upon the next login.</source>
</trans-unit>
</body>
</file>
</xliff>
6 changes: 6 additions & 0 deletions system/modules/core/languages/en/tl_module.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,12 @@ Please click ##link## to set the new password. If you did not request this e-mai
<trans-unit id="tl_module.pasteafter.1">
<source>Paste after module ID %s</source>
</trans-unit>
<trans-unit id="tl_module.password_change_info">
<source>The administrator wants you to change your password.</source>
</trans-unit>
<trans-unit id="tl_module.old_password_forbidden">
<source>This password has already been used.</source>
</trans-unit>
</body>
</file>
</xliff>
23 changes: 22 additions & 1 deletion system/modules/core/library/Contao/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,27 @@ public function authenticate()
}


/**
*
* Checks "crypt" passwords only
*
* @param string $strCrypted The crypted password
* @param string $strPlain The plain password
*
* @return boolean true, if the passwords "match", else false
*
*/
public static function checkCryptPassword($strCrypted, $strPlain)
{
if (\Encryption::test($strCrypted))
{
return (crypt($strPlain, $strCrypted) == $strCrypted);
}

return false;
}


/**
* Try to login the current user
*
Expand Down Expand Up @@ -303,7 +324,7 @@ public function login()
// The password has been generated with crypt()
if (\Encryption::test($this->password))
{
$blnAuthenticated = (crypt(\Input::post('password', true), $this->password) == $this->password);
$blnAuthenticated = \User::checkCryptPassword($this->password, \Input::post('password', true));
}
else
{
Expand Down
Loading