mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved some pages to be within admin route (#13782)

Browse Source 
* Moved plugin admin pages to be within admin route
* Wrap html transports page in admin check
* Moved Port group controller to be admin protected
* fixed tests
This commit is contained in:
Neil Lathwood
2022-02-14 07:40:30 +00:00
committed by GitHub
parent 4c9d4eefd8
commit 95970af78e
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
includes/html/pages/alert-transports.inc.php
View File

@@ -1,29 +1,33 @@
<?php <?php
// handle OAuth requests if (Auth::user()->hasGlobalAdmin()) {
$request = request(); // grab the Request object // handle OAuth requests
$request = request(); // grab the Request object
if ($request->has('oauthtransport')) { if ($request->has('oauthtransport')) {
// make sure transport is safe // make sure transport is safe
$validator = Validator::make($request->all(), ['oauthtransport' => 'required|alpha']); $validator = Validator::make($request->all(), ['oauthtransport' => 'required|alpha']);
if ($validator->passes()) { if ($validator->passes()) {
$transport_name = $request->get('oauthtransport'); $transport_name = $request->get('oauthtransport');
$class = \LibreNMS\Alert\Transport::getClass($transport_name); $class = \LibreNMS\Alert\Transport::getClass($transport_name);
if (class_exists($class)) { if (class_exists($class)) {
$transport = app($class); $transport = app($class);
if ($transport->handleOauth($request)) { if ($transport->handleOauth($request)) {
flash()->addSuccess("$transport_name added successfully."); flash()->addSuccess("$transport_name added successfully.");
} else { } else {
flash()->addError("$transport_name was not added. Check the log for details."); flash()->addError("$transport_name was not added. Check the log for details.");
}
} }
} }
// remove get variables otherwise things will get double added
echo '<script>window.history.replaceState(null, null, window.location.pathname);</script>';
} }
unset($request);
// remove get variables otherwise things will get double added // print alert transports
echo '<script>window.history.replaceState(null, null, window.location.pathname);</script>'; require_once 'includes/html/print-alert-transports.php';
} else {
include 'includes/html/error-no-perm.inc.php';
} }
unset($request);
// print alert transports
require_once 'includes/html/print-alert-transports.php';

10
routes/web.php
View File

@@ -22,7 +22,6 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
// pages // pages
Route::post('alert/{alert}/ack', [\App\Http\Controllers\AlertController::class, 'ack'])->name('alert.ack'); Route::post('alert/{alert}/ack', [\App\Http\Controllers\AlertController::class, 'ack'])->name('alert.ack');
Route::resource('device-groups', 'DeviceGroupController'); Route::resource('device-groups', 'DeviceGroupController');
Route::resource('port-groups', 'PortGroupController');
Route::resource('port', 'PortController', ['only' => 'update']); Route::resource('port', 'PortController', ['only' => 'update']);
Route::group(['prefix' => 'poller'], function () { Route::group(['prefix' => 'poller'], function () {
Route::get('', 'PollerController@pollerTab')->name('poller.index'); Route::get('', 'PollerController@pollerTab')->name('poller.index');
@@ -75,11 +74,14 @@ Route::group(['middleware' => ['auth'], 'guard' => 'auth'], function () {
Route::delete('settings/{name}', 'SettingsController@destroy')->name('settings.destroy'); Route::delete('settings/{name}', 'SettingsController@destroy')->name('settings.destroy');
Route::post('alert/transports/{transport}/test', [\App\Http\Controllers\AlertTransportController::class, 'test'])->name('alert.transports.test'); Route::post('alert/transports/{transport}/test', [\App\Http\Controllers\AlertTransportController::class, 'test'])->name('alert.transports.test');
Route::get('plugin/settings', 'PluginAdminController')->name('plugin.admin');
Route::get('plugin/settings/{plugin:plugin_name}', 'PluginSettingsController')->name('plugin.settings');
Route::post('plugin/settings/{plugin:plugin_name}', 'PluginSettingsController@update')->name('plugin.update');
Route::resource('port-groups', 'PortGroupController');
}); });
Route::get('plugin/settings', 'PluginAdminController')->name('plugin.admin');
Route::get('plugin/settings/{plugin:plugin_name}', 'PluginSettingsController')->name('plugin.settings');
Route::post('plugin/settings/{plugin:plugin_name}', 'PluginSettingsController@update')->name('plugin.update');
Route::get('plugin', 'PluginLegacyController@redirect'); Route::get('plugin', 'PluginLegacyController@redirect');
Route::redirect('plugin/view=admin', '/plugin/admin'); Route::redirect('plugin/view=admin', '/plugin/admin');
Route::get('plugin/p={pluginName}', 'PluginLegacyController@redirect'); Route::get('plugin/p={pluginName}', 'PluginLegacyController@redirect');