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

update(userspace/engine): address jasondellaluce comments for maintainability

Browse Source 
Signed-off-by: Lorenzo Susini <susinilorenzo1@gmail.com>
This commit is contained in:
Lorenzo Susini
2023-09-27 09:22:38 +00:00
committed by poiana
parent 9bbf9716b6
commit 1326ca356e
9 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
userspace/engine/rule_loader_collector.cpp
View File

@@ -145,19 +145,13 @@ const indexed_vector<rule_loader::rule_info>& rule_loader::collector::rules() co
void rule_loader::collector::define(configuration& cfg, engine_version_info& info)
{
auto engine_version = sinsp_version(falco_engine::engine_version());
sinsp_version required_engine_version(info.version);
THROW(!required_engine_version.m_valid, "Unable to parse " + info.version
+ " as a semver string. Expected \"x.y.z\" semver format.", info.ctx);
THROW(!engine_version.check(required_engine_version), "Rules require engine version "
+ required_engine_version.as_string() + " but engine version is "
+ engine_version.as_string(), info.ctx);
sinsp_version current_required_engine_version(m_required_engine_version.version);
auto v = falco_engine::engine_version();
THROW(!v.compatible_with(info.version), "Rules require engine version "
+ info.version.as_string() + ", but engine version is " + v.as_string(),
info.ctx);
// Store max required_engine_version
if(current_required_engine_version.check(required_engine_version))
if(m_required_engine_version.version < info.version)
{
m_required_engine_version = info;
}
@@ -169,7 +163,7 @@ void rule_loader::collector::define(configuration& cfg, plugin_version_info& inf
for (const auto& req : info.alternatives)
{
sinsp_version plugin_version(req.version);
THROW(!plugin_version.m_valid,
THROW(!plugin_version.is_valid(),
"Invalid required version '" + req.version
+ "' for plugin '" + req.name + "'",
info.ctx);