Merge pull request #25 from CESNET/sedlak-filter-startswith

Sedlak filter startswith

Author: Lukas955

CMakeModules/unit_tests.cmake

@@ -25,33 +25,33 @@ ExternalProject_Get_Property(googletest binary_dir)
 set(GTEST_LIBRARY_PATH ${binary_dir}/googlemock/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
 set(GTEST_LIBRARY gtest)
 add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
-set_target_properties(${GTEST_LIBRARY} PROPERTIES
-  IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}
-  IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+set_target_properties("${GTEST_LIBRARY}" PROPERTIES
+  IMPORTED_LOCATION "${GTEST_LIBRARY_PATH}"
+  IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
 add_dependencies(${GTEST_LIBRARY} googletest)
 
 set(GTEST_MAIN_LIBRARY_PATH ${binary_dir}/googlemock/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main.a)
 set(GTEST_MAIN_LIBRARY gtest_main)
 add_library(${GTEST_MAIN_LIBRARY} UNKNOWN IMPORTED)
-set_target_properties(${GTEST_MAIN_LIBRARY} PROPERTIES
-  IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}
-  IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+set_target_properties("${GTEST_MAIN_LIBRARY}" PROPERTIES
+  IMPORTED_LOCATION "${GTEST_MAIN_LIBRARY_PATH}"
+  IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
 add_dependencies(${GTEST_MAIN_LIBRARY} googletest)
 
 set(GMOCK_LIBRARY_PATH ${binary_dir}/googlemock/${CMAKE_FIND_LIBRARY_PREFIXES}gmock.a)
 set(GMOCK_LIBRARY gmock)
 add_library(${GMOCK_LIBRARY} UNKNOWN IMPORTED)
-set_target_properties(${GMOCK_LIBRARY} PROPERTIES
-  IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}
-  IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+set_target_properties("${GMOCK_LIBRARY}" PROPERTIES
+  IMPORTED_LOCATION "${GMOCK_LIBRARY_PATH}"
+  IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
 add_dependencies(${GMOCK_LIBRARY} googletest)
 
 set(GMOCK_MAIN_LIBRARY_PATH ${binary_dir}/googlemock/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main.a)
 set(GMOCK_MAIN_LIBRARY gmock_main)
 add_library(${GMOCK_MAIN_LIBRARY} UNKNOWN IMPORTED)
-set_target_properties(${GMOCK_MAIN_LIBRARY} PROPERTIES
-  IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}
-  IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+set_target_properties("${GMOCK_MAIN_LIBRARY}" PROPERTIES
+  IMPORTED_LOCATION "${GMOCK_MAIN_LIBRARY_PATH}"
+  IMPORTED_LINK_INTERFACE_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
 add_dependencies(${GMOCK_MAIN_LIBRARY} ${GTEST_LIBRARY})
 
 include_directories(

src/filter/operations/str.c

@@ -88,8 +88,19 @@ contains_str(fds_filter_value_u *big, fds_filter_value_u *little, fds_filter_val
     result->b = strnnstr(big->str.chars, little->str.chars, big->str.len, little->str.len) != NULL;
 }
 
+void
+startswith_str(fds_filter_value_u *big, fds_filter_value_u *little, fds_filter_value_u *result)
+{
+    result->b = (big->str.len >= little->str.len
+        && memcmp(big->str.chars, little->str.chars, little->str.len) == 0);
+}
 
-
+void
+endswith_str(fds_filter_value_u *big, fds_filter_value_u *little, fds_filter_value_u *result)
+{
+    result->b = (big->str.len >= little->str.len
+        && memcmp(&big->str.chars[big->str.len - little->str.len], little->str.chars, little->str.len) == 0);
+}
 
 void
 str_in_list(fds_filter_value_u *item, fds_filter_value_u *list, fds_filter_value_u *result)
@@ -136,6 +147,8 @@ const fds_filter_op_s str_operations[] = {
     FDS_FILTER_DEF_BINARY_OP(FDS_FDT_STR, "!=", FDS_FDT_STR, ne_str, FDS_FDT_BOOL),
 
     FDS_FILTER_DEF_BINARY_OP(FDS_FDT_STR, "contains", FDS_FDT_STR, contains_str, FDS_FDT_BOOL),
+    FDS_FILTER_DEF_BINARY_OP(FDS_FDT_STR, "startswith", FDS_FDT_STR, startswith_str, FDS_FDT_BOOL),
+    FDS_FILTER_DEF_BINARY_OP(FDS_FDT_STR, "endswith", FDS_FDT_STR, endswith_str, FDS_FDT_BOOL),
 
     FDS_FILTER_DEF_BINARY_OP(FDS_FDT_STR, "in", FDS_FDT_LIST | FDS_FDT_STR, str_in_list, FDS_FDT_BOOL),
 

src/filter/parser.c

@@ -88,6 +88,8 @@ struct operator_s op_parse_def_table[] = {
     { "exists"  , 2, OP_KIND_PREFIX, OP_ASSOC_NONE },
     { "in"      , 2, OP_KIND_INFIX , OP_ASSOC_LEFT },
     { "contains", 2, OP_KIND_INFIX , OP_ASSOC_LEFT },
+    { "startswith", 2, OP_KIND_INFIX , OP_ASSOC_LEFT },
+    { "endswith", 2, OP_KIND_INFIX , OP_ASSOC_LEFT },
 
     { ""        , 1, OP_KIND_INFIX , OP_ASSOC_LEFT },
     { "=="      , 1, OP_KIND_INFIX , OP_ASSOC_LEFT },

src/filter/scanner.c

@@ -75,7 +75,8 @@ const struct {
 // Strings that are treated as symbols
 const char *symbols[] = {
     "~", "not", "*", "/", "+", "-", "|", "&", "^", "%",
-    "and", "or", "in", "contains", "exists", "[", "]", "(", ")", ",",
+    "and", "or", "in", "contains", "startswith", "endswith", "exists",
+    "[", "]", "(", ")", ",",
     "<", ">", "==", "!=", ">=", "<=", "<<", ">>",
     "in", "out", "ingress", "egress", "src", "dst"
 };

src/ipfix_filter/ipfix_filter.c

@@ -177,6 +177,7 @@ get_filter_data_type(const struct fds_iemgr_elem *elem)
         return FDS_FDT_MAC;
 
     case FDS_ET_STRING:
+    case FDS_ET_OCTET_ARRAY:
         return FDS_FDT_STR;
 
     case FDS_ET_DATE_TIME_SECONDS:
@@ -386,6 +387,7 @@ read_record_field(struct fds_drec *record, const struct fds_iemgr_elem *field_de
             break;
 
         case FDS_ET_STRING:
+        case FDS_ET_OCTET_ARRAY:
             out_value->str.len = size;
             out_value->str.chars = (char *) data;
             break;

tests/unit_tests/filter/filter.cpp

@@ -397,6 +397,18 @@ TEST_F(Filter, string_operations) {
     EXPECT_EQ(evaluate("\"hello world!\" contains \"\""), true);
     EXPECT_EQ(evaluate("not \"\" contains \"hello\""), true);
     EXPECT_EQ(evaluate("not \"hello world!\" contains \"foo\""), true);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"hello\""), true);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"hello world!\""), true);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"hello world!!\""), false);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"ello world!!\""), false);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"\""), true);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"ello\""), false);
+    EXPECT_EQ(evaluate("\"hello world!\" startswith \"world\""), false);
+    EXPECT_EQ(evaluate("\"hello world!\" endswith \"world\""), false);
+    EXPECT_EQ(evaluate("\"hello world!\" endswith \"world!\""), true);
+    EXPECT_EQ(evaluate("\"hello world!\" endswith \"hello world!\""), true);
+    EXPECT_EQ(evaluate("\"hello world!\" endswith \"hello\""), false);
+    EXPECT_EQ(evaluate("\"hello world!\" endswith \"hello world!!\""), false);
 }
 
 TEST_F(Filter, bitwise_operations) {