diff options
| author | Simon Rettberg | 2025-08-04 16:05:24 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2025-08-04 16:05:24 +0200 |
| commit | 836f6b8e2b0051eb3a46d3b1232b9cdfab1ccdf9 (patch) | |
| tree | 3ed1740338e631c611aca9e8cd28d6a995ca0ef6 | |
| parent | Implicitly nullable types are deprecated in PHP 8.3, make explicit (diff) | |
| download | slx-admin-836f6b8e2b0051eb3a46d3b1232b9cdfab1ccdf9.tar.gz slx-admin-836f6b8e2b0051eb3a46d3b1232b9cdfab1ccdf9.tar.xz slx-admin-836f6b8e2b0051eb3a46d3b1232b9cdfab1ccdf9.zip | |
A few more HTTP code audit log fixups
| -rw-r--r-- | modules-available/baseconfig/page.inc.php | 1 | ||||
| -rw-r--r-- | modules-available/exams/page.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/rebootcontrol/pages/exec.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/page.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/statistics/page.inc.php | 9 | ||||
| -rw-r--r-- | modules-available/sysconfig/addmodule_custommodule.inc.php | 1 |
6 files changed, 12 insertions, 5 deletions
diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php index 1b6e947d..71651010 100644 --- a/modules-available/baseconfig/page.inc.php +++ b/modules-available/baseconfig/page.inc.php @@ -87,6 +87,7 @@ class Page_BaseConfig extends Page ); } Message::addSuccess('settings-updated'); + Audit::overrideResponseCode(200); if ($this->targetModule === false) { Util::redirect('?do=BaseConfig', null, true); } elseif (empty($this->qry_extra['field'])) { diff --git a/modules-available/exams/page.inc.php b/modules-available/exams/page.inc.php index 8787f498..8707c4ae 100644 --- a/modules-available/exams/page.inc.php +++ b/modules-available/exams/page.inc.php @@ -343,7 +343,7 @@ class Page_Exams extends Page } else { Message::addInfo('exam-added-success'); } - Util::redirect('?do=exams'); + Util::redirect('?do=exams', 200); } // Edit diff --git a/modules-available/rebootcontrol/pages/exec.inc.php b/modules-available/rebootcontrol/pages/exec.inc.php index 422f88f8..6f652354 100644 --- a/modules-available/rebootcontrol/pages/exec.inc.php +++ b/modules-available/rebootcontrol/pages/exec.inc.php @@ -29,7 +29,7 @@ class SubPage } $task = RebootControl::runScript($machines, $script, 15); if (Taskmanager::isTask($task)) { - Util::redirect("?do=rebootcontrol&show=task&what=task&taskid=" . $task["id"]); + Util::redirect("?do=rebootcontrol&show=task&what=task&taskid=" . $task["id"], 200); } } diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index 3bbe50dd..0ddbcfd4 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -1031,9 +1031,11 @@ class Page_ServerSetup extends Page $locationId = Request::post('locationid', false, 'int'); $loc = Location::get($locationId); if ($loc === false) { + Audit::overrideResponseCode(404); Message::addError('locations.invalid-location-id', $locationId); return; } + Audit::overrideResponseCode(200); User::assertPermission('ipxe.menu.assign', $locationId); $menuId = Request::post('menuid', false, 'int'); if ($menuId === 0) { diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index b8717fb8..a2a51ce6 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -174,7 +174,7 @@ class Page_Statistics extends Page } $task = RebootControl::execute($allowedMachines, $action, 0); if (Taskmanager::isTask($task)) { - Util::redirect("?do=rebootcontrol&show=task&what=task&taskid=" . $task["id"]); + Util::redirect("?do=rebootcontrol&show=task&what=task&taskid=" . $task["id"], 200); } } @@ -235,7 +235,7 @@ class Page_Statistics extends Page $allowedLocations = User::getAllowedLocations("machine.delete"); if (empty($allowedLocations)) { Message::addError('main.no-permission'); - Util::redirect('?do=statistics'); + return; } $res = Database::simpleQuery('SELECT machineuuid, locationid FROM machine WHERE machineuuid IN (:ids)', compact('ids')); $ids = array_flip($ids); @@ -248,7 +248,10 @@ class Page_Statistics extends Page Message::addError('locations.no-permission-location', $row['locationid']); } } - if (!empty($delete)) { + if (empty($delete)) { + Audit::overrideResponseCode(403); + } else { + Audit::overrideResponseCode(200); if ($soft) { // "Soft delete" -- keep all data, but set IP address to 0.0.0.0, so it will not be assigned to its // old location anymore. Upon next boot some time in the future, the machine is hopefully relocated diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php index f1199db7..bd94ebe9 100644 --- a/modules-available/sysconfig/addmodule_custommodule.inc.php +++ b/modules-available/sysconfig/addmodule_custommodule.inc.php @@ -138,6 +138,7 @@ class CustomModule_CompressModule extends AddModule_Base } Session::set('mod_temp', false); // Yay + Audit::overrideResponseCode(200); if ($this->edit !== null) { Message::addSuccess('module-edited'); } else { |
