$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
(!empty($_SERVER['SERVER_ADDR'])) &&
(
(
$_SERVER['SERVER_ADDR'] == '::1' &&
$_SERVER['REMOTE_ADDR'] == '::1'
)
+
)
) {
+ var_dump($_SERVER['PATH_INFO']);exit;
$group = DB_DataObject::factory('core_group');
$group->get('name', 'Administrators');
$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'])) &&
(
(
function checkTwoFactorAuthentication($val)
{
- // also used in login
- return true;
+ // also used in login
require_once 'System.php';
if(
return false;
}
- $cmd = "{$oathtool} --totp --base32 {$this->oath_key}";
+ $cmd = "{$oathtool} --totp --base32 " . escapeshellarg($this->oath_key);
$password = exec($cmd);
$aur['oath_key'] = '';
$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');
-
- $aur['require_oath'] = !empty($oath_require) || $oath_require->val == 0 ? 0 : 1;
+ $aur['require_oath'] = $oath_require ? $oath_require->val : 0;
return $aur;
}