Feature/sec 471 + sync

CMakeLists.txt

@@ -277,6 +277,10 @@ if(FLB_TRACE)
   add_definitions(-DFLB_TRACE=1)
 endif()
 
+# Debug messages to check the values of options
+message(STATUS "FLB_RECORD_ACCESSOR: ${FLB_RECORD_ACCESSOR}")
+message(STATUS "FLB_REGEX: ${FLB_REGEX}")
+
 if(FLB_CHUNK_TRACE)
   FLB_DEFINITION(FLB_HAVE_CHUNK_TRACE)
 endif()

packaging/distros/amazonlinux/Dockerfile

@@ -81,6 +81,7 @@ ARG FLB_RELEASE=On
 ARG FLB_TRACE=On
 ARG FLB_SQLDB=On
 ARG FLB_HTTP_SERVER=On
+ARG FLB_FILTER_ENCRYPT=On
 ARG FLB_OUT_KAFKA=On
 ARG FLB_OUT_PGSQL=On
 ARG FLB_JEMALLOC=On
@@ -92,6 +93,7 @@ RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_FILTER_ENCRYPT="$FLB_FILTER_ENCRYPT" \
     -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \

packaging/distros/centos/Dockerfile

@@ -160,6 +160,7 @@ ARG FLB_RELEASE=On
 ARG FLB_TRACE=On
 ARG FLB_SQLDB=On
 ARG FLB_HTTP_SERVER=On
+ARG FLB_FILTER_ENCRYPT=On
 ARG FLB_OUT_KAFKA=On
 ARG FLB_JEMALLOC=On
 ARG FLB_CHUNK_TRACE=On
@@ -171,6 +172,7 @@ RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_FILTER_ENCRYPT="$FLB_FILTER_ENCRYPT" \
     -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \

packaging/distros/debian/Dockerfile

@@ -113,6 +113,7 @@ ARG FLB_RELEASE=On
 ARG FLB_TRACE=On
 ARG FLB_SQLDB=On
 ARG FLB_HTTP_SERVER=On
+ARG FLB_FILTER_ENCRYPT=On
 ARG FLB_OUT_KAFKA=On
 ARG FLB_OUT_PGSQL=On
 ARG FLB_JEMALLOC=On
@@ -125,6 +126,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_FILTER_ENCRYPT="$FLB_FILTER_ENCRYPT" \
     -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \

packaging/distros/raspbian/Dockerfile

@@ -67,6 +67,7 @@ ARG FLB_RELEASE=On
 ARG FLB_TRACE=On
 ARG FLB_SQLDB=On
 ARG FLB_HTTP_SERVER=On
+ARG FLB_FILTER_ENCRYPT=On
 ARG FLB_OUT_KAFKA=On
 ARG FLB_OUT_PGSQL=On
 ARG FLB_JEMALLOC=On
@@ -81,6 +82,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_FILTER_ENCRYPT="$FLB_FILTER_ENCRYPT" \
     -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \

packaging/distros/ubuntu/Dockerfile

@@ -175,6 +175,7 @@ ARG FLB_RELEASE=On
 ARG FLB_TRACE=On
 ARG FLB_SQLDB=On
 ARG FLB_HTTP_SERVER=On
+ARG FLB_FILTER_ENCRYPT=On
 ARG FLB_OUT_KAFKA=On
 ARG FLB_OUT_PGSQL=On
 ARG FLB_JEMALLOC=On
@@ -187,6 +188,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_FILTER_ENCRYPT="$FLB_FILTER_ENCRYPT" \
     -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \

plugins/CMakeLists.txt

@@ -352,6 +352,7 @@ REGISTER_FILTER_PLUGIN("filter_alter_size")
 REGISTER_FILTER_PLUGIN("filter_aws")
 REGISTER_FILTER_PLUGIN("filter_checklist")
 REGISTER_FILTER_PLUGIN("filter_ecs")
+REGISTER_FILTER_PLUGIN("filter_encrypt")
 REGISTER_FILTER_PLUGIN("filter_record_modifier")
 REGISTER_FILTER_PLUGIN("filter_sysinfo")
 REGISTER_FILTER_PLUGIN("filter_throttle")

plugins/filter_encrypt/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Define the list of source files excluding applink.c
+set(src
+        utils.c
+        crypto_utils.c
+        mjson.c
+        hashmap.c
+        ip_utils.c
+        ip_encryption.c
+        cryptopANT.c
+        aes.c
+        cmac.c
+        aes_deterministic.c
+        aes_gcm_hmac_deterministic.c
+        aes_gcm.c
+        hmac.c
+        encrypt.c)
+
+# Conditionally include applink.c only on Windows
+if(WIN32)
+    # Adjust the path if applink.c is in a different directory
+    list(APPEND src applink.c)
+endif()
+
+# Define the Fluent Bit plugin with the configured source files
+FLB_PLUGIN(filter_encrypt "${src}" "")