HOR-3926
This commit is contained in:
committed by
davidcallizaya
parent
b221d72311
commit
5327ecdfd5
@@ -24,6 +24,7 @@
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @access public
|
||||
*/
|
||||
@@ -44,57 +45,60 @@ use ProcessMaker\Plugins\PluginRegistry;
|
||||
class RbacUsers extends BaseRbacUsers
|
||||
{
|
||||
|
||||
private $userUidReserved = [RBAC::GUEST_USER_UID];
|
||||
|
||||
/**
|
||||
* Autentificacion de un usuario a traves de la clase RBAC_user
|
||||
* Authentication of a user through the class RBAC_user
|
||||
*
|
||||
* verifica que un usuario tiene derechos de iniciar una aplicacion
|
||||
* verifies that a user has permission to start an application
|
||||
*
|
||||
* @author Fernando Ontiveros Lira <fernando@colosa.com>
|
||||
* access public
|
||||
* @access public
|
||||
* Function verifyLogin
|
||||
*
|
||||
* @param string $strUser UserId (login) de usuario
|
||||
* @param string $strPass Password
|
||||
* @return
|
||||
* -1: no existe usuario
|
||||
* -2: password errado
|
||||
* -3: usuario inactivo
|
||||
* -4: usuario vencido
|
||||
* -6: role inactivo
|
||||
* n : uid de usuario
|
||||
* @param string $userName UserId (login) de usuario
|
||||
* @param string $password Password
|
||||
* @return type
|
||||
* -1: no user exists
|
||||
* -2: wrong password
|
||||
* -3: inactive user
|
||||
* -4: expired user
|
||||
* -6: role inactive
|
||||
* n : string user uid
|
||||
* @throws Exception
|
||||
*/
|
||||
public function verifyLogin($sUsername, $sPassword)
|
||||
public function verifyLogin($userName, $password)
|
||||
{
|
||||
//invalid user
|
||||
if ($sUsername == '') {
|
||||
if ($userName == '') {
|
||||
return -1;
|
||||
}
|
||||
//invalid password
|
||||
if ($sPassword == '') {
|
||||
if ($password == '') {
|
||||
return -2;
|
||||
}
|
||||
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$c = new Criteria('rbac');
|
||||
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
|
||||
$c->add(RbacUsersPeer::USR_USERNAME, $userName);
|
||||
/* @var $rs RbacUsers[] */
|
||||
$rs = RbacUsersPeer::doSelect($c, Propel::getDbConnection('rbac_ro'));
|
||||
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
|
||||
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
$dataFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
//verify password with md5, and md5 format
|
||||
if (mb_strtoupper($sUsername, 'utf-8') === mb_strtoupper($aFields['USR_USERNAME'], 'utf-8')) {
|
||||
if( Bootstrap::verifyHashPassword($sPassword, $rs[0]->getUsrPassword()) ) {
|
||||
if ($aFields['USR_DUE_DATE'] < date('Y-m-d')) {
|
||||
if (mb_strtoupper($userName, 'utf-8') === mb_strtoupper($dataFields['USR_USERNAME'], 'utf-8')) {
|
||||
if (Bootstrap::verifyHashPassword($password, $rs[0]->getUsrPassword())) {
|
||||
if ($dataFields['USR_DUE_DATE'] < date('Y-m-d')) {
|
||||
return -4;
|
||||
}
|
||||
if ($aFields['USR_STATUS'] != 1 && $aFields['USR_UID'] !== RBAC::GUEST_USER_UID) {
|
||||
if ($dataFields['USR_STATUS'] != 1 && $dataFields['USR_UID'] !== RBAC::GUEST_USER_UID) {
|
||||
return -3;
|
||||
}
|
||||
$role = $this->getUserRole($aFields['USR_UID']);
|
||||
$role = $this->getUserRole($dataFields['USR_UID']);
|
||||
if ($role['ROL_STATUS'] == 0) {
|
||||
return -6;
|
||||
}
|
||||
return $aFields['USR_UID'];
|
||||
|
||||
return $dataFields['USR_UID'];
|
||||
} else {
|
||||
return -2;
|
||||
}
|
||||
@@ -104,100 +108,134 @@ class RbacUsers extends BaseRbacUsers
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
} catch (Exception $oError) {
|
||||
throw($oError);
|
||||
} catch (Exception $error) {
|
||||
throw($error);
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
public function verifyUser($sUsername)
|
||||
/**
|
||||
* Verify if the userName exists
|
||||
* @param string $userName
|
||||
* @return integer
|
||||
* @throws Exception
|
||||
*/
|
||||
public function verifyUser($userName)
|
||||
{
|
||||
//invalid user
|
||||
if ($sUsername == '') {
|
||||
if ($userName == '') {
|
||||
return 0;
|
||||
}
|
||||
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$c = new Criteria('rbac');
|
||||
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
|
||||
$c->add(RbacUsersPeer::USR_USERNAME, $userName);
|
||||
$rs = RbacUsersPeer::doSelect($c, Propel::getDbConnection('rbac_ro'));
|
||||
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
|
||||
//return the row for futher check of which Autentificacion method belongs this user
|
||||
$this->fields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
;
|
||||
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} catch (Exception $oError) {
|
||||
throw($oError);
|
||||
} catch (Exception $error) {
|
||||
throw($error);
|
||||
}
|
||||
}
|
||||
|
||||
public function getByUsername($sUsername)
|
||||
/**
|
||||
* Get user info by userName
|
||||
* @param string $userName
|
||||
* @return array $dataFields if exist
|
||||
* false if does not exist
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getByUsername($userName)
|
||||
{
|
||||
//invalid user
|
||||
if ($sUsername == '') {
|
||||
if ($userName == '') {
|
||||
return 0;
|
||||
}
|
||||
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$c = new Criteria('rbac');
|
||||
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
|
||||
$c->add(RbacUsersPeer::USR_USERNAME, $userName);
|
||||
$rs = RbacUsersPeer::doSelect($c, Propel::getDbConnection('rbac_ro'));
|
||||
|
||||
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
|
||||
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
return $aFields;
|
||||
$dataFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
|
||||
return $dataFields;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
} catch (Exception $oError) {
|
||||
throw($oError);
|
||||
} catch (Exception $error) {
|
||||
throw($error);
|
||||
}
|
||||
}
|
||||
|
||||
public function verifyUserId($sUserId)
|
||||
/**
|
||||
* Verify user by Uid
|
||||
* @param string $userUid
|
||||
* @return integer
|
||||
* @throws Exception
|
||||
*/
|
||||
public function verifyUserId($userUid)
|
||||
{
|
||||
//invalid user
|
||||
if ($sUserId == '') {
|
||||
if ($userUid == '') {
|
||||
return 0;
|
||||
}
|
||||
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$c = new Criteria('rbac');
|
||||
$c->add(RbacUsersPeer::USR_UID, $sUserId);
|
||||
$c->add(RbacUsersPeer::USR_UID, $userUid);
|
||||
$rs = RbacUsersPeer::doSelect($c, Propel::getDbConnection('rbac_ro'));
|
||||
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} catch (Exception $oError) {
|
||||
throw($oError);
|
||||
} catch (Exception $error) {
|
||||
throw($error);
|
||||
}
|
||||
}
|
||||
|
||||
public function load($sUsrUid)
|
||||
/**
|
||||
* Load user information by Uid
|
||||
* @param string $userUid
|
||||
* @return array $dataFields
|
||||
* @throws Exception
|
||||
*/
|
||||
public function load($userUid)
|
||||
{
|
||||
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$c = new Criteria('rbac');
|
||||
$c->add(RbacUsersPeer::USR_UID, $sUsrUid);
|
||||
$c->add(RbacUsersPeer::USR_UID, $userUid);
|
||||
$resultSet = RbacUsersPeer::doSelectRS($c, Propel::getDbConnection('rbac_ro'));
|
||||
if ($resultSet->next()) {
|
||||
$this->hydrate($resultSet);
|
||||
$aFields = $this->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
return $aFields;
|
||||
$dataFields = $this->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
|
||||
return $dataFields;
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch (Exception $oError) {
|
||||
throw($oError);
|
||||
} catch (Exception $error) {
|
||||
throw($error);
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
|
||||
public function create($aData)
|
||||
/**
|
||||
* Create an user
|
||||
* @param string $infoData
|
||||
* @return array
|
||||
* @throws Exception
|
||||
*/
|
||||
public function create($infoData)
|
||||
{
|
||||
if (class_exists('ProcessMaker\Plugins\PluginRegistry')) {
|
||||
$pluginRegistry = PluginRegistry::loadSingleton();
|
||||
@@ -209,116 +247,134 @@ class RbacUsers extends BaseRbacUsers
|
||||
}
|
||||
}
|
||||
}
|
||||
$oConnection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
$connection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$oRBACUsers = new RbacUsers();
|
||||
$rbacUsers = new RbacUsers();
|
||||
do {
|
||||
$aData['USR_UID'] = G::generateUniqueID();
|
||||
} while ($oRBACUsers->load($aData['USR_UID']));
|
||||
$oRBACUsers->fromArray($aData, BasePeer::TYPE_FIELDNAME);
|
||||
//if ($oRBACUsers->validate()) {
|
||||
//$oConnection->begin();
|
||||
$iResult = $oRBACUsers->save();
|
||||
//$oConnection->commit();
|
||||
return $aData['USR_UID'];
|
||||
/* }
|
||||
else {
|
||||
$sMessage = '';
|
||||
$aValidationFailures = $oRBACUsers->getValidationFailures();
|
||||
foreach($aValidationFailures as $oValidationFailure) {
|
||||
$sMessage .= $oValidationFailure->getMessage() . '<br />';
|
||||
}
|
||||
throw(new Exception('The registry cannot be created!<br />' . $sMessage));
|
||||
} */
|
||||
} catch (Exception $oError) {
|
||||
$oConnection->rollback();
|
||||
throw($oError);
|
||||
$infoData['USR_UID'] = G::generateUniqueID();
|
||||
} while ($rbacUsers->load($infoData['USR_UID']));
|
||||
$rbacUsers->fromArray($infoData, BasePeer::TYPE_FIELDNAME);
|
||||
$result = $rbacUsers->save();
|
||||
|
||||
return $infoData['USR_UID'];
|
||||
} catch (Exception $error) {
|
||||
$connection->rollback();
|
||||
throw($error);
|
||||
}
|
||||
}
|
||||
|
||||
public function update($aData)
|
||||
/**
|
||||
* Update an user
|
||||
* @param string $infoData
|
||||
* @return boolean
|
||||
* @throws Exception
|
||||
*/
|
||||
public function update($infoData)
|
||||
{
|
||||
if (in_array($infoData['USR_UID'], $this->userUidReserved)) {
|
||||
throw new Exception(G::LoadTranslation("ID_USER_CAN_NOT_UPDATE", array($infoData['USR_UID'])));
|
||||
return false;
|
||||
}
|
||||
$oConnection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
|
||||
try {
|
||||
$this->fromArray($aData, BasePeer::TYPE_FIELDNAME);
|
||||
$this->fromArray($infoData, BasePeer::TYPE_FIELDNAME);
|
||||
$this->setNew(false);
|
||||
$iResult = $this->save();
|
||||
} catch (Exception $oError) {
|
||||
$result = $this->save();
|
||||
} catch (Exception $error) {
|
||||
$oConnection->rollback();
|
||||
throw($oError);
|
||||
throw($error);
|
||||
}
|
||||
}
|
||||
|
||||
public function remove($sUserUID = '')
|
||||
/**
|
||||
* Remove an user
|
||||
* @param string $userUid
|
||||
* @return void
|
||||
*/
|
||||
public function remove($userUid = '')
|
||||
{
|
||||
$this->setUsrUid($sUserUID);
|
||||
$this->setUsrUid($userUid);
|
||||
$this->delete();
|
||||
}
|
||||
|
||||
//Added by Qennix at Feb 14th, 2011
|
||||
//Gets an associative array with total users by authentication sources
|
||||
/**
|
||||
* Gets an associative array with total users by authentication sources
|
||||
* @return array $listAuth
|
||||
*/
|
||||
public function getAllUsersByAuthSource()
|
||||
{
|
||||
$oCriteria = new Criteria('rbac');
|
||||
$oCriteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE);
|
||||
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
|
||||
$oCriteria->add(RbacUsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
|
||||
$oCriteria->addGroupByColumn(RbacUsersPeer::UID_AUTH_SOURCE);
|
||||
$oDataset = RbacUsersPeer::doSelectRS($oCriteria, Propel::getDbConnection('rbac_ro'));
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$criteria = new Criteria('rbac');
|
||||
$criteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE);
|
||||
$criteria->addSelectColumn('COUNT(*) AS CNT');
|
||||
$criteria->add(RbacUsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
|
||||
$criteria->addGroupByColumn(RbacUsersPeer::UID_AUTH_SOURCE);
|
||||
$dataset = RbacUsersPeer::doSelectRS($criteria, Propel::getDbConnection('rbac_ro'));
|
||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
$aAuth = Array();
|
||||
while ($oDataset->next()) {
|
||||
$row = $oDataset->getRow();
|
||||
$aAuth[$row['UID_AUTH_SOURCE']] = $row['CNT'];
|
||||
$listAuth = [];
|
||||
while ($dataset->next()) {
|
||||
$row = $dataset->getRow();
|
||||
$listAuth[$row['UID_AUTH_SOURCE']] = $row['CNT'];
|
||||
}
|
||||
return $aAuth;
|
||||
|
||||
return $listAuth;
|
||||
}
|
||||
|
||||
//Returns all users with auth_source
|
||||
public function getListUsersByAuthSource($auth_source)
|
||||
/**
|
||||
* Get users list related to an authentication source
|
||||
* @param string $authSource
|
||||
* @return array $listUsers, all users with auth_source
|
||||
*/
|
||||
public function getListUsersByAuthSource($authSource)
|
||||
{
|
||||
$oCriteria = new Criteria('rbac');
|
||||
$oCriteria->addSelectColumn(RbacUsersPeer::USR_UID);
|
||||
$criteria = new Criteria('rbac');
|
||||
$criteria->addSelectColumn(RbacUsersPeer::USR_UID);
|
||||
|
||||
if ($auth_source == '00000000000000000000000000000000') {
|
||||
$oCriteria->add(
|
||||
$oCriteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE, $auth_source, Criteria::EQUAL)->addOr(
|
||||
$oCriteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE, '', Criteria::EQUAL)
|
||||
));
|
||||
if ($authSource == '00000000000000000000000000000000') {
|
||||
$criteria->add(
|
||||
$criteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE, $authSource, Criteria::EQUAL)->addOr(
|
||||
$criteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE, '', Criteria::EQUAL)
|
||||
));
|
||||
} else {
|
||||
$oCriteria->add(RbacUsersPeer::UID_AUTH_SOURCE, $auth_source, Criteria::EQUAL);
|
||||
$criteria->add(RbacUsersPeer::UID_AUTH_SOURCE, $authSource, Criteria::EQUAL);
|
||||
}
|
||||
$oCriteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL);
|
||||
$oDataset = RbacUsersPeer::doSelectRS($oCriteria, Propel::getDbConnection('rbac_ro'));
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$aUsers = array();
|
||||
while ($oDataset->next()) {
|
||||
$row = $oDataset->getRow();
|
||||
$aUsers[] = $row['USR_UID'];
|
||||
$criteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL);
|
||||
$dataset = RbacUsersPeer::doSelectRS($criteria, Propel::getDbConnection('rbac_ro'));
|
||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$listUsers = [];
|
||||
while ($dataset->next()) {
|
||||
$row = $dataset->getRow();
|
||||
$listUsers[] = $row['USR_UID'];
|
||||
}
|
||||
return $aUsers;
|
||||
|
||||
return $listUsers;
|
||||
}
|
||||
|
||||
public function getUserRole($UsrUid)
|
||||
/**
|
||||
* Get the user's role
|
||||
* @param string $userUid
|
||||
* @return array $row
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getUserRole($userUid)
|
||||
{
|
||||
$con = Propel::getConnection(UsersRolesPeer::DATABASE_NAME);
|
||||
try {
|
||||
$c = new Criteria( 'rbac' );
|
||||
$c = new Criteria('rbac');
|
||||
$c->clearSelectColumns();
|
||||
$c->addSelectColumn ( RolesPeer::ROL_UID );
|
||||
$c->addSelectColumn ( RolesPeer::ROL_CODE );
|
||||
$c->addSelectColumn ( RolesPeer::ROL_STATUS );
|
||||
$c->addJoin ( UsersRolesPeer::ROL_UID, RolesPeer::ROL_UID );
|
||||
$c->add ( UsersRolesPeer::USR_UID, $UsrUid );
|
||||
$rs = UsersRolesPeer::doSelectRs( $c , Propel::getDbConnection('rbac_ro'));
|
||||
$rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
|
||||
$c->addSelectColumn(RolesPeer::ROL_UID);
|
||||
$c->addSelectColumn(RolesPeer::ROL_CODE);
|
||||
$c->addSelectColumn(RolesPeer::ROL_STATUS);
|
||||
$c->addJoin(UsersRolesPeer::ROL_UID, RolesPeer::ROL_UID);
|
||||
$c->add(UsersRolesPeer::USR_UID, $userUid);
|
||||
$rs = UsersRolesPeer::doSelectRs($c, Propel::getDbConnection('rbac_ro'));
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$rs->next();
|
||||
$row = $rs->getRow();
|
||||
|
||||
return $row;
|
||||
}
|
||||
catch (Exception $oError) {
|
||||
throw($oError);
|
||||
} catch (Exception $error) {
|
||||
throw($error);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -342,6 +398,7 @@ class RbacUsers extends BaseRbacUsers
|
||||
);
|
||||
$array = parent::toArray($keyType);
|
||||
unset($array[$key]);
|
||||
|
||||
return $array;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user