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

fix: fix some broken tests

Browse Source 
Signed-off-by: Andrea Terzolo <andreaterzolo3@gmail.com>
This commit is contained in:
Andrea Terzolo 2023-11-23 19:43:08 +01:00 committed by poiana
parent 249ccf2f4b
commit 4443e9d64f
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unit_tests/falco/app/actions/test_load_config.cpp
View File

@ -46,11 +46,10 @@ TEST(ActionLoadConfig, check_engine_config_is_correctly_parsed)
EXPECT_TRUE(s.config->m_gvisor.m_config.empty()); EXPECT_TRUE(s.config->m_gvisor.m_config.empty());
EXPECT_TRUE(s.config->m_gvisor.m_root.empty()); EXPECT_TRUE(s.config->m_gvisor.m_root.empty());
// Check that deprecated configs are not populated since we are using // Check that deprecated configs are always set since
// the new config. EXPECT_EQ(s.config->m_syscall_buf_size_preset, 6);
EXPECT_EQ(s.config->m_syscall_buf_size_preset, 0); EXPECT_EQ(s.config->m_cpus_for_each_syscall_buffer, 7);
EXPECT_EQ(s.config->m_cpus_for_each_syscall_buffer, 0); EXPECT_TRUE(s.config->m_syscall_drop_failed_exit);
EXPECT_FALSE(s.config->m_syscall_drop_failed_exit);
} }
// Equal to the one above but checks that the command line options are not parsed // Equal to the one above but checks that the command line options are not parsed
@ -82,11 +81,10 @@ TEST(ActionLoadConfig, check_command_line_options_are_not_used)
EXPECT_TRUE(s.config->m_gvisor.m_config.empty()); EXPECT_TRUE(s.config->m_gvisor.m_config.empty());
EXPECT_TRUE(s.config->m_gvisor.m_root.empty()); EXPECT_TRUE(s.config->m_gvisor.m_root.empty());
// Check that deprecated configs are not populated since we are using // Check that deprecated configs are always set since
// the new config. EXPECT_EQ(s.config->m_syscall_buf_size_preset, 6);
EXPECT_EQ(s.config->m_syscall_buf_size_preset, 0); EXPECT_EQ(s.config->m_cpus_for_each_syscall_buffer, 7);
EXPECT_EQ(s.config->m_cpus_for_each_syscall_buffer, 0); EXPECT_TRUE(s.config->m_syscall_drop_failed_exit);
EXPECT_FALSE(s.config->m_syscall_drop_failed_exit);
} }
TEST(ActionLoadConfig, check_kmod_with_syscall_configs) TEST(ActionLoadConfig, check_kmod_with_syscall_configs)

10
userspace/falco/configuration.cpp
View File

@ -124,6 +124,11 @@ void falco_configuration::load_engine_config(const std::string& config_name, con
throw std::logic_error("Error reading config file (" + config_name + "): engine.kind '"+ driver_mode_str + "' is not a valid kind."); throw std::logic_error("Error reading config file (" + config_name + "): engine.kind '"+ driver_mode_str + "' is not a valid kind.");
} }
// Catch deprecated values from the config, to use them with the command line if needed
m_syscall_buf_size_preset = config.get_scalar<int16_t>("syscall_buf_size_preset", DEFAULT_BUF_SIZE_PRESET);
m_cpus_for_each_syscall_buffer = config.get_scalar<uint16_t>("modern_bpf.cpus_for_each_syscall_buffer", DEFAULT_CPUS_FOR_EACH_SYSCALL_BUFFER);
m_syscall_drop_failed_exit = config.get_scalar<bool>("syscall_drop_failed_exit", DEFAULT_DROP_FAILED_EXIT);
switch (m_engine_mode) switch (m_engine_mode)
{ {
case engine_kind_t::KMOD: case engine_kind_t::KMOD:
@ -178,11 +183,6 @@ void falco_configuration::load_engine_config(const std::string& config_name, con
// Please note that `load_config` could be called more than one time during initialization // Please note that `load_config` could be called more than one time during initialization
// so the last time wins, the load config phase should be idempotent // so the last time wins, the load config phase should be idempotent
m_changes_in_engine_config = true; m_changes_in_engine_config = true;
// Catch deprecated values from the config, to use them with the command line if needed
m_syscall_buf_size_preset = config.get_scalar<int16_t>("syscall_buf_size_preset", DEFAULT_BUF_SIZE_PRESET);
m_cpus_for_each_syscall_buffer = config.get_scalar<uint16_t>("modern_bpf.cpus_for_each_syscall_buffer", DEFAULT_CPUS_FOR_EACH_SYSCALL_BUFFER);
m_syscall_drop_failed_exit = config.get_scalar<bool>("syscall_drop_failed_exit", DEFAULT_DROP_FAILED_EXIT);
} }
void falco_configuration::load_yaml(const std::string& config_name, const yaml_helper& config) void falco_configuration::load_yaml(const std::string& config_name, const yaml_helper& config)