DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index f2f2982..3c2e4e6 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -295,6 +295,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $default_admin = false;
         if (!empty($ff->Pman['local_autoauth']) && 
             ($ff->Pman['local_autoauth'] === true) &&
+            (
+                empty($_SERVER['PATH_INFO']) || // auto-auth is disabled for home page
+                $_SERVER['PATH_INFO'] != '/Login'
+            ) &&  // auto-auth is disabled for home page
             (!empty($_SERVER['SERVER_ADDR'])) &&
             (
                 (
@@ -306,9 +310,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                     $_SERVER['SERVER_ADDR'] == '::1' &&
                     $_SERVER['REMOTE_ADDR'] == '::1'
                 )
+                
             )
         ) {
-            $group = DB_DataObject::factory('core_group');
+             $group = DB_DataObject::factory('core_group');
             $group->get('name', 'Administrators');
             
             $member = DB_DataObject::factory('core_group_member');
@@ -329,7 +334,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $u = DB_DataObject::factory($this->tableName());
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['local_autoauth']) && 
+        if (!empty($ff->Pman['local_autoauth']) &&
+            ($ff->Pman['local_autoauth'] === true) &&
             (!empty($_SERVER['SERVER_ADDR'])) &&
             (
                 (
@@ -520,10 +526,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 +544,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);
         
@@ -678,8 +683,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
-        
-        // $aur['require_oath'] =  !empty($oath_require) || $oath_require->val == 0 ? 0 : 1;
+        $aur['require_oath'] = $oath_require ?  $oath_require->val : 0;
         
         return $aur;
     }