transform: Add luaxform files

Issue: 2290 This commit adds the source files for the new transform -- luaxform.
jlucovsky · Sep 13, 2024 · 82dded2 · 82dded2
1 parent 7caf929
commit 82dded2
Show file tree

Hide file tree

Showing 7 changed files with 541 additions and 6 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -316,6 +316,7 @@ noinst_HEADERS = \
 	detect-transform-compress-whitespace.h \
 	detect-transform-dotprefix.h \
 	detect-transform-header-lowercase.h \
+	detect-transform-luaxform.h \
 	detect-transform-md5.h \
 	detect-transform-pcrexform.h \
 	detect-transform-sha1.h \
@@ -895,6 +896,7 @@ libsuricata_c_a_SOURCES = \
 	detect-transform-compress-whitespace.c \
 	detect-transform-dotprefix.c \
 	detect-transform-header-lowercase.c \
+	detect-transform-luaxform.c \
 	detect-transform-md5.c \
 	detect-transform-pcrexform.c \
 	detect-transform-sha1.c \

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
@@ -234,6 +234,7 @@
 #include "detect-transform-casechange.h"
 #include "detect-transform-header-lowercase.h"
 #include "detect-transform-base64.h"
+#include "detect-transform-luaxform.h"
 
 #include "util-rule-vars.h"
 
@@ -695,6 +696,7 @@ void SigTableSetup(void)
     DetectTransformToUpperRegister();
     DetectTransformHeaderLowercaseRegister();
     DetectTransformFromBase64DecodeRegister();
+    DetectTransformLuaxformRegister();
 
     DetectFileHandlerRegister();
 

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
@@ -316,6 +316,7 @@ enum DetectKeywordId {
     DETECT_TRANSFORM_TOUPPER,
     DETECT_TRANSFORM_HEADER_LOWERCASE,
     DETECT_TRANSFORM_FROM_BASE64,
+    DETECT_TRANSFORM_LUAXFORM,
 
     DETECT_AL_IKE_EXCH_TYPE,
     DETECT_AL_IKE_SPI_INITIATOR,

diff --git a/src/detect-lua.c b/src/detect-lua.c
@@ -57,6 +57,7 @@
 #include "util-var-name.h"
 
 #include "util-lua.h"
+#include "util-lua-common.h"
 #include "util-lua-sandbox.h"
 
 static int DetectLuaMatch (DetectEngineThreadCtx *,
@@ -66,10 +67,11 @@ static int DetectLuaAppTxMatch (DetectEngineThreadCtx *det_ctx,
                                 void *state, void *txv, const Signature *s,
                                 const SigMatchCtx *ctx);
 static int DetectLuaSetup (DetectEngineCtx *, Signature *, const char *);
+static void DetectLuaFree(DetectEngineCtx *de_ctx, void *ptr);
 #ifdef UNITTESTS
 static void DetectLuaRegisterTests(void);
 #endif
-static void DetectLuaFree(DetectEngineCtx *, void *);
+static void DetectLuaThreadFree(void *ctx);
 static int g_smtp_generic_list_id = 0;
 
 /**
@@ -126,9 +128,6 @@ void DetectLuaRegister(void)
 #define FLAG_INSTRUCTION_LIMIT_LOGGED           BIT_U32(25)
 #define FLAG_MEMORY_LIMIT_LOGGED                BIT_U32(26)
 
-#define DEFAULT_LUA_ALLOC_LIMIT       500000
-#define DEFAULT_LUA_INSTRUCTION_LIMIT 500000
-
 #if 0
 /** \brief dump stack from lua state to screen */
 void LuaDumpStack(lua_State *state)
@@ -553,7 +552,7 @@ static void DetectLuaThreadFree(void *ctx)
  * \retval lua pointer to DetectLuaData on success
  * \retval NULL on failure
  */
-static DetectLuaData *DetectLuaParse (DetectEngineCtx *de_ctx, const char *str)
+static DetectLuaData *DetectLuaParse(DetectEngineCtx *de_ctx, const char *str)
 {
     DetectLuaData *lua = NULL;
 
@@ -1058,7 +1057,8 @@ static void DetectLuaFree(DetectEngineCtx *de_ctx, void *ptr)
             VarNameStoreUnregister(lua->flowvar[i], VAR_TYPE_FLOW_VAR);
         }
 
-        DetectUnregisterThreadCtxFuncs(de_ctx, lua, "lua");
+        if (lua->thread_ctx_id)
+            DetectUnregisterThreadCtxFuncs(de_ctx, lua, "lua");
 
         SCFree(lua);
     }