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

Add permission support to Oxidized config search (#11928)

Browse Source
This commit is contained in:
Jellyfrog
2020-07-22 03:34:42 +02:00
committed by GitHub
parent dba165c49e
commit 3c78e0ccc7
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/html/forms/search-oxidized-config.inc.php
View File

@@ -15,11 +15,11 @@ $status = 'error';
$message = 'unknown error';
$parameters = clean($_POST['search_in_conf_textbox']);
if (isset($parameters)) {
$status = 'ok';
$message = 'Queried';
$output = search_oxidized_config($parameters);
if ($output = search_oxidized_config($parameters)) {
$status = 'ok';
}
} else {
$status = 'error';
$message = 'ERROR: Could not query';
}
echo display(_json_encode(array(

12
includes/html/functions.inc.php
View File

@@ -1104,6 +1104,10 @@ function get_rules_from_json()
function search_oxidized_config($search_in_conf_textbox)
{
if (!Auth::user()->hasGlobalRead()) {
return false;
}
$oxidized_search_url = Config::get('oxidized.url') . '/nodes/conf_search?format=json';
$postdata = http_build_query(
array(
@@ -1125,6 +1129,14 @@ function search_oxidized_config($search_in_conf_textbox)
$dev = device_by_name($n['node']);
$n['dev_id'] = $dev ? $dev['device_id'] : false;
}
/*
// Filter nodes we don't have access too
$nodes = array_filter($nodes, function($device) {
return \Permissions::canAccessDevice($device['dev_id'], Auth::id());
});
*/
return $nodes;
}