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

refactor(userspace/engine): remove source field from macros in rule loader

Browse Source 
Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>
This commit is contained in:
Jason Dellaluce
2022-06-24 15:46:30 +00:00
committed by poiana
parent 555bf9971c
commit 3c2effb498
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
userspace/engine/rule_loader.cpp
View File

@@ -413,18 +413,6 @@ void rule_loader::append(configuration& cfg, list_info& info)
void rule_loader::define(configuration& cfg, macro_info& info) void rule_loader::define(configuration& cfg, macro_info& info)
{ {
if (!cfg.sources.at(info.source))
{
cfg.warnings.push_back("Macro " + info.name
+ ": warning (unknown-source): unknown source "
+ info.source + ", skipping");
return;
}
auto prev = m_macro_infos.at(info.name);
THROW(prev && prev->source != info.source,
"Macro " + info.name + " has been re-defined with a different source");
define_info(m_macro_infos, info, m_cur_index++); define_info(m_macro_infos, info, m_cur_index++);
} }
@@ -566,7 +554,6 @@ void rule_loader::compile_macros_infos(
indexed_vector<list_info>& lists, indexed_vector<list_info>& lists,
indexed_vector<macro_info>& out) const indexed_vector<macro_info>& out) const
{ {
set<string> used;
const context* info_ctx = NULL; const context* info_ctx = NULL;
try try
{ {

1
userspace/engine/rule_loader.h
View File

@@ -122,7 +122,6 @@ public:
size_t visibility; size_t visibility;
std::string name; std::string name;
std::string cond; std::string cond;
std::string source;
std::shared_ptr<libsinsp::filter::ast::expr> cond_ast; std::shared_ptr<libsinsp::filter::ast::expr> cond_ast;
}; };

2
userspace/engine/rule_reader.cpp
View File

@@ -207,12 +207,10 @@ static void read_item(
rule_loader::macro_info v; rule_loader::macro_info v;
v.ctx = ctx; v.ctx = ctx;
bool append = false; bool append = false;
v.source = falco_common::syscall_source;
THROW(!decode_val(item["macro"], v.name) || v.name.empty(), THROW(!decode_val(item["macro"], v.name) || v.name.empty(),
"Macro name is empty"); "Macro name is empty");
THROW(!decode_val(item["condition"], v.cond) || v.cond.empty(), THROW(!decode_val(item["condition"], v.cond) || v.cond.empty(),
"Macro must have property condition"); "Macro must have property condition");
decode_val(item["source"], v.source);
if(decode_val(item["append"], append) && append) if(decode_val(item["append"], append) && append)
{ {
loader.append(cfg, v); loader.append(cfg, v);