github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-03 09:56:45 +00:00
Code Issues Projects Releases Wiki Activity

fix(userspace/falco): preserve config's plugin loading order

Browse Source 
Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>
This commit is contained in:
Jason Dellaluce 2023-04-26 10:22:22 +00:00 committed by poiana
parent 8926022035
commit 4d24a02ad6
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
userspace/falco/configuration.cpp
View File

@ -336,11 +336,11 @@ void falco_configuration::load_yaml(const std::string& config_name, const yaml_h
config.get_sequence<std::unordered_set<std::string>>(m_base_syscalls_custom_set, std::string("base_syscalls.custom_set")); config.get_sequence<std::unordered_set<std::string>>(m_base_syscalls_custom_set, std::string("base_syscalls.custom_set"));
m_base_syscalls_repair = config.get_scalar<bool>("base_syscalls.repair", false); m_base_syscalls_repair = config.get_scalar<bool>("base_syscalls.repair", false);
std::set<std::string> load_plugins; std::vector<std::string> load_plugins;
bool load_plugins_node_defined = config.is_defined("load_plugins"); bool load_plugins_node_defined = config.is_defined("load_plugins");
config.get_sequence<std::set<std::string>>(load_plugins, "load_plugins"); config.get_sequence<std::vector<std::string>>(load_plugins, "load_plugins");
std::list<falco_configuration::plugin_config> plugins; std::list<falco_configuration::plugin_config> plugins;
try try
@ -358,14 +358,32 @@ void falco_configuration::load_yaml(const std::string& config_name, const yaml_h
// If load_plugins was specified, only save plugins matching those in values // If load_plugins was specified, only save plugins matching those in values
m_plugins.clear(); m_plugins.clear();
for (auto &p : plugins) if (!load_plugins_node_defined)
{ {
// If load_plugins was not specified at all, every // If load_plugins was not specified at all, every plugin is added.
// plugin is added. Otherwise, the plugin must be in // The loading order is the same as the sequence in the YAML config.
// the load_plugins list. m_plugins = { plugins.begin(), plugins.end() };
if(!load_plugins_node_defined || load_plugins.find(p.m_name) != load_plugins.end()) }
else
{
// If load_plugins is specified, only plugins contained in its list
// are added, with the same order as in the list.
for (const auto& pname : load_plugins)
{
bool found = false;
for (const auto& p : plugins)
{
if (pname == p.m_name)
{ {
m_plugins.push_back(p); m_plugins.push_back(p);
found = true;
break;
}
}
if (!found)
{
throw std::logic_error("Cannot load plugin '" + pname + "': plugin config not found for given name");
}
} }
} }