lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-18 20:52:10 +02:00
commit 93d15c53d0
2 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
htdocs/user/class/user.class.php
View File

@ -675,14 +675,13 @@ class User extends CommonObject
public function hasRight($module, $permlevel1, $permlevel2 = '') public function hasRight($module, $permlevel1, $permlevel2 = '')
{ {
global $conf; global $conf;
// For compatibility with bad naming permissions on module // For compatibility with bad naming permissions on module
$moduletomoduletouse = array( $moduletomoduletouse = array(
'contract' => 'contrat', 'contract' => 'contrat',
'member' => 'adherent', // We must check $user->rights->adherent... 'member' => 'adherent', // We must check $user->rights->adherent...
'mo' => 'mrp', 'mo' => 'mrp',
'order' => 'commande', 'order' => 'commande',
'product' => 'produit', // We must check $user->rights->produit... //'product' => 'produit', // We must check $user->rights->produit...
'project' => 'projet', 'project' => 'projet',
'shipping' => 'expedition', 'shipping' => 'expedition',
'task' => 'task@projet', 'task' => 'task@projet',
@ -695,14 +694,24 @@ class User extends CommonObject
'job@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all" 'job@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
'position@hrm' => 'all@hrm' // skill / job / position objects rights are for the moment grouped into right level "all" 'position@hrm' => 'all@hrm' // skill / job / position objects rights are for the moment grouped into right level "all"
); );
if (!empty($moduletomoduletouse[$module])) { if (!empty($moduletomoduletouse[$module])) {
$module = $moduletomoduletouse[$module]; $module = $moduletomoduletouse[$module];
} }
$moduleRightsMapping = array(
'product' => 'produit', // We must check $user->rights->produit...
);
$rightsPath = $module;
if (!empty($moduleRightsMapping[$rightsPath])) {
$rightsPath = $moduleRightsMapping[$rightsPath];
}
// If module is abc@module, we check permission user->rights->module->abc->permlevel1 // If module is abc@module, we check permission user->rights->module->abc->permlevel1
$tmp = explode('@', $module, 2); $tmp = explode('@', $rightsPath, 2);
if (! empty($tmp[1])) { if (! empty($tmp[1])) {
$module = $tmp[1]; $rightsPath = $tmp[1];
$permlevel2 = $permlevel1; $permlevel2 = $permlevel1;
$permlevel1 = $tmp[0]; $permlevel1 = $tmp[0];
} }
@ -723,49 +732,49 @@ class User extends CommonObject
if ($permlevel1 == 'recruitmentcandidature') { if ($permlevel1 == 'recruitmentcandidature') {
$permlevel1 = 'recruitmentjobposition'; $permlevel1 = 'recruitmentjobposition';
} }
//var_dump($module.' '.$permlevel1.' '.$permlevel2. ' '. $rightsPath);
//var_dump($module.' '.$permlevel1.' '.$permlevel2); //var_dump($this->rights);
if (empty($module) || empty($this->rights) || empty($this->rights->$module) || empty($permlevel1)) { if (empty($rightsPath) || empty($this->rights) || empty($this->rights->$rightsPath) || empty($permlevel1)) {
return 0; return 0;
} }
if ($permlevel2) { if ($permlevel2) {
if (!empty($this->rights->$module->$permlevel1)) { if (!empty($this->rights->$rightsPath->$permlevel1)) {
if (!empty($this->rights->$module->$permlevel1->$permlevel2)) { if (!empty($this->rights->$rightsPath->$permlevel1->$permlevel2)) {
return $this->rights->$module->$permlevel1->$permlevel2; return $this->rights->$rightsPath->$permlevel1->$permlevel2;
} }
// For backward compatibility with old permissions called "lire", "creer", "create", "supprimer" // For backward compatibility with old permissions called "lire", "creer", "create", "supprimer"
// instead of "read", "write", "delete" // instead of "read", "write", "delete"
if ($permlevel2 == 'read' && !empty($this->rights->$module->$permlevel1->lire)) { if ($permlevel2 == 'read' && !empty($this->rights->$rightsPath->$permlevel1->lire)) {
return $this->rights->$module->lire; return $this->rights->$rightsPath->lire;
} }
if ($permlevel2 == 'write' && !empty($this->rights->$module->$permlevel1->creer)) { if ($permlevel2 == 'write' && !empty($this->rights->$rightsPath->$permlevel1->creer)) {
return $this->rights->$module->create; return $this->rights->$rightsPath->create;
} }
if ($permlevel2 == 'write' && !empty($this->rights->$module->$permlevel1->create)) { if ($permlevel2 == 'write' && !empty($this->rights->$rightsPath->$permlevel1->create)) {
return $this->rights->$module->create; return $this->rights->$rightsPath->create;
} }
if ($permlevel2 == 'delete' && !empty($this->rights->$module->$permlevel1->supprimer)) { if ($permlevel2 == 'delete' && !empty($this->rights->$rightsPath->$permlevel1->supprimer)) {
return $this->rights->$module->supprimer; return $this->rights->$rightsPath->supprimer;
} }
} }
} else { } else {
if (!empty($this->rights->$module->$permlevel1)) { if (!empty($this->rights->$rightsPath->$permlevel1)) {
return $this->rights->$module->$permlevel1; return $this->rights->$rightsPath->$permlevel1;
} }
// For backward compatibility with old permissions called "lire", "creer", "create", "supprimer" // For backward compatibility with old permissions called "lire", "creer", "create", "supprimer"
// instead of "read", "write", "delete" // instead of "read", "write", "delete"
if ($permlevel1 == 'read' && !empty($this->rights->$module->lire)) { if ($permlevel1 == 'read' && !empty($this->rights->$rightsPath->lire)) {
return $this->rights->$module->lire; return $this->rights->$rightsPath->lire;
} }
if ($permlevel1 == 'write' && !empty($this->rights->$module->creer)) { if ($permlevel1 == 'write' && !empty($this->rights->$rightsPath->creer)) {
return $this->rights->$module->create; return $this->rights->$rightsPath->create;
} }
if ($permlevel1 == 'write' && !empty($this->rights->$module->create)) { if ($permlevel1 == 'write' && !empty($this->rights->$rightsPath->create)) {
return $this->rights->$module->create; return $this->rights->$rightsPath->create;
} }
if ($permlevel1 == 'delete' && !empty($this->rights->$module->supprimer)) { if ($permlevel1 == 'delete' && !empty($this->rights->$rightsPath->supprimer)) {
return $this->rights->$module->supprimer; return $this->rights->$rightsPath->supprimer;
} }
} }

30
test/phpunit/UserTest.php
View File

@ -261,12 +261,40 @@ class UserTest extends PHPUnit\Framework\TestCase
return $localobject; return $localobject;
} }
/**
* testUserHasRight
* @param User $localobject User
* @return User $localobject User
* @depends testUserOther
*/
public function testUserHasRight($localobject)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;
/*$result=$localobject->setstatus(0);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
*/
print __METHOD__." id=". $localobject->id ."\n";
//$this->assertNotEquals($user->date_creation, '');
$localobject->addrights(0, 'supplier_proposal');
$this->assertEquals($localobject->hasRight('member', ''), 0);
$this->assertEquals($localobject->hasRight('member', 'member'), 0);$this->assertEquals($localobject->hasRight('product', 'member', 'read'), 0);
$this->assertEquals($localobject->hasRight('member', 'member'), 0);$this->assertEquals($localobject->hasRight('produit', 'member', 'read'), 0);
return $localobject;
}
/** /**
* testUserSetPassword * testUserSetPassword
* *
* @param User $localobject User * @param User $localobject User
* @return void * @return void
* @depends testUserOther * @depends testUserHasRight
* The depends says test is run only if previous is ok * The depends says test is run only if previous is ok
*/ */
public function testUserSetPassword($localobject) public function testUserSetPassword($localobject)