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

refactor(engine): support string config loading and add ad-hoc methods

Browse Source 
This is a change of direction from the current design, that imposes loading
the configuration from file only, and in the object constructor. Instead,
yaml_configuration objects can now be reused ad can load the YAML config
from either file or string. This also makes it easier to unit test this class.

Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>
This commit is contained in:
Jason Dellaluce
2021-11-17 13:53:52 +00:00
committed by poiana
parent 205a8fd23b
commit 7781385769
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
userspace/falco/configuration.cpp
View File

@@ -54,7 +54,16 @@ falco_configuration::~falco_configuration()
void falco_configuration::init(string conf_filename, list<string> &cmdline_options) void falco_configuration::init(string conf_filename, list<string> &cmdline_options)
{ {
string m_config_file = conf_filename; string m_config_file = conf_filename;
m_config = new yaml_configuration(m_config_file); m_config = new yaml_configuration();
try
{
m_config->load_from_file(m_config_file);
}
catch(const std::exception& e)
{
std::cerr << "Cannot read config file (" + m_config_file + "): " + e.what() + "\n";
throw e;
}
init_cmdline_options(cmdline_options); init_cmdline_options(cmdline_options);

32
userspace/falco/configuration.h
View File

@@ -35,26 +35,28 @@ limitations under the License.
class yaml_configuration class yaml_configuration
{ {
public: public:
std::string m_path; /**
yaml_configuration(const std::string& path) * Load the YAML document represented by the input string.
*/
void load_from_string(const std::string& input)
{ {
m_path = path; m_root = YAML::Load(input);
YAML::Node config; }
std::vector<falco::outputs::config> outputs;
try /**
* Load the YAML document from the given file path.
*/
void load_from_file(const std::string& path)
{ {
m_root = YAML::LoadFile(path); m_root = YAML::LoadFile(path);
} }
catch(const YAML::BadFile& ex)
/**
* Clears the internal loaded document.
*/
void clear()
{ {
std::cerr << "Error reading config file (" + path + "): " + ex.what() + "\n"; m_root = YAML::Node();
throw;
}
catch(const YAML::ParserException& ex)
{
std::cerr << "Cannot read config file (" + path + "): " + ex.what() + "\n";
throw;
}
} }
/** /**