diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index 64057825e21..3a6fd02a00b 100644 --- a/cmake/modules/driver.cmake +++ b/cmake/modules/driver.cmake @@ -34,8 +34,8 @@ else() # In case you want to test against another driver version (or branch, or commit) just pass the variable - # ie., `cmake -DDRIVER_VERSION=dev ..` if(NOT DRIVER_VERSION) - set(DRIVER_VERSION "6.0.1+driver") - set(DRIVER_CHECKSUM "SHA256=2b4412b5053c8ed5bd1a9de745faa16ec0210dc65dc858af65951d4c8d22207c") + set(DRIVER_VERSION "5b4e28d44f9c87aa23f24c53c6bfb696b2b47635") + set(DRIVER_CHECKSUM "SHA256=aee481525810c571a852e8e269d9d1688da82d65ec07623f12c11bf1503ddef9") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index a9b98bc2aa0..8ff4dfd59ae 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -35,8 +35,8 @@ else() # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` if(NOT FALCOSECURITY_LIBS_VERSION) - set(FALCOSECURITY_LIBS_VERSION "00fa5c5196edf5858daf229ec8a96756d22fa854") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=d7fd77830f97406828e7dd41bcd3178d54075c91638a8e40492d4e864457548a") + set(FALCOSECURITY_LIBS_VERSION "5b4e28d44f9c87aa23f24c53c6bfb696b2b47635") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=aee481525810c571a852e8e269d9d1688da82d65ec07623f12c11bf1503ddef9") endif() # cd /path/to/build && cmake /path/to/source @@ -88,6 +88,8 @@ set(USE_BUNDLED_B64 ON CACHE BOOL "") set(USE_BUNDLED_JSONCPP ON CACHE BOOL "") set(USE_BUNDLED_VALIJSON ON CACHE BOOL "") set(USE_BUNDLED_RE2 ON CACHE BOOL "") +set(USE_BUNDLED_UTHASH ON CACHE BOOL "") +set(USE_BUNDLED_TINYDIR ON CACHE BOOL "") list(APPEND CMAKE_MODULE_PATH "${FALCOSECURITY_LIBS_SOURCE_DIR}/cmake/modules") diff --git a/unit_tests/engine/test_rulesets.cpp b/unit_tests/engine/test_rulesets.cpp index d0218b45d2a..4d2fcf28bb9 100644 --- a/unit_tests/engine/test_rulesets.cpp +++ b/unit_tests/engine/test_rulesets.cpp @@ -23,9 +23,9 @@ limitations under the License. #define RULESET_2 2 /* Helpers methods */ -static std::shared_ptr create_factory() +static std::shared_ptr create_factory(filter_check_list& list) { - std::shared_ptr ret(new sinsp_filter_factory(NULL)); + std::shared_ptr ret(new sinsp_filter_factory(NULL, list)); return ret; } @@ -53,7 +53,8 @@ static std::shared_ptr create_filter( TEST(Ruleset, enable_disable_rules_using_names) { - auto f = create_factory(); + sinsp_filter_check_list filterlist; + auto f = create_factory(filterlist); auto r = create_ruleset(f); auto ast = create_ast(f); auto filter = create_filter(f, ast); @@ -119,7 +120,8 @@ TEST(Ruleset, enable_disable_rules_using_names) TEST(Ruleset, enable_disable_rules_using_tags) { - auto f = create_factory(); + sinsp_filter_check_list filterlist; + auto f = create_factory(filterlist); auto r = create_ruleset(f); auto ast = create_ast(f); auto filter = create_filter(f, ast); diff --git a/unit_tests/falco/app/actions/test_configure_interesting_sets.cpp b/unit_tests/falco/app/actions/test_configure_interesting_sets.cpp index 277832d7821..f97016149b5 100644 --- a/unit_tests/falco/app/actions/test_configure_interesting_sets.cpp +++ b/unit_tests/falco/app/actions/test_configure_interesting_sets.cpp @@ -77,11 +77,12 @@ static std::shared_ptr mock_engine_from_filters(const strset_t& fi } // create a falco engine and load the ruleset + sinsp_filter_check_list filterlist; std::shared_ptr res(new falco_engine()); auto filter_factory = std::shared_ptr( - new sinsp_filter_factory(nullptr)); + new sinsp_filter_factory(nullptr, filterlist)); auto formatter_factory = std::shared_ptr( - new sinsp_evt_formatter_factory(nullptr)); + new sinsp_evt_formatter_factory(nullptr, filterlist)); res->add_source(s_sample_source, filter_factory, formatter_factory); res->load_rules(dummy_rules, "dummy_rules.yaml"); res->enable_rule("", true, s_sample_ruleset); diff --git a/userspace/engine/falco_engine_version.h b/userspace/engine/falco_engine_version.h index 8e8bac203ec..bd2a7fcc98b 100644 --- a/userspace/engine/falco_engine_version.h +++ b/userspace/engine/falco_engine_version.h @@ -20,7 +20,7 @@ limitations under the License. // The version of this Falco engine #define FALCO_ENGINE_VERSION_MAJOR 0 -#define FALCO_ENGINE_VERSION_MINOR 26 +#define FALCO_ENGINE_VERSION_MINOR 27 #define FALCO_ENGINE_VERSION_PATCH 0 #define FALCO_ENGINE_VERSION \ @@ -34,4 +34,4 @@ limitations under the License. // It represents the fields supported by this version of Falco, // the event types, and the underlying driverevent schema. It's used to // detetect changes in engine version in our CI jobs. -#define FALCO_ENGINE_CHECKSUM "df5b0b40d3e1dafc0de13459a4b889f8680ec154690f445952e74799920ae380" +#define FALCO_ENGINE_CHECKSUM "97c0ff4866b9430da84fadbd6546743464fa551b03168fbd74dd1290344f031e"