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

Add Read and Update Owned Rights #17021

Merged
merged 5 commits into from May 7, 2024
Merged

Add Read and Update Owned Rights #17021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c57c93
Add Read and Update Owned Rights
cconard96 Apr 26, 2024
e25d7ba
Mutualize configurations and harmonize fields
cedric-anne May 6, 2024
bb3bb66
Give OWN rights when groups matches
cedric-anne May 6, 2024
bdab723
enhance test
cedric-anne May 6, 2024
5f478bf
lint
cedric-anne May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion front/asset/asset.form.php
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@
Response::sendError(400, 'Bad request', Response::CONTENT_TYPE_TEXT_HTML);
}

Session::checkRightsOr($asset::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr($asset::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (isset($_POST['add'])) {
$asset->check(-1, CREATE, $_POST);
Expand Down
2 changes: 1 addition & 1 deletion front/asset/asset.php
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@
Response::sendError(400, 'Bad request', Response::CONTENT_TYPE_TEXT_HTML);
}

Session::checkRightsOr($classname::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr($classname::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header($classname::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], 'assets', $classname);

Expand Down
2 changes: 1 addition & 1 deletion front/cartridgeitem.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Cartridge::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Cartridge::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Cartridge::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "cartridgeitem");

Expand Down
2 changes: 1 addition & 1 deletion front/computer.form.php
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Computer::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Computer::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (!isset($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/computer.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Computer::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Computer::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Computer::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "computer");

Expand Down
2 changes: 1 addition & 1 deletion front/consumableitem.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Consumable::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Consumable::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Consumable::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "consumableitem");

Expand Down
2 changes: 1 addition & 1 deletion front/monitor.form.php
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Monitor::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Monitor::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (empty($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/monitor.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Monitor::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Monitor::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Monitor::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "monitor");

Expand Down
2 changes: 1 addition & 1 deletion front/networkequipment.form.php
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

include('../inc/includes.php');

Session::checkRightsOr(NetworkEquipment::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(NetworkEquipment::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (!isset($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/networkequipment.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(NetworkEquipment::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(NetworkEquipment::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(NetworkEquipment::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "networkequipment");

Expand Down
2 changes: 1 addition & 1 deletion front/peripheral.form.php
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Peripheral::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Peripheral::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (empty($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/peripheral.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Peripheral::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Peripheral::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Peripheral::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "peripheral");

Expand Down
2 changes: 1 addition & 1 deletion front/phone.form.php
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Phone::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Phone::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (empty($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/phone.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Phone::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Phone::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Phone::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], 'assets', 'phone');

Expand Down
2 changes: 1 addition & 1 deletion front/printer.form.php
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Printer::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Printer::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (!isset($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/printer.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Printer::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Printer::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Printer::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "printer");

Expand Down
2 changes: 1 addition & 1 deletion front/software.form.php
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Software::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Software::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

if (!isset($_GET["id"])) {
$_GET["id"] = "";
Expand Down
2 changes: 1 addition & 1 deletion front/software.php
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@

include('../inc/includes.php');

Session::checkRightsOr(Software::$rightname, [READ, READ_ASSIGNED]);
Session::checkRightsOr(Software::$rightname, [READ, READ_ASSIGNED, READ_OWNED]);

Html::header(Software::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "assets", "software");

Expand Down
25 changes: 8 additions & 17 deletions inc/define.php
View file
Open in desktop
Expand Up @@ -68,6 +68,8 @@
define("UNLOCK", 128);
define("READ_ASSIGNED", 256);
define("UPDATE_ASSIGNED", 512);
define("READ_OWNED", 1024);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have the answer, but I hope using next bit will not conflict with some stored rights in DB.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I see, this value is not used in any assets or assignable items.

define("UPDATE_OWNED", 2048);

// set the default app_name
$CFG_GLPI['app_name'] = 'GLPI';
Expand Down Expand Up @@ -257,25 +259,14 @@
'Peripheral', 'Phone', 'Printer', 'Software', 'Rack'
];

$CFG_GLPI["linkuser_types"] = ['Computer', 'Monitor', 'NetworkEquipment',
// FIXME: Merge these configurations
$CFG_GLPI["linkuser_types"] = ['Computer', 'CartridgeItem', 'ConsumableItem', 'Monitor', 'NetworkEquipment',
'Peripheral', 'Phone', 'Printer', 'Software',
'SoftwareLicense', 'Certificate', 'Appliance', 'Item_DeviceSimcard', 'Line'
];

$CFG_GLPI["linkgroup_types"] = ['Computer', 'Monitor', 'NetworkEquipment',
'Peripheral', 'Phone', 'Printer', 'Software',
'SoftwareLicense', 'Certificate', 'Appliance', 'Item_DeviceSimcard', 'Line'
];

$CFG_GLPI["linkuser_tech_types"] = ['Computer', 'ConsumableItem', 'Monitor', 'NetworkEquipment',
'Peripheral', 'Phone', 'Printer', 'Software',
'SoftwareLicense', 'Certificate', 'Appliance', 'DatabaseInstance'
];

$CFG_GLPI["linkgroup_tech_types"] = ['Computer', 'ConsumableItem', 'Monitor', 'NetworkEquipment',
'Peripheral', 'Phone', 'Printer', 'Software',
'SoftwareLicense', 'Certificate', 'Appliance', 'DatabaseInstance'
'SoftwareLicense', 'Certificate', 'Appliance', 'DatabaseInstance', 'Item_DeviceSimcard', 'Line'
];
$CFG_GLPI["linkgroup_types"] = $CFG_GLPI["linkuser_types"];
$CFG_GLPI["linkuser_tech_types"] = $CFG_GLPI["linkuser_types"];
$CFG_GLPI["linkgroup_tech_types"] = $CFG_GLPI["linkuser_types"];

$CFG_GLPI["location_types"] = ['Budget', 'CartridgeItem', 'ConsumableItem',
'Computer', 'Monitor', "Glpi\\Socket",
Expand Down
50 changes: 40 additions & 10 deletions inc/relation.constant.php
View file
Open in desktop
Expand Up @@ -722,7 +722,10 @@
'groups_id_tech',
'groups_id',
],
'glpi_cartridgeitems' => 'groups_id_tech',
'glpi_cartridgeitems' => [
'groups_id_tech',
'groups_id',
],
'glpi_certificates' => [
'groups_id_tech',
'groups_id',
Expand All @@ -734,8 +737,14 @@
'groups_id_tech',
'groups_id',
],
'glpi_consumableitems' => 'groups_id_tech',
'glpi_databaseinstances' => 'groups_id_tech',
'glpi_consumableitems' => [
'groups_id_tech',
'groups_id',
],
'glpi_databaseinstances' => [
'groups_id_tech',
'groups_id',
],
'glpi_domains' => 'groups_id_tech',
'glpi_domainrecords' => 'groups_id_tech',
'glpi_enclosures' => 'groups_id_tech',
Expand All @@ -746,9 +755,15 @@
'_glpi_groups_rssfeeds' => 'groups_id',
'_glpi_groups_tickets' => 'groups_id',
'_glpi_groups_users' => 'groups_id',
'glpi_items_devicesimcards' => 'groups_id',
'glpi_items_devicesimcards' => [
'groups_id_tech',
'groups_id',
],
'glpi_itilcategories' => 'groups_id',
'glpi_lines' => 'groups_id',
'glpi_lines' => [
'groups_id_tech',
'groups_id',
],
'glpi_monitors' => [
'groups_id_tech',
'groups_id',
Expand Down Expand Up @@ -1524,7 +1539,10 @@
'users_id',
],
'glpi_cables' => 'users_id_tech',
'glpi_cartridgeitems' => 'users_id_tech',
'glpi_cartridgeitems' => [
'users_id_tech',
'users_id',
],
'glpi_certificates' => [
'users_id_tech',
'users_id',
Expand All @@ -1548,10 +1566,16 @@
'users_id_tech',
'users_id',
],
'glpi_consumableitems' => 'users_id_tech',
'glpi_consumableitems' => [
'users_id_tech',
'users_id',
],
'_glpi_dashboards_dashboards' => 'users_id',
'glpi_dashboards_filters' => 'users_id',
'glpi_databaseinstances' => 'users_id_tech',
'glpi_databaseinstances' => [
'users_id_tech',
'users_id',
],
'_glpi_displaypreferences' => 'users_id',
'glpi_domains' => 'users_id_tech',
'glpi_domainrecords' => 'users_id_tech',
Expand All @@ -1560,7 +1584,10 @@
'glpi_enclosures' => 'users_id_tech',
'glpi_forms_answerssets' => 'users_id',
'_glpi_groups_users' => 'users_id',
'glpi_items_devicesimcards' => 'users_id',
'glpi_items_devicesimcards' => [
'users_id_tech',
'users_id',
],
'_glpi_items_kanbans' => 'users_id',
'glpi_itilcategories' => 'users_id',
'glpi_itilfollowups' => [
Expand All @@ -1577,7 +1604,10 @@
'glpi_knowbaseitems_revisions' => 'users_id',
'_glpi_knowbaseitems_users' => 'users_id',
'glpi_knowbaseitemtranslations' => 'users_id',
'glpi_lines' => 'users_id',
'glpi_lines' => [
'users_id_tech',
'users_id',
],
'glpi_monitors' => [
'users_id_tech',
'users_id',
Expand Down