'; + //echo $GLOBALS['egw_info']['user']['account_lastpwd_change'].'
'; + //echo ($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400).'
'; + //echo egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400).'
'; + if (!($app == 'preferences' && $class == 'uipassword' && $method=='change') && + (($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && + ($GLOBALS['egw_info']['user']['apps']['preferences'] || $GLOBALS['egw_info']['user']['apps']['password']) && + egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400)>$GLOBALS['egw_info']['user']['account_lastpwd_change'] + ) || $GLOBALS['egw_info']['user']['account_lastpwd_change']==0) + ) + { + error_log(__METHOD__.' Password of '.$GLOBALS['egw_info']['user']['account_lid'].' ('.$GLOBALS['egw_info']['user']['account_fullname'].') is of old age.'.array2string(array( + 'ts'=>$GLOBALS['egw_info']['user']['account_lastpwd_change'], + 'date'=>egw_time::to($GLOBALS['egw_info']['user']['account_lastpwd_change'])))); + if ($GLOBALS['egw_info']['user']['account_lastpwd_change']==0) + { + $message = lang('an admin required that you must change your password upon login.'); + } + else + { + $message = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']); + } + if ($GLOBALS['egw_info']['user']['apps']['password']) egw::redirect_link('/preferences/password.php',array('message'=>$message)); + egw::redirect_link('/index.php',array('menuaction'=>'preferences.uipassword.change','message'=>$message)); + } + return true; + } + /** * password authentication against password stored in sql datababse * @@ -365,29 +405,58 @@ class auth * @author cornelius weiss
'; + $message[] = lang('Password must have at least %1 characters',$noc). '
'; + } + else + { + $strength++; } if(!preg_match('/(.*\d.*){'. ($non=1). ',}/',$passwd)) { - $message .= lang('Password must contain at least %1 numbers',$non). '
'; + $message[] = lang('Password must contain at least %1 numbers',$non). '
'; + } + else + { + $strength++; } if(!preg_match('/(.*[[:upper:]].*){'. ($nou=1). ',}/',$passwd)) { - $message .= lang('Password must contain at least %1 uppercase letters',$nou). '
'; + $message[] = lang('Password must contain at least %1 uppercase letters',$nou). '
'; + } + else + { + $strength++; } if(!preg_match('/(.*[[:lower:]].*){'. ($nol=1). ',}/',$passwd)) { - $message .= lang('Password must contain at least %1 lowercase letters',$nol). '
'; + $message[] = lang('Password must contain at least %1 lowercase letters',$nol). '
'; + } + else + { + $strength++; } if(!preg_match('/(.*[\\!"#$%&\'()*+,-.\/:;<=>?@\[\]\^_ {|}~`].*){'. ($nol=1). ',}/',$passwd)) { - $message .= lang('Password must contain at least %1 special characters',$nol). '
'; + $message[] = lang('Password must contain at least %1 special characters',$nol). '
'; } - return $message ? $message : false; + else + { + $strength++; + } + if (count($message)>0 && $reqstrength>$strength) + { + $outmessage = lang('Your Password does not meet the required strength.
You must meet %1 criteria. You met only %2 criteria.
Your Password failed the following criteria:',$reqstrength,$strength); + $outmessage .= '
'.implode(' ',$message); + } + else + { + $outmessage =false; + } + return $outmessage ? $outmessage : false; } /** diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 9db9daf307..c08aa05848 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -362,15 +362,15 @@ abstract class egw_framework $var['quick_add'] = $this->_get_quick_add(); $var['user_info'] = $this->_user_time_info(); - - if($GLOBALS['egw_info']['user']['lastpasswd_change'] == 0) + + if($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0) { $api_messages = lang('You are required to change your password during your first login').'
'. lang('Click this image on the navbar: %1','
.')
');
}
- elseif($GLOBALS['egw_info']['user']['lastpasswd_change'] < time() - (86400*30))
+ elseif($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400*$GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
{
- $api_messages = lang('it has been more then %1 days since you changed your password',30);
+ $api_messages = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
}
// This is gonna change
diff --git a/preferences/inc/class.uipassword.inc.php b/preferences/inc/class.uipassword.inc.php
index 054f50c16e..6158caaef6 100644
--- a/preferences/inc/class.uipassword.inc.php
+++ b/preferences/inc/class.uipassword.inc.php
@@ -23,6 +23,7 @@ class uipassword
function change()
{
+ //_debug_array($GLOBALS['egw_info']['user']);
$n_passwd = $_POST['n_passwd'];
$n_passwd_2 = $_POST['n_passwd_2'];
$o_passwd_2 = $_POST['o_passwd_2'];
@@ -72,11 +73,23 @@ class uipassword
$errors[] = lang('The two passwords are not the same');
}
+ if($o_passwd == $n_passwd)
+ {
+ $errors[] = lang('Old password and new password are the same. This is invalid. You must enter a new password');
+ }
+
if(!$n_passwd)
{
$errors[] = lang('You must enter a password');
}
- if($GLOBALS['egw_info']['server']['check_save_passwd'] && $error_msg = $GLOBALS['egw']->auth->crackcheck($n_passwd))
+ $strength = ($GLOBALS['egw_info']['server']['force_pwd_strength']?$GLOBALS['egw_info']['server']['force_pwd_strength']:false);
+ //error_log(__METHOD__.__LINE__.' Strength:'.$strength);
+
+ if ($strength && $strength>5) $strength =5;
+ if ($strength && $strength<0) $strength = false;
+ if($GLOBALS['egw_info']['server']['check_save_passwd'] && $strength==false) $strength=5;//old behavior
+ //error_log(__METHOD__.__LINE__.' Strength:'.$strength);
+ if(($GLOBALS['egw_info']['server']['check_save_passwd'] || $strength) && $error_msg = $GLOBALS['egw']->auth->crackcheck($n_passwd,$strength))
{
$errors[] = $error_msg;
}
@@ -104,7 +117,10 @@ class uipassword
{
$GLOBALS['egw']->session->appsession('password','phpgwapi',base64_encode($n_passwd));
$GLOBALS['egw_info']['user']['passwd'] = $n_passwd;
+ $GLOBALS['egw_info']['user']['account_lastpwd_change'] = egw_time::to('now','ts');
+ accounts::cache_invalidate($GLOBALS['egw_info']['user']['account_id']);
egw::invalidate_session_cache();
+ //_debug_array( $GLOBALS['egw_info']['user']);
$GLOBALS['hook_values']['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
$GLOBALS['hook_values']['old_passwd'] = $o_passwd;
$GLOBALS['hook_values']['new_passwd'] = $n_passwd;
diff --git a/preferences/index.php b/preferences/index.php
index 266f314c86..aaaa443281 100755
--- a/preferences/index.php
+++ b/preferences/index.php
@@ -11,12 +11,16 @@
$GLOBALS['egw_info'] = array(
'flags' => array(
+ 'noheader' => true,
+ 'novavbar' => true,
'currentapp' => 'preferences',
'disable_Template_class' => True,
),
);
include('../header.inc.php');
-
+auth::check_password_age('preferences','index');
+$GLOBALS['egw_info']['flags']['nonavbar']=false;
+common::egw_header();
$pref_tpl =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
$templates = Array(
'pref' => 'index.tpl'