X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=c03d9621124fc6b6c3012bd4f1f2e764682ac736;hb=b32faa5954b497d89318489fabfdbaacf9da86d8;hp=0e720ef2ed8a6c41e46d533dc9a34d138332483e;hpb=5e44de672b024c43709fdb3b54f00946737a0af2;p=Pman.Core

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 0e720ef2..c03d9621 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -50,6 +50,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+    
+    static $authUser = false;
+    
  
     function owner()
     {
@@ -232,6 +235,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             
             $sesPrefix = $this->sesPrefix();
        
+            self::$authUser = false;
             $_SESSION[get_class($this)][$sesPrefix .'-auth'] = "";
             
             return false;
@@ -252,22 +256,26 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
        
         $sesPrefix = $this->sesPrefix();
         
+        if (self::$authUser) {
+            return self::$authUser;
+        }
+        
+        
         if (!empty($_SESSION[get_class($this)][$sesPrefix .'-auth'])) {
             // in session...
             $a = unserialize($_SESSION[get_class($this)][$sesPrefix .'-auth']);
-             
             $u = DB_DataObject::factory($this->tableName());
+            $u->autoJoin();
             if ($a->id && $u->get($a->id)) { //&& strlen($u->passwd)) {
-              
-                return $u->verifyAuth();  // got authentication...
-                
-    
+                if ($u->verifyAuth()) {
+                    self::$authUser = $u;
+                    return true;
+                }
             }
-            
             unset($_SESSION[get_class($this)][$sesPrefix .'-auth']);
             unset($_SESSION[get_class($this)][$sesPrefix .'-timeout']);
             setcookie('Pman.timeout', -1, time() + (30*60), '/');
-            
+            return false;
         }
         
         // http basic auth..
@@ -281,7 +289,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             &&
             $u->checkPassword($_SERVER['PHP_AUTH_PW'])
            ) {
-            $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u);
+            // logged in via http auth
+            // http auth will not need session... 
+            //$_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u);
+            self::$authUser = $u;
             return true; 
         }
         //die("test init");
@@ -291,12 +302,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         
-        // local auth - 
-        $default_admin = false;
-        if (!empty($ff->Pman['local_autoauth']) && 
-            ($ff->Pman['local_autoauth'] === true) &&
-            (!empty($_SERVER['SERVER_ADDR'])) &&
-            (
+        $auto_auth_allow = false;
+        if (!empty($ff->Pman['local_autoauth']) && $ff->Pman['local_autoauth'] === true) {
+            $auto_auth_allow  = true;
+        }
+        if  (
+                (!empty($_SERVER['SERVER_ADDR'])) &&
                 (
                     $_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
                     $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
@@ -306,8 +317,19 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                     $_SERVER['SERVER_ADDR'] == '::1' &&
                     $_SERVER['REMOTE_ADDR'] == '::1'
                 )
-            )
-        ) {
+                
+            ){
+            $auto_auth_allow  = true;
+        }
+        
+        
+        if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') {
+            $auto_auth_allow  = false;
+        }
+        //var_dump($auto_auth_allow);
+        // local auth - 
+        $default_admin = false;
+        if ($auto_auth_allow) {
             $group = DB_DataObject::factory('core_group');
             $group->get('name', 'Administrators');
             
@@ -319,6 +341,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             ");
             if($member->find(true)){
                 $default_admin = DB_DataObject::factory($this->tableName());
+                $default_admin->autoJoin();
                 if(!$default_admin->get($member->user_id)){
                     $default_admin = false;
                 }
@@ -327,27 +350,18 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         //var_dump($ff->Pman['local_autoauth']);         var_dump($_SERVER); exit;
         $u = DB_DataObject::factory($this->tableName());
+        $u->autoJoin();
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['local_autoauth']) && 
-            (!empty($_SERVER['SERVER_ADDR'])) &&
-            (
-                (
-                    $_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
-                    $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
-                )
-                ||
-                (
-                    $_SERVER['SERVER_ADDR'] == '::1' &&
-                    $_SERVER['REMOTE_ADDR'] == '::1'
-                )
-            ) &&
+        if ($auto_auth_allow &&
             ($default_admin ||  $u->get('email', $ff->Pman['local_autoauth']))
         ) {
             
             $user = $default_admin ? $default_admin->toArray() : $u->toArray();
             
-            $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object) $user);
+            // if we request other URLS.. then we get auto logged in..
+            self::$authUser = $default_admin ? $default_admin : $u;;
+            //$_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object) $user);
             return true;
         }
         
@@ -370,10 +384,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             }
         }
         if (!$n){ // authenticated as there are no users in the system...
-            return true;
+             return true;
         }
-        
-        return false;
+         return false;
         
     }
     
@@ -395,23 +408,15 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         //var_dump(array(get_class($this),$sesPrefix .'-auth'));
        
-        if (!empty($_SESSION[get_class($this)][$sesPrefix .'-auth'])) {
-            $a = unserialize($_SESSION[get_class($this)][$sesPrefix .'-auth']);
-            
-            $u = DB_DataObject::factory($this->tableName()); // allow extending this ...
-            $u->autoJoin();
-            if ($u->get($a->id)) { /// && strlen($u->passwd)) {  // should work out the pid .. really..
-                
+        if (self::$authUser) {
+             
+            if (isset($_SESSION[get_class($this)][$sesPrefix .'-auth'])) {
                 $_SESSION[get_class($this)][$sesPrefix .'-auth-timeout'] = time() + (30*60); // eg. 30 minutes
                 setcookie('Pman.timeout', time() + (30*60), time() + (30*60), '/');
-                
-                $user = clone ($u);
-                return clone($user);
-            
             }
-            unset($_SESSION[get_class($this)][$sesPrefix .'-auth']);
-            unset($_SESSION[get_class($this)][$sesPrefix .'-timeout']);
-            setcookie('Pman.timeout', -1, time() + (30*60), '/');
+            // not really sure why it's cloned..
+            return   clone (self::$authUser);
+             
             
         }
         
@@ -491,6 +496,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         //var_dump(array(get_class($this),$sesPrefix .'-auth'));
         $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object)$d);
+        
+        $pp = DB_DAtaObject::Factory($this->tableName());
+        $pp->get($this->pid());
+        $pp->autoJoin();
+        
+        self::$authUser = $pp;
         // ensure it's written so that ajax calls can fetch it..
         
         
@@ -506,6 +517,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         $_SESSION[get_class($this)][$sesPrefix .'-auth'] = "";
         
+        self::$authUser = false;
+        
     }    
     function genPassKey ($t) 
     {
@@ -520,10 +533,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function checkTwoFactorAuthentication($val)
     {
-        // also used in login
         
-        return true;
         
+        // also used in login
         require_once 'System.php';
         
         if(
@@ -539,7 +551,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return false;
         }
         
-        $cmd = "{$oathtool} --totp --base32 {$this->oath_key}";
+        $cmd = "{$oathtool} --totp --base32 " . escapeshellarg($this->oath_key);
         
         $password = exec($cmd);
         
@@ -672,14 +684,13 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['passwd'] = '';
         $aur['dailykey'] = '';
         $aur['oath_key'] = '';
-        $aur['require_oath'] =  0;
+        
+        $aur['oath_key_enable'] = !empty($this->oath_key);
+        $aur['require_oath'] = 1;
         
         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
-        if(empty($oath_require) || $oath_require == 1) {
-            $aur['oath_key_enable'] = !empty($this->oath_key);
-        }
-        
+        $aur['require_oath'] = $oath_require ?  $oath_require->val : 0;
         
         return $aur;
     }
@@ -1410,7 +1421,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         return $sesPrefix;
     }
     
-    function loginPublic()
+    function loginPublic() // used where???
     {
         $this->isAuth(); // force session start..