projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_person.php
[Pman.Core]
/
DataObjects
/
Core_person.php
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
e574c59
..
629edd6
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);
// h embeds images here..
$body = $mime->get();
$headers = $mime->headers($headers);
-
}
}
-
-
return array(
'recipients' => $recipents,
'headers' => $headers,
'body' => $body
);
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)
{
*/
function sendTemplate($templateFile, $args)
{
-
$ar = $this->buildMail($templateFile, $args);
$ar = $this->buildMail($templateFile, $args);
-
//print_r($recipents);exit;
$mailOptions = PEAR::getStaticProperty('Mail','options');
$mail = Mail::factory("SMTP",$mailOptions);
//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;
error_reporting($oe);
return $ret;
-
}
}
@@
-299,12
+291,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'
(
$_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
$_SERVER['REMOTE_ADDR'] == '127.0.0.1'
@@
-314,8
+306,19
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$_SERVER['SERVER_ADDR'] == '::1' &&
$_SERVER['REMOTE_ADDR'] == '::1'
)
$_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;
+ }
+
+ // local auth -
+ $default_admin = false;
+ if ($auto_auth_allow) {
$group = DB_DataObject::factory('core_group');
$group->get('name', 'Administrators');
$group = DB_DataObject::factory('core_group');
$group->get('name', 'Administrators');
@@
-337,7
+340,8
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$u = DB_DataObject::factory($this->tableName());
$ff = HTML_FlexyFramework::get();
$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'])) &&
(
(
(!empty($_SERVER['SERVER_ADDR'])) &&
(
(
@@
-526,11
+530,17
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
return md5(implode(',' , array($month, $this->email , $this->passwd, $this->id)));
}
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';
require_once 'System.php';
- if(empty($this->id)) {
+ if(
+ empty($this->id) ||
+ empty($this->oath_key)
+ ) {
return false;
}
return false;
}
@@
-540,13
+550,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
return false;
}
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 " . escapeshellarg($this->oath_key);
$password = exec($cmd);
$password = exec($cmd);
@@
-681,9
+685,11
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$aur['oath_key'] = '';
$aur['oath_key_enable'] = !empty($this->oath_key);
$aur['oath_key'] = '';
$aur['oath_key_enable'] = !empty($this->oath_key);
+ $aur['require_oath'] = 1;
$s = DB_DataObject::Factory('core_setting');
$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['require_oath'] = $oath_require ? $oath_require->val : 0;
return $aur;
}
return $aur;
}
@@
-775,15
+781,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
function applyFilters($q, $au, $roo)
{
//DB_DataObject::DebugLevel(1);
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'])){
if(!empty($q['_to_qr_code'])){
-
$person = DB_DataObject::factory('Core_person');
$person->id = $q['id'];
$person = DB_DataObject::factory('Core_person');
$person->id = $q['id'];
@@
-791,8
+789,15
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$roo->jerr('_invalid_person');
}
$roo->jerr('_invalid_person');
}
- $hash = $this->ge
t
OathKey();
+ $hash = $this->ge
nerate
OathKey();
+ $_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);
$_SESSION[__CLASS__]['oath'][$person->id] = $hash;
$qrcode = $person->generateQRCode($hash);
@@
-805,21
+810,14
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
if(!empty($q['two_factor_auth_code'])) {
}
if(!empty($q['two_factor_auth_code'])) {
-
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
$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);
$person->update($o);
-
unset($_SESSION[__CLASS__]['oath'][$person->id]);
unset($_SESSION[__CLASS__]['oath'][$person->id]);
-
$roo->jok('DONE');
}
$roo->jok('DONE');
}
@@
-827,7
+825,6
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
if(!empty($q['oath_key_disable'])) {
}
if(!empty($q['oath_key_disable'])) {
-
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
@@
-1128,7
+1125,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$this->setFrom($ar);
if(!empty($ar['_enable_oath_key'])){
$this->setFrom($ar);
if(!empty($ar['_enable_oath_key'])){
- $oath_key = $this->ge
t
OathKey();
+ $oath_key = $this->ge
nerate
OathKey();
}
if (!empty($ar['passwd1'])) {
}
if (!empty($ar['passwd1'])) {
@@
-1450,7
+1447,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$this->email = trim($this->email);
}
$this->email = trim($this->email);
}
- function ge
t
OathKey()
+ function ge
nerate
OathKey()
{
require 'Base32.php';
{
require 'Base32.php';