vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-02 00:40:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reworking capabilities support

Browse source
This commit is contained in:
Alfredo Cardigliano 2023-01-09 18:46:40 +01:00
parent 8fd7420b69
commit 7da1395b87
16 changed files with 251 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

32
scripts/lua/rest/v2/add/ntopng/user.lua
View file

@ -33,13 +33,28 @@ local confirm_password = _POST["confirm_password"]
local host_role = _POST["user_role"]
local networks = _POST["allowed_networks"]
local allowed_interface = _POST["allowed_interface"]
local allow_historical_flow = _POST["allow_historical_flow"] or false
local language = _POST["add_user_language"]
local allow_pcap_download = _POST["allow_pcap_download"]
local host_pool_id = _POST["host_pool_id"]
local allow_historical_flows = _POST["allow_historical_flows"]
local allow_alerts = _POST["allow_alerts"]
local allow_pcap_download = _POST["allow_pcap_download"]
if allow_historical_flow == "1" then
allow_historical_flow = true
if allow_historical_flows == "1" then
allow_historical_flows = true
else
allow_historical_flows = false
end
if allow_alerts == "1" then
allow_alerts = true
else
allow_alerts = false
end
if allow_pcap_download == "1" then
allow_pcap_download = true
else
allow_pcap_download = false
end
if username == nil or full_name == nil or password == nil or
@ -65,14 +80,9 @@ if(all_users[username] ~= nil) then
return
end
local allow_pcap_download_enabled = false
if _POST["allow_pcap_download"] and _POST["allow_pcap_download"] == "1" then
allow_pcap_download_enabled = true
end
if not ntop.addUser(username, full_name, password, host_role, networks,
getInterfaceName(allowed_interface), host_pool_id, language, allow_pcap_download_enabled, allow_historical_flow) then
getInterfaceName(allowed_interface), host_pool_id, language,
allow_pcap_download, allow_historical_flows, allow_alerts) then
rest_utils.answer(rest_utils.consts.err.add_user_failed, res)
return
end

29
scripts/lua/rest/v2/edit/ntopng/user.lua
View file

@ -32,7 +32,8 @@ local networks = _POST["allowed_networks"]
local allowed_interface = _POST["allowed_interface"]
local language = _POST["user_language"]
local allow_pcap_download = _POST["allow_pcap_download"]
local allow_historical_flow = _POST["allow_historical_flow"]
local allow_historical_flows = _POST["allow_historical_flows"]
local allow_alerts = _POST["allow_alerts"]
local password = _POST["password"]
local confirm_password = _POST["confirm_password"]
@ -45,11 +46,12 @@ if host_role == nil and
networks == nil and
allowed_interface == nil and
allow_pcap_download == nil and
allow_alerts == nil and
language == nil and
full_name == nil and
(password == nil or confirm_password == nil) and
host_pool_id == nil and
allow_historical_flow == nil then
allow_historical_flows == nil then
rest_utils.answer(rest_utils.consts.err.invalid_args, res)
return
end
@ -103,7 +105,7 @@ if(allow_pcap_download ~= nil) then
if(tonumber(allow_pcap_download) == 1) then
allow_pcap_download_enabled = true;
end
if(not ntop.changeUserPermission(username, allow_pcap_download_enabled)) then
if(not ntop.changePcapDownloadPermission(username, allow_pcap_download_enabled)) then
rest_utils.answer(rest_utils.consts.err.edit_user_failed, res)
return
end
@ -129,12 +131,23 @@ if(password ~= nil and confirm_password ~= nil) then
end
end
if(allow_historical_flow ~= nil) then
local allow_historical_flow_enabled = false
if(tonumber(allow_historical_flow) == 1) then
allow_historical_flow_enabled = true;
if(allow_historical_flows ~= nil) then
local allow_historical_flows_enabled = false
if(tonumber(allow_historical_flows) == 1) then
allow_historical_flows_enabled = true;
end
if(not ntop.changeHistoricalFlowPermission(username, allow_historical_flow_enabled)) then
if(not ntop.changeHistoricalFlowPermission(username, allow_historical_flows_enabled)) then
rest_utils.answer(rest_utils.consts.err.edit_user_failed, res)
return
end
end
if(allow_alerts ~= nil) then
local allow_alerts_enabled = false
if(tonumber(allow_alerts) == 1) then
allow_alerts_enabled = true;
end
if(not ntop.changeAlertsPermission(username, allow_alerts_enabled)) then
rest_utils.answer(rest_utils.consts.err.edit_user_failed, res)
return
end