DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index c673992..0b1fbd4 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -295,6 +295,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $default_admin = false;
         if (!empty($ff->Pman['local_autoauth']) && 
             ($ff->Pman['local_autoauth'] === true) &&
+            ($_SERVER['PATH_INFO'] != '') &&  // auto-auth is disabled for home page
             (!empty($_SERVER['SERVER_ADDR'])) &&
             (
                 (
@@ -306,6 +307,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                     $_SERVER['SERVER_ADDR'] == '::1' &&
                     $_SERVER['REMOTE_ADDR'] == '::1'
                 )
+                
             )
         ) {
             $group = DB_DataObject::factory('core_group');
@@ -520,10 +522,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 +540,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,12 +679,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');
-        
-        if(!empty($oath_require) && $oath_require->val == 0) {
-            $aur['require_oath'] = 0;
-        } 
-        
-        // $aur['require_oath'] =  !empty($oath_require) || $oath_require->val == 0 ? 0 : 1;
+        $aur['require_oath'] = $oath_require ?  $oath_require->val : 0;
         
         return $aur;
     }