github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-09-16 23:08:16 +00:00
Code Issues Projects Releases Wiki Activity

fix(userspace/falco): init cmdline options after loading all config files.

Browse Source 
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
This commit is contained in:
Federico Di Pierro
2025-02-13 12:12:22 +01:00
committed by poiana
parent 7c8bdf0c9e
commit 252eb5cd40
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
userspace/falco/configuration.cpp
View File

@@ -133,12 +133,20 @@ config_loaded_res falco_configuration::init_from_file(
std::cerr << "Cannot read config file (" + conf_filename + "): " + e.what() + "\n"; std::cerr << "Cannot read config file (" + conf_filename + "): " + e.what() + "\n";
throw e; throw e;
} }
init_cmdline_options(cmdline_options);
// Only report top most schema validation status // Only report top most schema validation status
res[conf_filename] = validation_status[0]; res[conf_filename] = validation_status[0];
// Load any `-o config_files=foo.yaml` cmdline additional option
load_cmdline_config_files(cmdline_options);
// Merge all config files (both from main falco.yaml and `-o config_files=foo.yaml`)
merge_config_files(conf_filename, res); merge_config_files(conf_filename, res);
// Load all other `-o` cmdline options to override any config key
init_cmdline_options(cmdline_options);
// Finally load the parsed config to our structure
load_yaml(conf_filename); load_yaml(conf_filename);
return res; return res;
@@ -766,6 +774,16 @@ static bool split(const std::string &str, char delim, std::pair<std::string, std
return true; return true;
} }
void falco_configuration::load_cmdline_config_files(
const std::vector<std::string> &cmdline_options) {
for(const std::string &option : cmdline_options) {
// Set all config_files options
if(option.rfind(yaml_helper::configs_key, 0) == 0) {
set_cmdline_option(option);
}
}
}
void falco_configuration::init_cmdline_options(const std::vector<std::string> &cmdline_options) { void falco_configuration::init_cmdline_options(const std::vector<std::string> &cmdline_options) {
for(const std::string &option : cmdline_options) { for(const std::string &option : cmdline_options) {
set_cmdline_option(option); set_cmdline_option(option);

2
userspace/falco/configuration.h
View File

@@ -221,6 +221,8 @@ private:
void init_logger(); void init_logger();
void load_engine_config(const std::string& config_name); void load_engine_config(const std::string& config_name);
void init_cmdline_options(const std::vector<std::string>& cmdline_options); void init_cmdline_options(const std::vector<std::string>& cmdline_options);
void load_cmdline_config_files(const std::vector<std::string>& cmdline_options);
/** /**
* Given a <key>=<value> specifier, set the appropriate option * Given a <key>=<value> specifier, set the appropriate option
* in the underlying yaml config. <key> can contain '.' * in the underlying yaml config. <key> can contain '.'