From 1c644a45a7e4efd61bb1ffe54f8ed974d4e2ddab Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Wed, 6 Dec 2023 15:01:03 +0000 Subject: [PATCH] fix(libsinsp): set glob_match to be case insensitve by default Signed-off-by: Roberto Scolaro --- userspace/libsinsp/container_info.cpp | 4 ++-- userspace/libsinsp/sinsp_filtercheck.cpp | 2 +- userspace/libsinsp/utils.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/userspace/libsinsp/container_info.cpp b/userspace/libsinsp/container_info.cpp index 0dce6bcb74..52c713a03c 100644 --- a/userspace/libsinsp/container_info.cpp +++ b/userspace/libsinsp/container_info.cpp @@ -125,7 +125,7 @@ const sinsp_container_info::container_mount_info *sinsp_container_info::mount_by // note: linear search for (auto &mntinfo :m_mounts) { - if(sinsp_utils::glob_match(source.c_str(), mntinfo.m_source.c_str(), false)) + if(sinsp_utils::glob_match(source.c_str(), mntinfo.m_source.c_str())) { return &mntinfo; } @@ -139,7 +139,7 @@ const sinsp_container_info::container_mount_info *sinsp_container_info::mount_by // note: linear search for (auto &mntinfo :m_mounts) { - if(sinsp_utils::glob_match(dest.c_str(), mntinfo.m_dest.c_str(), false)) + if(sinsp_utils::glob_match(dest.c_str(), mntinfo.m_dest.c_str())) { return &mntinfo; } diff --git a/userspace/libsinsp/sinsp_filtercheck.cpp b/userspace/libsinsp/sinsp_filtercheck.cpp index c3d3d39363..5b7b450775 100644 --- a/userspace/libsinsp/sinsp_filtercheck.cpp +++ b/userspace/libsinsp/sinsp_filtercheck.cpp @@ -166,7 +166,7 @@ bool flt_compare_string(cmpop op, char* operand1, char* operand2) case CO_ENDSWITH: return (sinsp_utils::endswith(operand1, operand2)); case CO_GLOB: - return sinsp_utils::glob_match(operand2, operand1, false); + return sinsp_utils::glob_match(operand2, operand1); case CO_IGLOB: return sinsp_utils::glob_match(operand2, operand1, true); case CO_LT: diff --git a/userspace/libsinsp/utils.h b/userspace/libsinsp/utils.h index fe03fa9104..72a7a76aad 100644 --- a/userspace/libsinsp/utils.h +++ b/userspace/libsinsp/utils.h @@ -112,7 +112,7 @@ class sinsp_utils static uint64_t get_current_time_ns(); - static bool glob_match(const char *pattern, const char *string, const bool& case_insensitive); + static bool glob_match(const char *pattern, const char *string, const bool& case_insensitive = false); #ifndef _WIN32 //