X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=0c17a7de131bef86ce0b67a908a533b55784f939;hb=89b7f2b7d9572a08b32450cb1604478ce066a064;hp=df2eaf8d2814f78c926b48f65d9183c2c6b194fb;hpb=a3aee94f26d113c118d2fc75eea8a75fa99d8098;p=Pman.Core diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index df2eaf8d..0c17a7de 100644 --- a/DataObjects/Core_person.php +++ b/DataObjects/Core_person.php @@ -56,7 +56,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject function owner() { - $p = DB_DataObject::Factory($this->tableName()); + // this might be a Person in some old code? + $p = DB_DataObject::Factory('core_person'); $p->get($this->owner_id); return $p; } @@ -250,7 +251,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject // ---------------- authentication / passwords and keys stuff ---------------- function isAuth() { - @session_start(); + // do not start a session if we are using http auth... + if (empty($_SERVER['PHP_AUTH_USER'])) { + @session_start(); + } $ff= HTML_FlexyFramework::get(); @@ -290,8 +294,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $u->checkPassword($_SERVER['PHP_AUTH_PW']) ) { // logged in via http auth - - $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u); + // http auth will not need session... + //$_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u); self::$authUser = $u; return true; } @@ -306,16 +310,20 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject if (!empty($ff->Pman['local_autoauth']) && $ff->Pman['local_autoauth'] === true) { $auto_auth_allow = true; } - if ( - (!empty($_SERVER['SERVER_ADDR'])) && + if ( !empty($ff->Pman['local_autoauth']) + && + !empty($_SERVER['SERVER_ADDR']) && + !empty($_SERVER['REMOTE_ADDR']) && ( - $_SERVER['SERVER_ADDR'] == '127.0.0.1' && - $_SERVER['REMOTE_ADDR'] == '127.0.0.1' - ) - || - ( - $_SERVER['SERVER_ADDR'] == '::1' && - $_SERVER['REMOTE_ADDR'] == '::1' + ( + $_SERVER['SERVER_ADDR'] == '127.0.0.1' && + $_SERVER['REMOTE_ADDR'] == '127.0.0.1' + ) + || + ( + $_SERVER['SERVER_ADDR'] == '::1' && + $_SERVER['REMOTE_ADDR'] == '::1' + ) ) ){ @@ -323,7 +331,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject } - if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') { + if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') { $auto_auth_allow = false; } //var_dump($auto_auth_allow); @@ -341,6 +349,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; } @@ -349,16 +358,17 @@ 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 ($auto_auth_allow && + if ($auto_auth_allow && ($default_admin || $u->get('email', $ff->Pman['local_autoauth'])) ) { $user = $default_admin ? $default_admin->toArray() : $u->toArray(); // if we request other URLS.. then we get auto logged in.. - self::$authUser = $u; + self::$authUser = $default_admin ? $default_admin : $u;; //$_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object) $user); return true; } @@ -412,7 +422,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $_SESSION[get_class($this)][$sesPrefix .'-auth-timeout'] = time() + (30*60); // eg. 30 minutes setcookie('Pman.timeout', time() + (30*60), time() + (30*60), '/'); } - + // not really sure why it's cloned.. return clone (self::$authUser); @@ -595,6 +605,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject function company() { + if (empty($this->company_id)) { + return false; + } $x = DB_DataObject::factory('core_company'); $x->autoJoin(); $x->get($this->company_id); @@ -620,7 +633,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject if (!func_num_args()) { return $this->lang; } - $val = array_shift(func_get_args()); + $ar = func_get_args(); + $val = array_shift($ar); if ($val == $this->lang) { return; } @@ -633,14 +647,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject function authUserArray() { - $aur = $this->toArray(); if ($this->id < 1) { return $aur; } - //DB_DataObject::debugLevel(1); $c = DB_Dataobject::factory('core_company'); $im = DB_Dataobject::factory('Images'); @@ -687,9 +699,18 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $aur['require_oath'] = 1; $s = DB_DataObject::Factory('core_setting'); - $oath_require = $s->lookup('core', 'two_factor_authentication_requirement'); + $oath_require = $s->lookup('core', 'two_factor_auth_required'); $aur['require_oath'] = $oath_require ? $oath_require->val : 0; + $aur['core_person_settings'] = array(); + + $core_person_settings = DB_DataObject::factory('core_person_settings'); + $core_person_settings->setFrom(array( + 'person_id' => $this->id + )); + + $aur['core_person_settings'] = $core_person_settings->fetchAll('scope', 'data'); + return $aur; } @@ -805,7 +826,11 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $roo->jerr('Fail to generate QR Code'); } - $roo->jok($qrcode); + $roo->jdata(array( + 'secret' => $hash, + 'image' => $qrcode, + 'issuer' => $person->qrCodeIssuer() + )); } if(!empty($q['two_factor_auth_code'])) { @@ -1115,13 +1140,33 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject LENGTH({$this->tableName()}.oath_key) AS length_oath_key "); } - + if (isset($q['_with_group_membership'])) { + $this->selectAddGroupMemberships(); + } } + function selectAddGroupMemberships() + { + $this->selectAdd(" + + COALESCE(( + SELECT + GROUP_CONCAT( core_group.name separator '\n') + FROM + core_group_member + LEFT JOIN + core_group + ON + core_group.id = core_group_member.group_id + WHERE + core_group_member.user_id = core_person.id + ), '') as member_of"); + } + function setFromRoo($ar, $roo) { - $this->setFrom($ar); + $this->setFrom($ar); if(!empty($ar['_enable_oath_key'])){ $oath_key = $this->generateOathKey(); @@ -1142,7 +1187,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject } // this only applies to our owner company.. $c = $this->company(); - if (empty($c->comptype_name) || $c->comptype_name != 'OWNER') { + if (empty($c) || empty($c->comptype_name) || $c->comptype_name != 'OWNER') { return true; } @@ -1464,8 +1509,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject return false; } - $issuer = (empty($this->name)) ? - rawurlencode('ROOJS') : rawurlencode($this->name); + $issuer = rawurlencode($this->qrCodeIssuer()); $uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$hash}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30"; @@ -1485,4 +1529,32 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject return "data:image/png;base64,{$base64}"; } + function qrCodeIssuer() + { + $pg= HTML_FlexyFramework::get()->page; + + $issuer = (empty($pg->company->name)) ? 'ROOJS' : "{$pg->company->name}"; + + return $issuer; + } + + static function test_ADMIN_PASSWORD_RESET($pg, $to) + { + $ff = HTML_FlexyFramework::get(); + $person = DB_DataObject::Factory('core_person'); + $person->id = -1; + + return array( + 'HTTP_HOST' => $_SERVER['SERVER_NAME'], + 'person' => $person, + 'authFrom' => 'FAKE_LINK', + 'authKey' => 'FAKE_KEY', + + 'rcpts' => $to->email, + ); + + return $content; + } + + }