vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 23:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes missing information when loading plugins with no manifest

Browse source 
Fixes #5163
This commit is contained in:
Simone Mainardi 2021-04-12 09:29:45 +02:00
parent 6ae469ff98
commit 10ee722da4
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/lua/modules/plugins_utils.lua
View file

@ -19,6 +19,9 @@ local dirs = ntop.getDirs()
-- enable debug tracing
local do_trace = false
-- How deep the recursive plugins search should go into subdirectories
local MAX_RECURSION = 2
plugins_utils.COMMUNITY_SOURCE_DIR = os_utils.fixPath(dirs.scriptdir .. "/plugins")
plugins_utils.PRO_SOURCE_DIR = os_utils.fixPath(dirs.installdir .. "/pro/scripts/pro_plugins")
plugins_utils.ENTERPRISE_M_SOURCE_DIR = os_utils.fixPath(dirs.installdir .. "/pro/scripts/enterprise_m_plugins")
@ -112,9 +115,15 @@ local function recursivePluginsSearch(edition, source_dir, max_recursion, plugin
else
plugins[plugin_name] = metadata
end
elseif ntop.isdir(plugin_dir) and max_recursion > 0 then
-- Recursively see if this is a directory containing other plugins
recursivePluginsSearch(edition, plugin_dir, max_recursion - 1, plugins, plugins_with_deps)
elseif ntop.isdir(plugin_dir) then
if max_recursion > 0 then
-- Recursively see if this is a directory containing other plugins
recursivePluginsSearch(edition, plugin_dir, max_recursion - 1, plugins, plugins_with_deps)
else
-- Maxmimum recursion hit. must stop
traceError(TRACE_ERROR, TRACE_CONSOLE, string.format("Unable to load '%s'. Missing 'manifest.lua'", plugin_dir))
return
end
end
::continue::
@ -148,7 +157,7 @@ local function listPlugins(community_plugins_only)
local edition = source_conf[1]
local source_dir = source_conf[2]
recursivePluginsSearch(edition, source_dir, 3, plugins, plugins_with_deps)
recursivePluginsSearch(edition, source_dir, MAX_RECURSION, plugins, plugins_with_deps)
end
-- Add plugins without dependencies to the result