DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index e574c59..f2cb1fd 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -172,18 +172,13 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             // h embeds images here..
             $body = $mime->get();
             $headers = $mime->headers($headers);
-            
         }
         
-         
-        
         return array(
             'recipients' => $recipents,
             'headers'    => $headers,
             'body'      => $body
         );
-        
-        
     }
     
     
@@ -195,10 +190,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
      */
     function sendTemplate($templateFile, $args)
     {
-        
         $ar = $this->buildMail($templateFile, $args);
       
-        
         //print_r($recipents);exit;
         $mailOptions = PEAR::getStaticProperty('Mail','options');
         $mail = Mail::factory("SMTP",$mailOptions);
@@ -211,7 +204,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         error_reporting($oe);
        
         return $ret;
-    
     }
     
   
@@ -526,11 +518,16 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         return md5(implode(',' ,  array($month, $this->email , $this->passwd, $this->id)));
     } 
     
-    function checkTwoFactorAuthentication($val, $oath_key)
+    function checkTwoFactorAuthentication($val)
     {
+        // also used in login
+        
         require_once 'System.php';
         
-        if(empty($this->id)) {
+        if(
+            empty($this->id) ||
+            empty($this->oath_key)
+        ) {
             return false;
         }
         
@@ -540,13 +537,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return false;
         }
         
-        $oath_key = $_SESSION[__CLASS__]['oath'][$this->id];
-        
-        if(empty($oath_key)) {
-            return false;
-        }
-        
-        $cmd = "{$oathtool} --totp --base32 {$oath_key}";
+        $cmd = "{$oathtool} --totp --base32 {$this->oath_key}";
         
         $password = exec($cmd);
         
@@ -683,7 +674,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['oath_key_enable'] = !empty($this->oath_key);
         
         $s = DB_DataObject::Factory('core_setting');
-        $aur['disable_oath'] = empty($s->lookup('core', 'two_factor_authentication')) ? 0 : 1;
+        $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
+        
+        $aur['disable_oath'] = (bool)  ? 1 : 0;
         
         return $aur;
     }
@@ -775,15 +768,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     function applyFilters($q, $au, $roo)
     {
         //DB_DataObject::DebugLevel(1);
-        if(!empty($q['_generate_oath_key'])){
-            $o = clone($this);
-            $this->oath_key = $this->getOathKey();
-            $this->update($o);
-            $roo->jok('OK');
-        }
-        
         if(!empty($q['_to_qr_code'])){
-            
             $person = DB_DataObject::factory('Core_person');
             $person->id = $q['id']; 
             
@@ -791,8 +776,15 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 $roo->jerr('_invalid_person');
             }
             
-            $hash = $this->getOathKey();
+            $hash = $this->generateOathKey();
             
+            $_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);
@@ -805,21 +797,14 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         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');
             }
             
@@ -827,7 +812,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         if(!empty($q['oath_key_disable'])) {
-            
             $person = DB_DataObject::factory('core_person');
             $person->get($q['id']);
             
@@ -1128,7 +1112,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $this->setFrom($ar);
         
         if(!empty($ar['_enable_oath_key'])){
-            $oath_key = $this->getOathKey();
+            $oath_key = $this->generateOathKey();
         }
         
         if (!empty($ar['passwd1'])) {
@@ -1450,7 +1434,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $this->email = trim($this->email);
     }
     
-    function getOathKey()
+    function generateOathKey()
     {
         require 'Base32.php';