Skip to content

Add safety guards in Generate item flow for invalid references and non-existent classes #578

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

Open
bygadd wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

Add safety guards in Generate item flow for invalid references and non-existent classes #578

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Fix generate associated item massive action
- Add safety guards in Generate item flow for invalid references and non-existent classes (GLPI 11 / PHP 8.3)
- Update locales


Expand Down
5 changes: 3 additions & 2 deletions inc/link.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ public function showItemGenerationForm($params)
$row['template_name'] = "";
}

if (Toolbox::hasTrait($itemtype, AssignableItem::class)) {
// GLPI 11 safety: skip non-existent classes (e.g. uninstalled plugins like GenericObject)
if (class_exists($itemtype) && Toolbox::hasTrait($itemtype, AssignableItem::class)) {
$row['assignableitem'] = true;
if (!is_array($row['groups_id'])) {
$row['groups_id'] = $row['groups_id'] > 0 ? [$row['groups_id']] : [];
Expand All @@ -174,7 +175,7 @@ public function showItemGenerationForm($params)
'active_entities' => $_SESSION['glpiactiveentities'] ?? [],
'item_rows' => $item_rows,
'order_web_dir' => $order_web_dir,
'assignableitem' => Toolbox::hasTrait($itemtype, AssignableItem::class),
'assignableitem' => class_exists($itemtype) && Toolbox::hasTrait($itemtype, AssignableItem::class),
]);
return null;
}
Expand Down
9 changes: 8 additions & 1 deletion inc/reference.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,14 @@ public function checkIfTemplateExistsInEntity($detailID, $itemtype, $entity)
} else {
$row = $result->current();
$item = getItemForItemtype($itemtype);
$item->getFromDB($row["templates_id"]);
// GLPI 11 safety: custom asset classes may fail to resolve in HTTP context
// and templates_id may be 0 for entries created before plugin migration.
if ($item === false || empty($row["templates_id"])) {
return 0;
}
if (!$item->getFromDB($row["templates_id"])) {
return 0;
}
if ($item->getField('entities_id') == $entity
|| ($item->maybeRecursive()
&& $item->fields['is_recursive']
Expand Down