mirror of
https://github.com/Combodo/iTop.git
synced 2026-03-04 16:44:11 +01:00
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts: # core/dbobject.class.php # datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php # lib/composer/autoload_files.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php # pages/UI.php # tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
This commit is contained in:
Pierre Goiffon
@@ -17,22 +17,23 @@
|
||||
// along with iTop. If not, see <http://www.gnu.org/licenses/>
|
||||
//
|
||||
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: Eric
|
||||
* Date: 02/10/2017
|
||||
* Time: 13:58
|
||||
*/
|
||||
|
||||
namespace Combodo\iTop\Test\UnitTest\Core;
|
||||
|
||||
use Attachment;
|
||||
use Combodo\iTop\Service\Events\EventData;
|
||||
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
|
||||
use CoreException;
|
||||
use DBObject;
|
||||
use InvalidExternalKeyValueException;
|
||||
use lnkContactToFunctionalCI;
|
||||
use lnkPersonToTeam;
|
||||
use MetaModel;
|
||||
use Organization;
|
||||
use Person;
|
||||
use Team;
|
||||
use User;
|
||||
use UserRights;
|
||||
use utils;
|
||||
|
||||
|
||||
/**
|
||||
@@ -41,6 +42,7 @@ use MetaModel;
|
||||
class DBObjectTest extends ItopDataTestCase
|
||||
{
|
||||
const CREATE_TEST_ORG = true;
|
||||
const INVALID_OBJECT_KEY = 123456789;
|
||||
|
||||
// Counts
|
||||
public $aReloadCount = [];
|
||||
@@ -433,6 +435,267 @@ class DBObjectTest extends ItopDataTestCase
|
||||
}
|
||||
}
|
||||
|
||||
private function GetAlwaysTrueCallback(): callable
|
||||
{
|
||||
return static function () {
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
||||
private function GetAlwaysFalseCallback(): callable
|
||||
{
|
||||
return static function () {
|
||||
return false;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers DBObject::CheckChangedExtKeysValues()
|
||||
* @runInSeparateProcess MetaModel::GetObject returning wrong values :(
|
||||
*/
|
||||
public function testCheckExtKeysSiloOnAttributeExternalKey()
|
||||
{
|
||||
//--- Preparing data...
|
||||
$oAlwaysTrueCallback = $this->GetAlwaysTrueCallback();
|
||||
$oAlwaysFalseCallback = $this->GetAlwaysFalseCallback();
|
||||
|
||||
/** @var Organization $oDemoOrg */
|
||||
$oDemoOrg = MetaModel::GetObjectByName(Organization::class, 'Demo');
|
||||
/** @var Organization $oMyCompanyOrg */
|
||||
$oMyCompanyOrg = MetaModel::GetObjectByName(Organization::class, 'My Company/Department');
|
||||
|
||||
/** @var Person $oPersonOfDemoOrg */
|
||||
$oPersonOfDemoOrg = MetaModel::GetObjectByName(Person::class, 'Agatha Christie');
|
||||
/** @var Person $oPersonOfMyCompanyOrg */
|
||||
$oPersonOfMyCompanyOrg = MetaModel::GetObjectByName(Person::class, 'My first name My last name');
|
||||
|
||||
$sConfigurationManagerProfileId = 3; // Access to Person objects
|
||||
$oUserWithAllowedOrgs = $this->CreateDemoOrgUser($oDemoOrg, $sConfigurationManagerProfileId);
|
||||
|
||||
$oAdminUser = MetaModel::GetObjectByName(User::class, 'admin', false);
|
||||
if (is_null($oAdminUser)) {
|
||||
$oAdminUser = $this->CreateUser('admin', 1);
|
||||
}
|
||||
|
||||
/** @var Person $oPersonObject */
|
||||
$oPersonObject = $this->CreatePerson(0, $oMyCompanyOrg->GetKey());
|
||||
|
||||
//--- Now we can do some tests !
|
||||
UserRights::Login($oUserWithAllowedOrgs->Get('login'));
|
||||
$this->ResetMetaModelQueyCacheGetObject();
|
||||
|
||||
try {
|
||||
$oPersonObject->CheckChangedExtKeysValues();
|
||||
} catch (InvalidExternalKeyValueException $eCannotSave) {
|
||||
$this->fail('Should skip external keys already written in Database');
|
||||
}
|
||||
|
||||
$oPersonObject->Set('manager_id', $oPersonOfDemoOrg->GetKey());
|
||||
try {
|
||||
$oPersonObject->CheckChangedExtKeysValues();
|
||||
} catch (InvalidExternalKeyValueException $eCannotSave) {
|
||||
$this->fail('Should allow objects in the same org as the current user');
|
||||
}
|
||||
|
||||
try {
|
||||
$oPersonObject->CheckChangedExtKeysValues($oAlwaysFalseCallback);
|
||||
$this->fail('Should consider the callback returning "false"');
|
||||
} catch (InvalidExternalKeyValueException $eCannotSave) {
|
||||
// Ok, the exception was expected
|
||||
}
|
||||
|
||||
$oPersonObject->Set('manager_id', $oPersonOfMyCompanyOrg->GetKey());
|
||||
try {
|
||||
$oPersonObject->CheckChangedExtKeysValues();
|
||||
$this->fail('Should not allow objects not being in the allowed orgs of the current user');
|
||||
} catch (InvalidExternalKeyValueException $eCannotSave) {
|
||||
$this->assertEquals('manager_id', $eCannotSave->GetAttCode(), 'Should report the wrong external key attcode');
|
||||
$this->assertEquals($oMyCompanyOrg->GetKey(), $eCannotSave->GetAttValue(), 'Should report the unauthorized external key value');
|
||||
}
|
||||
|
||||
try {
|
||||
$oPersonObject->CheckChangedExtKeysValues($oAlwaysTrueCallback);
|
||||
} catch (InvalidExternalKeyValueException $eCannotSave) {
|
||||
$this->fail('Should consider the callback returning "true"');
|
||||
}
|
||||
|
||||
UserRights::Logoff();
|
||||
$this->ResetMetaModelQueyCacheGetObject();
|
||||
|
||||
UserRights::Login($oAdminUser->Get('login'));
|
||||
$oPersonObject->CheckChangedExtKeysValues();
|
||||
$this->assertTrue(true, 'Admin user can create objects in any org');
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers DBObject::CheckChangedExtKeysValues()
|
||||
* @runInSeparateProcess MetaModel::GetObject returning wrong values :(
|
||||
*/
|
||||
public function testCheckExtKeysOnAttributeLinkedSetIndirect()
|
||||
{
|
||||
//--- Preparing data...
|
||||
/** @var Organization $oDemoOrg */
|
||||
$oDemoOrg = MetaModel::GetObjectByName(Organization::class, 'Demo');
|
||||
/** @var Person $oPersonOnItDepartmentOrg */
|
||||
$oPersonOnItDepartmentOrg = MetaModel::GetObjectByName(Person::class, 'Anna Gavalda');
|
||||
/** @var Person $oPersonOnDemoOrg */
|
||||
$oPersonOnDemoOrg = MetaModel::GetObjectByName(Person::class, 'Claude Monet');
|
||||
|
||||
$sConfigManagerProfileId = 3; // access to Team and Contact objects
|
||||
$oUserWithAllowedOrgs = $this->CreateDemoOrgUser($oDemoOrg, $sConfigManagerProfileId);
|
||||
|
||||
//--- Now we can do some tests !
|
||||
UserRights::Login($oUserWithAllowedOrgs->Get('login'));
|
||||
$this->ResetMetaModelQueyCacheGetObject();
|
||||
|
||||
$oTeam = MetaModel::NewObject(Team::class, [
|
||||
'name' => 'The A Team',
|
||||
'org_id' => $oDemoOrg->GetKey()
|
||||
]);
|
||||
|
||||
// Part 1 - Test with an invalid id (non-existing object)
|
||||
//
|
||||
$oPersonLinks = \DBObjectSet::FromScratch(lnkPersonToTeam::class);
|
||||
$oPersonLinks->AddObject(MetaModel::NewObject(lnkPersonToTeam::class, [
|
||||
'person_id' => self::INVALID_OBJECT_KEY,
|
||||
]));
|
||||
$oTeam->Set('persons_list', $oPersonLinks);
|
||||
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues();
|
||||
$this->fail('An unknown object should be detected as invalid');
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
// we are getting the exception on the lnk class
|
||||
// In consequence attcode is `lnkPersonToTeam.person_id` instead of `Team.persons_list`
|
||||
$this->assertEquals('person_id', $e->GetAttCode(), 'The reported attcode should be the external key on the link');
|
||||
$this->assertEquals(self::INVALID_OBJECT_KEY, $e->GetAttValue(), 'The reported value should be the external key on the link');
|
||||
}
|
||||
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues($this->GetAlwaysTrueCallback());
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
$this->fail('Should have no error when callback returns true');
|
||||
}
|
||||
|
||||
// Part 2 - Test with an allowed object
|
||||
//
|
||||
$oPersonLinks = \DBObjectSet::FromScratch(lnkPersonToTeam::class);
|
||||
$oPersonLinks->AddObject(MetaModel::NewObject(lnkPersonToTeam::class, [
|
||||
'person_id' => $oPersonOnDemoOrg->GetKey(),
|
||||
]));
|
||||
$oTeam->Set('persons_list', $oPersonLinks);
|
||||
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues();
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
$this->fail('An authorized object should be detected as valid');
|
||||
}
|
||||
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues($this->GetAlwaysFalseCallback());
|
||||
$this->fail('Should cascade the callback result when it is "false"');
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
// Ok, the exception was expected
|
||||
}
|
||||
|
||||
// Part 3 - Test with a not allowed object
|
||||
//
|
||||
$oPersonLinks = \DBObjectSet::FromScratch(lnkPersonToTeam::class);
|
||||
$oPersonLinks->AddObject(MetaModel::NewObject(lnkPersonToTeam::class, [
|
||||
'person_id' => $oPersonOnItDepartmentOrg->GetKey(),
|
||||
]));
|
||||
$oTeam->Set('persons_list', $oPersonLinks);
|
||||
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues();
|
||||
$this->fail('An unauthorized object should be detected as invalid');
|
||||
}
|
||||
catch (InvalidExternalKeyValueException $e) {
|
||||
// Ok, the exception was expected
|
||||
}
|
||||
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues($this->GetAlwaysTrueCallback());
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
$this->fail('Should cascade the callback result when it is "true"');
|
||||
}
|
||||
|
||||
$oTeam->DBInsert(); // persisting invalid value and resets the object changed values
|
||||
try {
|
||||
$oTeam->CheckChangedExtKeysValues();
|
||||
}
|
||||
catch (InvalidExternalKeyValueException $e) {
|
||||
$this->fail('An unauthorized value should be ignored when it is not being modified');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers DBObject::CheckChangedExtKeysValues()
|
||||
* @runInSeparateProcess MetaModel::GetObject returning wrong values :(
|
||||
*/
|
||||
public function testCheckExtKeysSiloOnAttributeObjectKey()
|
||||
{
|
||||
//--- Preparing data...
|
||||
/** @var Organization $oDemoOrg */
|
||||
$oDemoOrg = MetaModel::GetObjectByName(Organization::class, 'Demo');
|
||||
/** @var Person $oPersonOnItDepartmentOrg */
|
||||
$oPersonOnItDepartmentOrg = MetaModel::GetObjectByName(Person::class, 'Anna Gavalda');
|
||||
/** @var Person $oPersonOnDemoOrg */
|
||||
$oPersonOnDemoOrg = MetaModel::GetObjectByName(Person::class, 'Claude Monet');
|
||||
|
||||
$sConfigManagerProfileId = 3; // access to Team and Contact objects
|
||||
$oUserWithAllowedOrgs = $this->CreateDemoOrgUser($oDemoOrg, $sConfigManagerProfileId);
|
||||
|
||||
//--- Now we can do some tests !
|
||||
UserRights::Login($oUserWithAllowedOrgs->Get('login'));
|
||||
$this->ResetMetaModelQueyCacheGetObject();
|
||||
|
||||
$oAttachment = MetaModel::NewObject(Attachment::class, [
|
||||
'item_class' => Person::class,
|
||||
'item_id' => $oPersonOnDemoOrg->GetKey(),
|
||||
]);
|
||||
try {
|
||||
$oAttachment->CheckChangedExtKeysValues();
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
$this->fail('Should be allowed to create an attachment pointing to a ticket in the allowed org list');
|
||||
}
|
||||
|
||||
$oAttachment = MetaModel::NewObject(Attachment::class, [
|
||||
'item_class' => Person::class,
|
||||
'item_id' => $oPersonOnItDepartmentOrg->GetKey(),
|
||||
]);
|
||||
$this->ResetMetaModelQueyCacheGetObject();
|
||||
try {
|
||||
$oAttachment->CheckChangedExtKeysValues();
|
||||
$this->fail('There should be an error on attachment pointing to a non allowed org object');
|
||||
} catch (InvalidExternalKeyValueException $e) {
|
||||
$this->assertEquals('item_id', $e->GetAttCode(), 'Should report the object key attribute');
|
||||
$this->assertEquals($oPersonOnItDepartmentOrg->GetKey(), $e->GetAttValue(), 'Should report the object key value');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper to reset the metamodel cache
|
||||
* We might need to create something generic and add it to {@see UserRights::Logoff()} ?
|
||||
*/
|
||||
private function ResetMetaModelQueyCacheGetObject() {
|
||||
$this->SetNonPublicStaticProperty(MetaModel::class, 'aQueryCacheGetObject', []);
|
||||
}
|
||||
|
||||
private function CreateDemoOrgUser(Organization $oDemoOrg, string $sProfileId): User
|
||||
{
|
||||
utils::GetConfig()->SetModuleSetting('authent-local', 'password_validation.pattern', '');
|
||||
$oUserWithAllowedOrgs = $this->CreateContactlessUser('demo_test_' . __CLASS__, $sProfileId);
|
||||
/** @var \URP_UserOrg $oUserOrg */
|
||||
$oUserOrg = \MetaModel::NewObject('URP_UserOrg', ['allowed_org_id' => $oDemoOrg->GetKey(),]);
|
||||
$oAllowedOrgList = $oUserWithAllowedOrgs->Get('allowed_org_list');
|
||||
$oAllowedOrgList->AddItem($oUserOrg);
|
||||
$oUserWithAllowedOrgs->Set('allowed_org_list', $oAllowedOrgList);
|
||||
$oUserWithAllowedOrgs->DBWrite();
|
||||
|
||||
return $oUserWithAllowedOrgs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Test attribute integer incrementation.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user