detect/filename: switch to file.name implementation

Ticket: #6194.

diff --git a/src/detect-filename.c b/src/detect-filename.c
index 548e4aaee97da875ff85a6d02e4ee2aee30770ea..5ad4109a42545823740db1887767402a1b7c6d12 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -56,21 +56,11 @@
 #include "detect-filename.h"
 #include "app-layer-parser.h"
 
-typedef struct DetectFilenameData {
-    uint8_t *name; /** name of the file to match */
-    BmCtx *bm_ctx; /** BM context */
-    uint16_t len;  /** name length */
-    uint32_t flags;
-} DetectFilenameData;
-
-static int DetectFilenameMatch (DetectEngineThreadCtx *, Flow *,
-        uint8_t, File *, const Signature *, const SigMatchCtx *);
 static int DetectFilenameSetup (DetectEngineCtx *, Signature *, const char *);
 static int DetectFilenameSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str);
 #ifdef UNITTESTS
 static void DetectFilenameRegisterTests(void);
 #endif
-static void DetectFilenameFree(DetectEngineCtx *, void *);
 static int g_file_match_list_id = 0;
 static int g_file_name_buffer_id = 0;
 
@@ -88,9 +78,7 @@ void DetectFilenameRegister(void)
     sigmatch_table[DETECT_FILENAME].name = "filename";
     sigmatch_table[DETECT_FILENAME].desc = "match on the file name";
     sigmatch_table[DETECT_FILENAME].url = "/rules/file-keywords.html#filename";
-    sigmatch_table[DETECT_FILENAME].FileMatch = DetectFilenameMatch;
     sigmatch_table[DETECT_FILENAME].Setup = DetectFilenameSetup;
-    sigmatch_table[DETECT_FILENAME].Free  = DetectFilenameFree;
 #ifdef UNITTESTS
     sigmatch_table[DETECT_FILENAME].RegisterTests = DetectFilenameRegisterTests;
 #endif
@@ -145,111 +133,6 @@ void DetectFilenameRegister(void)
     return;
 }
 
-/**
- * \brief match the specified filename
- *
- * \param t thread local vars
- * \param det_ctx pattern matcher thread local data
- * \param f *LOCKED* flow
- * \param flags direction flags
- * \param file file being inspected
- * \param s signature being inspected
- * \param m sigmatch that we will cast into DetectFilenameData
- *
- * \retval 0 no match
- * \retval 1 match
- */
-static int DetectFilenameMatch (DetectEngineThreadCtx *det_ctx,
-        Flow *f, uint8_t flags, File *file, const Signature *s, const SigMatchCtx *m)
-{
-    SCEnter();
-    int ret = 0;
-
-    DetectFilenameData *filename = (DetectFilenameData *)m;
-
-    if (file->name == NULL)
-        SCReturnInt(0);
-
-    if (BoyerMooreNocase(filename->name, filename->len, file->name,
-                file->name_len, filename->bm_ctx) != NULL)
-    {
-#ifdef DEBUG
-        if (SCLogDebugEnabled()) {
-            char *name = SCMalloc(filename->len + 1);
-            if (name != NULL) {
-                memcpy(name, filename->name, filename->len);
-                name[filename->len] = '\0';
-                SCLogDebug("will look for filename %s", name);
-                SCFree(name);
-            }
-        }
-#endif
-
-        if (!(filename->flags & DETECT_CONTENT_NEGATED)) {
-            ret = 1;
-        }
-    }
-
-    else if (filename->flags & DETECT_CONTENT_NEGATED) {
-        SCLogDebug("negated match");
-        ret = 1;
-    }
-
-    SCReturnInt(ret);
-}
-
-/**
- * \brief Parse the filename keyword
- *
- * \param de_ctx Pointer to the detection engine context
- * \param idstr Pointer to the user provided option
- *
- * \retval filename pointer to DetectFilenameData on success
- * \retval NULL on failure
- */
-static DetectFilenameData *DetectFilenameParse (DetectEngineCtx *de_ctx, const char *str, bool negate)
-{
-    DetectFilenameData *filename = SCCalloc(1, sizeof(DetectFilenameData));
-    if (unlikely(filename == NULL))
-        return NULL;
-
-    if (DetectContentDataParse ("filename", str, &filename->name, &filename->len) == -1) {
-        goto error;
-    }
-
-    filename->bm_ctx = BoyerMooreNocaseCtxInit(filename->name, filename->len);
-    if (filename->bm_ctx == NULL) {
-        goto error;
-    }
-
-    if (negate) {
-        filename->flags |= DETECT_CONTENT_NEGATED;
-    }
-
-    SCLogDebug("flags %02X", filename->flags);
-    if (filename->flags & DETECT_CONTENT_NEGATED) {
-        SCLogDebug("negated filename");
-    }
-
-#ifdef DEBUG
-    if (SCLogDebugEnabled()) {
-        char *name = SCMalloc(filename->len + 1);
-        if (name != NULL) {
-            memcpy(name, filename->name, filename->len);
-            name[filename->len] = '\0';
-            SCLogDebug("will look for filename %s", name);
-            SCFree(name);
-        }
-    }
-#endif
-
-    return filename;
-
-error:
-    DetectFilenameFree(de_ctx, filename);
-    return NULL;
-}
-
 /**
  * \brief this function is used to parse filename options
  * \brief into the current signature
@@ -263,51 +146,34 @@ error:
  */
 static int DetectFilenameSetup (DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    DetectFilenameData *filename = NULL;
-    SigMatch *sm = NULL;
+    if (s->init_data->transforms.cnt) {
+        SCLogError("previous transforms not consumed before 'filename'");
+        SCReturnInt(-1);
+    }
+    s->init_data->list = DETECT_SM_LIST_NOTSET;
+    s->file_flags |= (FILE_SIG_NEED_FILE | FILE_SIG_NEED_FILENAME);
 
-    filename = DetectFilenameParse(de_ctx, str, s->init_data->negated);
-    if (filename == NULL)
-        goto error;
+    if (DetectContentSetup(de_ctx, s, str) < 0) {
+        return -1;
+    }
 
-    /* Okay so far so good, lets get this into a SigMatch
-     * and put it in the Signature. */
-    sm = SigMatchAlloc();
+    SigMatch *sm = DetectGetLastSMFromLists(s, DETECT_CONTENT, -1);
     if (sm == NULL)
-        goto error;
-
-    sm->type = DETECT_FILENAME;
-    sm->ctx = (void *)filename;
+        return -1;
 
-    SigMatchAppendSMToList(s, sm, g_file_match_list_id);
+    DetectContentData *cd = (DetectContentData *)sm->ctx;
+    cd->flags |= DETECT_CONTENT_NOCASE;
+    /* Recreate the context with nocase chars */
+    SpmDestroyCtx(cd->spm_ctx);
+    cd->spm_ctx = SpmInitCtx(cd->content, cd->content_len, 1, de_ctx->spm_global_thread_ctx);
+    if (cd->spm_ctx == NULL) {
+        return -1;
+    }
+    if (DetectEngineContentModifierBufferSetup(
+                de_ctx, s, NULL, DETECT_FILE_NAME, g_file_name_buffer_id, s->alproto) < 0)
+        return -1;
 
-    s->file_flags |= (FILE_SIG_NEED_FILE|FILE_SIG_NEED_FILENAME);
     return 0;
-
-error:
-    if (filename != NULL)
-        DetectFilenameFree(de_ctx, filename);
-    if (sm != NULL)
-        SCFree(sm);
-    return -1;
-}
-
-/**
- * \brief this function will free memory associated with DetectFilenameData
- *
- * \param filename pointer to DetectFilenameData
- */
-static void DetectFilenameFree(DetectEngineCtx *de_ctx, void *ptr)
-{
-    if (ptr != NULL) {
-        DetectFilenameData *filename = (DetectFilenameData *)ptr;
-        if (filename->bm_ctx != NULL) {
-            BoyerMooreCtxDeInit(filename->bm_ctx);
-        }
-        if (filename->name != NULL)
-            SCFree(filename->name);
-        SCFree(filename);
-    }
 }
 
 /* file.name implementation */
@@ -477,52 +343,11 @@ static int DetectFilenameSignatureParseTest01(void)
     //FAIL_IF_NOT(UTHParseSignature("alert tls any any -> any any (flow:to_client; file.name; content:\"abc\"; sid:1;)", false));
     PASS;
 }
-/**
- * \test DetectFilenameTestParse01
- */
-static int DetectFilenameTestParse01 (void)
-{
-    DetectFilenameData *dnd = DetectFilenameParse(NULL, "secret.pdf", false);
-    FAIL_IF_NULL(dnd);
-    DetectFilenameFree(NULL, dnd);
-    PASS;
-}
-
-/**
- * \test DetectFilenameTestParse02
- */
-static int DetectFilenameTestParse02 (void)
-{
-    DetectFilenameData *dnd = DetectFilenameParse(NULL, "backup.tar.gz", false);
-    FAIL_IF_NULL(dnd);
-    FAIL_IF_NOT(dnd->len == 13);
-    FAIL_IF_NOT(memcmp(dnd->name, "backup.tar.gz", 13) == 0);
-    DetectFilenameFree(NULL, dnd);
-    PASS;
-}
-
-/**
- * \test DetectFilenameTestParse03
- */
-static int DetectFilenameTestParse03 (void)
-{
-    DetectFilenameData *dnd = DetectFilenameParse(NULL, "cmd.exe", false);
-    FAIL_IF_NULL(dnd);
-    FAIL_IF_NOT(dnd->len == 7);
-    FAIL_IF_NOT(memcmp(dnd->name, "cmd.exe", 7) == 0);
-    DetectFilenameFree(NULL, dnd);
-    PASS;
-}
-
 /**
  * \brief this function registers unit tests for DetectFilename
  */
 void DetectFilenameRegisterTests(void)
 {
     UtRegisterTest("DetectFilenameSignatureParseTest01", DetectFilenameSignatureParseTest01);
-
-    UtRegisterTest("DetectFilenameTestParse01", DetectFilenameTestParse01);
-    UtRegisterTest("DetectFilenameTestParse02", DetectFilenameTestParse02);
-    UtRegisterTest("DetectFilenameTestParse03", DetectFilenameTestParse03);
 }
 #endif /* UNITTESTS */