Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix private items display in timeline #15138

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Fix private items display in timeline #15138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 72 additions & 50 deletions src/CommonITILObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6725,12 +6725,12 @@ public function getLegacyTimelineActionsHTML(): string
* Retrieves all timeline items for this ITILObject
*
* @param array $options Possible options:
* - with_documents : include documents elements
* - with_logs : include log entries
* - with_validations : include validation elements
* - expose_private : force presence of private items (followup/tasks), even if session does not allow it
* - bypass_rights : bypass current session rights
* - sort_by_date_desc : false,
* - with_documents : include documents elements
* - with_logs : include log entries
* - with_validations : include validation elements
* - sort_by_date_desc : sort timeline items by date
* - check_view_rights : indicates whether current session rights should be checked for view rights
* - hide_private_items : force hiding private items (followup/tasks), even if session allow it
* @since 9.4.0
*
* @param bool $with_logs include logs ?
Expand All @@ -6741,46 +6741,67 @@ public function getTimelineItems(array $options = [])
{

$params = [
'with_documents' => true,
'with_logs' => true,
'with_validations' => true,
'expose_private' => false,
'bypass_rights' => false,
'sort_by_date_desc' => $_SESSION['glpitimeline_order'] == CommonITILObject::TIMELINE_ORDER_REVERSE,
'is_self_service' => false,
'with_documents' => true,
'with_logs' => true,
'with_validations' => true,
'sort_by_date_desc' => $_SESSION['glpitimeline_order'] == CommonITILObject::TIMELINE_ORDER_REVERSE,

// params used by notifications process (as session cannot be used there)
'check_view_rights' => true,
'hide_private_items' => false,
];

if (array_key_exists('bypass_rights', $options) && $options['bypass_rights']) {
Toolbox::deprecated('Using `bypass_rights` parameter is deprecated.');
$params['check_view_rights'] = false;
}
if (array_key_exists('expose_private', $options) && $options['expose_private']) {
Toolbox::deprecated('Using `expose_private` parameter is deprecated.');
$params['hide_private_items'] = false;
}
if (array_key_exists('is_self_service', $options) && $options['is_self_service']) {
Toolbox::deprecated('Using `is_self_service` parameter is deprecated.');
$params['hide_private_items'] = false;
}

if (is_array($options) && count($options)) {
foreach ($options as $key => $val) {
$params[$key] = $val;
}
}

if ($this->isNewItem()) {
return [];
}

if ($params['check_view_rights'] && !$this->canViewItem()) {
return [];
}

$objType = static::getType();
$foreignKey = static::getForeignKeyField();
$timeline = [];

if ($this->isNewItem()) {
return $timeline;
}

$canupdate_parent = $this->canUpdateItem() && !in_array($this->fields['status'], $this->getClosedStatusArray());

//checks rights
$restrict_fup = $restrict_task = [];
if (!$params['expose_private'] || (!Session::haveRight("followup", ITILFollowup::SEEPRIVATE) && !$params['bypass_rights'])) {
$restrict_fup = [
'OR' => [
if (
$params['hide_private_items']
|| ($params['check_view_rights'] && !Session::haveRight("followup", ITILFollowup::SEEPRIVATE))
) {
if (Session::getLoginUserID() !== false && Session::getCurrentInterface() === "central") {
$restrict_fup = [
'OR' => [
'is_private' => 0,
'users_id' => Session::getCurrentInterface() === "central" ? (int)Session::getLoginUserID() : 0,
]
];
} else {
$restrict_fup = [
'is_private' => 0,
'users_id' => Session::getLoginUserID()
]
];
}

if ($params['is_self_service'] || !$params['expose_private']) {
$restrict_fup = [
'is_private' => 0
];
];
}
}

$restrict_fup['itemtype'] = static::getType();
Expand All @@ -6790,31 +6811,32 @@ public function getTimelineItems(array $options = [])
$task_obj = new $taskClass();
if (
$task_obj->maybePrivate()
&& (!$params['expose_private'] || (!Session::haveRight("followup", CommonITILTask::SEEPRIVATE) && !$params['bypass_rights']))
&& (
$params['hide_private_items']
|| ($params['check_view_rights'] && !Session::haveRight($task_obj::$rightname, CommonITILTask::SEEPRIVATE))
)
) {
$restrict_task = [
'OR' => [
'is_private' => 0,
'users_id' => Session::getCurrentInterface() == "central"
? Session::getLoginUserID()
: 0
]
];
}

if ($params['is_self_service'] || !$params['expose_private']) {
$restrict_task = [
'is_private' => 0
];
if (Session::getLoginUserID() !== false && Session::getCurrentInterface() === "central") {
$restrict_task = [
'OR' => [
'is_private' => 0,
'users_id' => Session::getCurrentInterface() === "central" ? (int)Session::getLoginUserID() : 0,
]
];
} else {
$restrict_task = [
'is_private' => 0,
];
}
}

//add followups to timeline
$followup_obj = new ITILFollowup();
if ($followup_obj->canview() || $params['bypass_rights']) {
if (!$params['check_view_rights'] || $followup_obj->canview()) {
$followups = $followup_obj->find(['items_id' => $this->getID()] + $restrict_fup, ['date_creation DESC', 'id DESC']);
foreach ($followups as $followups_id => $followup) {
$followup_obj->getFromDB($followups_id);
if ($followup_obj->canViewItem() || $params['bypass_rights']) {
if (!$params['check_view_rights'] || $followup_obj->canViewItem()) {
$followup['can_edit'] = $followup_obj->canUpdateItem();
$followup['can_promote'] = Session::getCurrentInterface() === 'central' && $this instanceof Ticket && Ticket::canCreate();
$timeline["ITILFollowup_" . $followups_id] = [
Expand All @@ -6827,11 +6849,11 @@ public function getTimelineItems(array $options = [])
}

//add tasks to timeline
if ($task_obj->canview() || $params['bypass_rights']) {
if (!$params['check_view_rights'] || $task_obj->canview()) {
$tasks = $task_obj->find([$foreignKey => $this->getID()] + $restrict_task, 'date_creation DESC');
foreach ($tasks as $tasks_id => $task) {
$task_obj->getFromDB($tasks_id);
if ($task_obj->canViewItem() || $params['bypass_rights']) {
if (!$params['check_view_rights'] || $task_obj->canViewItem()) {
$task['can_edit'] = $task_obj->canUpdateItem();
$task['can_promote'] = Session::getCurrentInterface() === 'central' && $this instanceof Ticket && Ticket::canCreate();
$timeline[$task_obj::getType() . "_" . $tasks_id] = [
Expand Down Expand Up @@ -6873,7 +6895,7 @@ public function getTimelineItems(array $options = [])
$validation_class = $objType . "Validation";
if (
class_exists($validation_class) && $params['with_validations']
&& ($validation_class::canView() || $params['bypass_rights'])
&& (!$params['check_view_rights'] || $validation_class::canView())
) {
$valitation_obj = new $validation_class();
$validations = $valitation_obj->find([$foreignKey => $this->getID()]);
Expand Down Expand Up @@ -6934,7 +6956,7 @@ class_exists($validation_class) && $params['with_validations']
$document_item_obj = new Document_Item();
$document_obj = new Document();
$document_items = $document_item_obj->find([
$this->getAssociatedDocumentsCriteria($params['bypass_rights']),
$this->getAssociatedDocumentsCriteria(!$params['check_view_rights']),
'timeline_position' => ['>', self::NO_TIMELINE]
]);
foreach ($document_items as $document_item) {
Expand Down
14 changes: 7 additions & 7 deletions src/NotificationTargetCommonITILObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,13 +1582,13 @@ public function getDataForObject(CommonDBTM $item, array $options, $simple = fal
$data['timelineitems'] = [];

$options = [
'with_documents' => false,
'with_logs' => false,
'with_validations' => false,
'expose_private' => $show_private,
'bypass_rights' => true,
'sort_by_date_desc' => true,
'is_self_service' => $is_self_service,
'with_documents' => false,
'with_logs' => false,
'with_validations' => false,
'sort_by_date_desc' => true,

'check_view_rights' => false,
'hide_private_items' => $is_self_service || !$show_private,
];

$timeline = $item->getTimelineItems($options);
Expand Down
4 changes: 3 additions & 1 deletion tests/functional/NotificationTargetTicket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ public function testTimelineTag()
]);
$this->integer($solutions_id)->isGreaterThan(0);

// Must be logged out to ensure session rights are not checked.
$this->resetSession();

$basic_options = [
'additionnaloption' => [
'usertype' => NotificationTarget::GLPI_USER,
Expand Down Expand Up @@ -362,7 +365,6 @@ public function testTimelineTag()

//add a test for tech, but force the `show_private` option to false to ensure that presence of this option will
//hide private items
$this->login("tech", "tech");
$basic_options = [
'additionnaloption' => [
'usertype' => NotificationTarget::GLPI_USER,
Expand Down
Loading