Skip to content

Drop user, users, usergroup and usergroups endpoints #1303

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drop user, users, usergroup and usergroups endpoints #1303

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
28 changes: 0 additions & 28 deletions application/controllers/UserController.php
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions application/controllers/UsergroupController.php
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions application/controllers/UsergroupsController.php
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions application/controllers/UsersController.php
View file
Open in desktop

This file was deleted.

20 changes: 4 additions & 16 deletions configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,7 @@
]);
}

if (
! array_key_exists('usergroups', $routeDenylist) // TODO: Remove with 1.3, compat only
&& ! array_key_exists('contactgroups', $routeDenylist)
) {
if (! array_key_exists('contactgroups', $routeDenylist)) {
$overviewSection->add(N_('Contact Groups'), [
'description' => $this->translate('List contact groups'),
'url' => 'icingadb/contactgroups',
Expand All @@ -385,10 +382,7 @@
]);
}

if (
! array_key_exists('users', $routeDenylist) // TODO: Remove with 1.3, compat only
&& ! array_key_exists('contacts', $routeDenylist)
) {
if (! array_key_exists('contacts', $routeDenylist)) {
$overviewSection->add(N_('Contacts'), [
'description' => $this->translate('List contacts'),
'url' => 'icingadb/contacts',
Expand Down Expand Up @@ -505,10 +499,7 @@
]);
}

if (
! array_key_exists('usergroups', $routeDenylist) // TODO: Remove with 1.3, compat only
&& ! array_key_exists('contactgroups', $routeDenylist)
) {
if (! array_key_exists('contactgroups', $routeDenylist)) {
$section->add(N_('Contact Groups'), [
'url' => 'icingadb/contactgroups',
'priority' => 70,
Expand All @@ -517,10 +508,7 @@
]);
}

if (
! array_key_exists('users', $routeDenylist) // TODO: Remove with 1.3, compat only
&& ! array_key_exists('contacts', $routeDenylist)
) {
if (! array_key_exists('contacts', $routeDenylist)) {
$section->add(N_('Contacts'), [
'url' => 'icingadb/contacts',
'priority' => 80,
Expand Down
4 changes: 4 additions & 0 deletions doc/05-Upgrading.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ If you are upgrading across multiple versions, make sure to follow the steps for

**Removed Features**

* The routes `users`, `user`, `usergroup` and `usergroups` have been removed.
* Accessing these routes will result in a 404 error.
* The corresponding values for `icingadb/denylist/routes` have no effect anymore.
* The alternatives (`contacts`, `contact` , `contactgroup` and `contactgroups`) have been available since v1.2.
* The migration widget in the top right has been removed. If you have not adjusted your navigation items,
dashboards and bookmarks to support the new filter syntax, you will need to do so manually now (see [Upgrading to
Icinga DB Web v1.1](#upgrading-to-icinga-db-web-v11) for details).
Expand Down
6 changes: 0 additions & 6 deletions library/Icingadb/Common/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ public function isPermittedRoute(string $name): bool
}, $this->getAuth()->getRestrictions('icingadb/denylist/routes'))));

if (! array_key_exists($name, $routeDenylist)) {
if ($name === 'contacts' && array_key_exists('users', $routeDenylist)) {
return false; // TODO: Remove with 1.3, compat only
} elseif ($name === 'contactgroups' && array_key_exists('usergroups', $routeDenylist)) {
return false; // TODO: Remove with 1.3, compat only
}

return true;
}

Expand Down
Loading