vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

reworked device presets:

Browse source 
- devices with no preset defined have a 'allow all' default policy
- users customizations to the preset are stored on redis (both 'allow' and 'drop' policies) as exceptions to the default preset
- default presets updates are allowed, however users customizations have priority (per protocol)
This commit is contained in:
Alfredo Cardigliano 2018-10-01 18:15:18 +02:00
parent 1b4165a376
commit 4653cbe44d
7 changed files with 207 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/lua/admin/get_device_protocols.lua
View file

@ -69,17 +69,18 @@ if(sortOrder == "desc") then sOrder = rev_insensitive else sOrder = asc_insensit
local device_policies = presets_utils.getDevicePolicies(device_type)
local function matchesPolicyFilter(item_name)
local function matchesPolicyFilter(item_id)
if isEmptyString(policy_filter) then
return true
end
local policy = device_policies[item_name]
local policy = device_policies[tonumber(item_id)]
if policy == nil then
if policy_filter ~= presets_utils.DEFAULT_ACTION then -- != default
return false
end
elseif policy_filter ~= policy.clientActionId and policy_filter ~= policy.serverActionId then
elseif policy.clientActionId ~= nil and policy_filter ~= policy.clientActionId and
policy.serverActionId ~= nil and policy_filter ~= policy.serverActionId then
return false
end
@ -101,11 +102,11 @@ local num_items = 0
items = interface.getnDPIProtocols(nil, true)
for item_name, item_id in pairs(items) do
if not matchesProtoFilter(item_id) or not matchesPolicyFilter(item_name) then
if not matchesProtoFilter(item_id) or not matchesPolicyFilter(item_id) then
goto continue
end
items[item_name] = { name = item_name, id = item_id, conf = device_policies[item_name] }
items[item_name] = { name = item_name, id = item_id, conf = device_policies[tonumber(item_id)] }
num_items = num_items + 1
if sortColumn == "column_" or sortColumn == "column_ndpi_application" then