oObject->DBWrite();
} catch (CoreCannotSaveObjectException $e) {
- throw new Exception($e->getHtmlMessage());
+ throw new Exception($e->getTextMessage());
} catch (InvalidExternalKeyValueException $e) {
ExceptionLog::LogException($e, $e->getContextData());
$bExceptionLogged = true;
@@ -1224,7 +1224,7 @@ class ObjectFormManager extends FormManager
}
catch (CoreCannotSaveObjectException $e) {
$aData['valid'] = false;
- $aData['messages']['error'] += array('_main' => array($e->getHtmlMessage()));
+ $aData['messages']['error'] += array('_main' => array($e->getTextMessage()));
if (false === $bExceptionLogged) {
IssueLog::Error(__METHOD__.' at line '.__LINE__.' : '.$e->getMessage());
}
@@ -1232,7 +1232,7 @@ class ObjectFormManager extends FormManager
catch (Exception $e) {
$aData['valid'] = false;
$aData['messages']['error'] += [
- '_main' => [ ($e instanceof CoreCannotSaveObjectException) ? $e->getHtmlMessage() : $e->getMessage()]
+ '_main' => [ ($e instanceof CoreCannotSaveObjectException) ? $e->getTextMessage() : $e->getMessage()]
];
if (false === $bExceptionLogged) {
IssueLog::Error(__METHOD__.' at line '.__LINE__.' : '.$e->getMessage());
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Helper/ContextManipulatorHelper.php b/datamodels/2.x/itop-portal-base/portal/src/Helper/ContextManipulatorHelper.php
index 611fad447..58caab5f8 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/ContextManipulatorHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/ContextManipulatorHelper.php
@@ -13,6 +13,7 @@ use CorePortalInvalidActionRuleException;
use DBObject;
use DBObjectSearch;
use DBObjectSet;
+use DBProperty;
use DBSearch;
use DeprecatedCallsLog;
use DOMFormatException;
@@ -20,8 +21,10 @@ use DOMNodeList;
use Exception;
use FieldExpression;
use IssueLog;
+use MetaModel;
use ModuleDesign;
use ScalarExpression;
+use SimpleCrypt;
use Symfony\Component\Routing\RouterInterface;
use TrueExpression;
use UserRights;
@@ -49,6 +52,8 @@ class ContextManipulatorHelper
/** @var string DEFAULT_RULE_CALLBACK_OPEN */
const DEFAULT_RULE_CALLBACK_OPEN = self::ENUM_RULE_CALLBACK_OPEN_VIEW;
+ const PRIVATE_KEY = 'portal-priv-key';
+
/** @var array $aRules */
protected $aRules;
/** @var \Symfony\Component\Routing\RouterInterface */
@@ -524,8 +529,11 @@ class ContextManipulatorHelper
*/
public static function EncodeRulesToken($aTokenRules)
{
- // Returning tokenised data
- return base64_encode(json_encode($aTokenRules));
+ $aTokenRules['salt'] = base64_encode(random_bytes(8));
+
+ $sPPrivateKey = self::GetPrivateKey();
+ $oCrypt = new SimpleCrypt(MetaModel::GetConfig()->GetEncryptionLibrary());
+ return base64_encode($oCrypt->Encrypt($sPPrivateKey, json_encode($aTokenRules)));
}
/**
@@ -549,9 +557,41 @@ class ContextManipulatorHelper
* @param string $sToken
*
* @return array
+ * @throws \CoreException
+ * @throws \CoreUnexpectedValue
+ * @throws \MySQLException
+ * @throws \OQLException
*/
public static function DecodeRulesToken($sToken)
{
- return json_decode(base64_decode($sToken), true);
+ $sPrivateKey = self::GetPrivateKey();
+ $oCrypt = new SimpleCrypt(MetaModel::GetConfig()->GetEncryptionLibrary());
+ $sDecryptedToken = $oCrypt->Decrypt($sPrivateKey, base64_decode($sToken));
+
+ $aTokenRules = json_decode($sDecryptedToken, true);
+ if (!is_array($aTokenRules))
+ {
+ throw new Exception('DecodeRulesToken not a proper json structure.');
+ }
+
+ return $aTokenRules;
+ }
+
+
+ /**
+ * @return string
+ * @throws \CoreException
+ * @throws \CoreUnexpectedValue
+ * @throws \MySQLException
+ */
+ private static function GetPrivateKey()
+ {
+ $sPrivateKey = DBProperty::GetProperty(self::PRIVATE_KEY);
+ if (is_null($sPrivateKey)) {
+ $sPrivateKey = bin2hex(random_bytes(32));
+ DBProperty::SetProperty(self::PRIVATE_KEY, $sPrivateKey);
+ }
+
+ return $sPrivateKey;
}
}
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 3be7f8b1c..8e55ed8ba 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1712,5 +1712,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:UserManagement' => 'User management',
'Menu:Queries' => 'Queries',
'Menu:ConfigurationTools' => 'Configuration',
+ 'Menu:ConfigEditor' => 'General configuration',
+ 'Menu:ConfigEditor+' => 'Configuration File editors',
));
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 4bd6dc4e9..991ed36db 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -315,6 +315,8 @@ Elle s\'applique à tous les objets dans le périmètre de sa catégorie d\'audi
'Menu:CSVImportMenu' => 'Import CSV',
'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse',
'Menu:ConfigurationTools' => 'Configuration',
+ 'Menu:ConfigEditor' => 'Configuration générale',
+ 'Menu:ConfigEditor+' => 'Édition du fichier de configuration',
'Menu:DataAdministration' => 'Administration des données',
'Menu:DataAdministration+' => 'Administration des données',
'Menu:DataModelMenu' => 'Modèle de données',
diff --git a/sources/Controller/Newsroom/iTopNewsroomController.php b/sources/Controller/Newsroom/iTopNewsroomController.php
index 592e7c182..7bc1a9bba 100644
--- a/sources/Controller/Newsroom/iTopNewsroomController.php
+++ b/sources/Controller/Newsroom/iTopNewsroomController.php
@@ -64,9 +64,6 @@ class iTopNewsroomController extends Controller
$oBulkActionsBlock = PanelUIBlockFactory::MakeForInformation(Dict::S('UI:Newsroom:iTopNotification:ViewAllPage:Title'));
$oBulkActionsBlock->AddSubTitleBlock(new Html(Dict::S('UI:Newsroom:iTopNotification:ViewAllPage:SubTitle')));
$sPictureUrl = UserRights::GetUserPictureAbsUrl();
- if (empty($sPictureUrl)) {
- $sPictureUrl = utils::GetAbsoluteUrlAppRoot().'images/user-pictures/'.appUserPreferences::GetPref('user_picture_placeholder', 'user-profile-default-256px.png');
- }
$oBulkActionsBlock->SetIcon($sPictureUrl,Panel::ENUM_ICON_COVER_METHOD_CONTAIN, true);
$oNotificationsCenterButton = ButtonUIBlockFactory::MakeIconLink(
diff --git a/sources/Controller/Notifications/NotificationsCenterController.php b/sources/Controller/Notifications/NotificationsCenterController.php
index 82dab6e97..52ca628c3 100644
--- a/sources/Controller/Notifications/NotificationsCenterController.php
+++ b/sources/Controller/Notifications/NotificationsCenterController.php
@@ -63,9 +63,6 @@ class NotificationsCenterController extends Controller
$oNotificationsPanel->AddSubTitleBlock(new Html(Dict::S('UI:NotificationsCenter:Panel:SubTitle')));
$sPictureUrl = UserRights::GetUserPictureAbsUrl();
- if (empty($sPictureUrl)) {
- $sPictureUrl = utils::GetAbsoluteUrlAppRoot().'images/user-pictures/'.appUserPreferences::GetPref('user_picture_placeholder', 'user-profile-default-256px.png');
- }
$oNotificationsPanel->SetIcon($sPictureUrl,Panel::ENUM_ICON_COVER_METHOD_CONTAIN, true);
$oNotificationsCenterTableColumns = [
diff --git a/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
index bfc05a792..f03013f89 100644
--- a/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
+++ b/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
@@ -676,7 +676,7 @@ HTML
$sEntryMedallionContent
- {$sEntryUserLogin}
+ {$sEntryMedallionTooltip}
HTML
);
diff --git a/tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php b/tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
index a52085592..0706b3d27 100644
--- a/tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
+++ b/tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
@@ -169,6 +169,27 @@ abstract class ItopTestCase extends TestCase
return $sAppRootPath . '/';
}
+ private static function GetFirstDirUpContainingFile(string $sSearchPath, string $sFileToFindGlobPattern): ?string
+ {
+ for ($iDepth = 0; $iDepth < 8; $iDepth++) {
+ $aGlobFiles = glob($sSearchPath . '/' . $sFileToFindGlobPattern);
+ if (is_array($aGlobFiles) && (count($aGlobFiles) > 0)) {
+ return $sSearchPath . '/';
+ }
+ $iOffsetSep = strrpos($sSearchPath, '/');
+ if ($iOffsetSep === false) {
+ $iOffsetSep = strrpos($sSearchPath, '\\');
+ if ($iOffsetSep === false) {
+ // Do not throw an exception here as PHPUnit will not show it clearly when determing the list of test to perform
+ return 'Could not find the approot file in ' . $sSearchPath;
+ }
+ }
+ $sSearchPath = substr($sSearchPath, 0, $iOffsetSep);
+ }
+ return null;
+ }
+
+
/**
* Overload this method to require necessary files through {@see \Combodo\iTop\Test\UnitTest\ItopTestCase::RequireOnceItopFile()}
*
@@ -206,23 +227,6 @@ abstract class ItopTestCase extends TestCase
require_once $this->GetAppRoot() . $sFileRelPath;
}
- /**
- * Helper to load a module file. The caller test must be in that module !
- * Will browse dir up to find a module.*.php
- *
- * @param string $sFileRelPath for example 'portal/src/Helper/ApplicationHelper.php'
- * @since 2.7.10 3.1.1 3.2.0 N°6709 method creation
- */
- protected function RequireOnceCurrentModuleFile(string $sFileRelPath): void
- {
- $aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
- $sCallerFileFullPath = $aStack[0]['file'];
- $sCallerDir = dirname($sCallerFileFullPath);
-
- $sModuleRootPath = static::GetFirstDirUpContainingFile($sCallerDir, 'module.*.php');
- require_once $sModuleRootPath . $sFileRelPath;
- }
-
/**
* Require once a unit test file (eg. a mock class) from its relative path from the *current* dir.
* This ensure that required files don't crash when unit tests dir is moved in the iTop structure (see N°5608)
@@ -240,26 +244,6 @@ abstract class ItopTestCase extends TestCase
require_once $sCallerDirAbsPath . DIRECTORY_SEPARATOR . $sFileRelPath;
}
- private static function GetFirstDirUpContainingFile(string $sSearchPath, string $sFileToFindGlobPattern): ?string
- {
- for ($iDepth = 0; $iDepth < 8; $iDepth++) {
- $aGlobFiles = glob($sSearchPath . '/' . $sFileToFindGlobPattern);
- if (is_array($aGlobFiles) && (count($aGlobFiles) > 0)) {
- return $sSearchPath . '/';
- }
- $iOffsetSep = strrpos($sSearchPath, '/');
- if ($iOffsetSep === false) {
- $iOffsetSep = strrpos($sSearchPath, '\\');
- if ($iOffsetSep === false) {
- // Do not throw an exception here as PHPUnit will not show it clearly when determing the list of test to perform
- return 'Could not find the approot file in ' . $sSearchPath;
- }
- }
- $sSearchPath = substr($sSearchPath, 0, $iOffsetSep);
- }
- return null;
- }
-
protected function debug($sMsg)
{
if (static::$DEBUG_UNIT_TEST) {
@@ -402,11 +386,11 @@ abstract class ItopTestCase extends TestCase
*/
private function GetProperty(string $sClass, string $sProperty): \ReflectionProperty
{
- $class = new \ReflectionClass($sClass);
- $property = $class->getProperty($sProperty);
- $property->setAccessible(true);
+ $oClass = new \ReflectionClass($sClass);
+ $oProperty = $oClass->getProperty($sProperty);
+ $oProperty->setAccessible(true);
- return $property;
+ return $oProperty;
}
@@ -417,7 +401,7 @@ abstract class ItopTestCase extends TestCase
*
* @since 2.7.8 3.0.3 3.1.0
*/
- public function SetNonPublicProperty(object $oObject, string $sProperty, $value)
+ public function SetNonPublicProperty($oObject, string $sProperty, $value)
{
$oProperty = $this->GetProperty(get_class($oObject), $sProperty);
$oProperty->setValue($oObject, $value);
diff --git a/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php b/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
index 5709f31db..e77119da0 100644
--- a/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/CRUDEventTest.php
@@ -374,6 +374,27 @@ class CRUDEventTest extends ItopDataTestCase
$this->assertStringStartsWith('CRUD', $oPerson->Get('first_name'), 'The object should have been modified and recorded in DB by EVENT_DB_AFTER_WRITE handler');
}
+ public function testAfterDeleteObjectAttributesExceptLinkedSetAreUsable()
+ {
+ $oPerson = $this->createObject('Person', [
+ 'name' => 'Person_1',
+ 'first_name' => 'Test',
+ 'org_id' => $this->getTestOrgId(),
+ ]);
+
+ $oFetchPerson = MetaModel::GetObject('Person', $oPerson->GetKey());
+
+ $oEventReceiver = new CRUDEventReceiver($this);
+ // Set the person's first name during Compute Values
+ $oEventReceiver->AddCallback(EVENT_DB_AFTER_DELETE, Person::class, 'GetObjectAttributesValues');
+ $oEventReceiver->RegisterCRUDEventListeners(EVENT_DB_AFTER_DELETE);
+ $oEventReceiver->RegisterCRUDEventListeners(EVENT_DB_OBJECT_RELOAD);
+
+ $oFetchPerson->DBDelete();
+
+ $this->assertEquals(1, self::$aEventCallsCount[EVENT_DB_AFTER_DELETE], 'EVENT_DB_AFTER_DELETE must be called when deleting an object and the object attributes must remain accessible');
+ }
+
/**
* Modify one object during EVENT_DB_AFTER_WRITE
* Check that the CRUD is protected against infinite loops (when modifying an object in its EVENT_DB_AFTER_WRITE)
@@ -881,6 +902,20 @@ class CRUDEventReceiver extends ClassesWithDebug
$oObject->Set('first_name', 'CRUD_first_name_'.rand());
}
+ /**
+ * @noinspection PhpUnusedPrivateMethodInspection Used as a callback
+ */
+ private function GetObjectAttributesValues(EventData $oData): void
+ {
+ $this->Debug(__METHOD__);
+ $oObject = $oData->Get('object');
+ foreach (MetaModel::ListAttributeDefs(get_class($oObject)) as $sAttCode => $oAttDef) {
+ if (!$oAttDef->IsLinkSet()) {
+ $oObject->Get($sAttCode);
+ }
+ }
+ }
+
/**
* @noinspection PhpUnusedPrivateMethodInspection Used as a callback
*/