return md5(implode(',' , array($month, $this->email , $this->passwd, $this->id)));
}
- function checkTwoFactorAuthentication($val, $oath_key)
+ function checkTwoFactorAuthentication($val)
{
// also used in login
if(
empty($this->id) ||
- empty($oath_key)
+ empty($this->oath_key)
) {
return false;
}
return false;
}
- $cmd = "{$oathtool} --totp --base32 {$oath_key}";
+ $cmd = "{$oathtool} --totp --base32 {$this->oath_key}";
$password = exec($cmd);
$hash = $this->generateOathKey();
- $_SESSION[__CLASS__] = isset($_SESSION[__CLASS__]) ? $_SESSION[__CLASS__] : array();
- $_SESSION[__CLASS__]['oath'] = isset($_SESSION[__CLASS__]['oath']) ? $_SESSION[__CLASS__]['oath'] : array();
+ $_SESSION[__CLASS__] =
+ isset($_SESSION[__CLASS__]) ?
+ $_SESSION[__CLASS__] : array();
+ $_SESSION[__CLASS__]['oath'] =
+ isset($_SESSION[__CLASS__]['oath']) ?
+ $_SESSION[__CLASS__]['oath'] : array();
+
$_SESSION[__CLASS__]['oath'][$person->id] = $hash;
$qrcode = $person->generateQRCode($hash);
}
if(!empty($q['two_factor_auth_code'])) {
-
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
+ $o = clone($person);
+ $person->oath_key = $_SESSION[__CLASS__]['oath'][$person->id];
- if($person->checkTwoFactorAuthentication(
- $q['two_factor_auth_code'],
- $_SESSION[__CLASS__]['oath'][$person->id]
- )) {
-
- $o = clone($person);
- $person->oath_key = $_SESSION[__CLASS__]['oath'][$person->id];
+ if($person->checkTwoFactorAuthentication($q['two_factor_auth_code'])) {
$person->update($o);
-
unset($_SESSION[__CLASS__]['oath'][$person->id]);
-
$roo->jok('DONE');
}