From: Victor Julien <vjulien@oisf.net>
Date: Fri, 17 Mar 2023 14:10:25 +0000 (+0100)
Subject: detect/pcre: remove obsolete tests
X-Git-Tag: suricata-7.0.0-rc2~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b27087527b01a88dbea6f0753b0db8250f5cd04;p=thirdparty%2Fsuricata.git

detect/pcre: remove obsolete tests
---

diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index cce9729fb1..5a63c2cd50 100644
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -1189,172 +1189,6 @@ static int DetectPcreParseTest10(void)
     PASS;
 }
 
-/**
- * \test Test pcre option for dce sig.
- */
-static int DetectPcreParseTest11(void)
-{
-    DetectEngineCtx *de_ctx = NULL;
-    Signature *s = NULL;
-    DetectPcreData *data = NULL;
-
-    de_ctx = DetectEngineCtxInit();
-    FAIL_IF_NULL(de_ctx);
-
-    de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
-                               "(msg:\"Testing bytejump_body\"; "
-                               "dce_iface:3919286a-b10c-11d0-9ba8-00c04fd92ef5; "
-                               "dce_stub_data; "
-                               "pcre:/bamboo/R; sid:1;)");
-    FAIL_IF(de_ctx == NULL);
-    s = de_ctx->sig_list;
-    FAIL_IF(s->sm_lists_tail[g_dce_stub_data_buffer_id] == NULL);
-    FAIL_IF_NOT(s->sm_lists_tail[g_dce_stub_data_buffer_id]->type == DETECT_PCRE);
-    data = (DetectPcreData *)s->sm_lists_tail[g_dce_stub_data_buffer_id]->ctx;
-    FAIL_IF(data->flags & DETECT_PCRE_RAWBYTES ||
-        !(data->flags & DETECT_PCRE_RELATIVE));
-
-    s->next = SigInit(de_ctx, "alert tcp any any -> any any "
-                      "(msg:\"Testing bytejump_body\"; "
-                      "dce_iface:3919286a-b10c-11d0-9ba8-00c04fd92ef5; "
-                      "dce_stub_data; "
-                      "pcre:/bamboo/R; sid:1;)");
-    FAIL_IF_NULL(s->next);
-    s = s->next;
-    FAIL_IF(s->sm_lists_tail[g_dce_stub_data_buffer_id] == NULL);
-    FAIL_IF_NOT(s->sm_lists_tail[g_dce_stub_data_buffer_id]->type == DETECT_PCRE);
-    data = (DetectPcreData *)s->sm_lists_tail[g_dce_stub_data_buffer_id]->ctx;
-    FAIL_IF(data->flags & DETECT_PCRE_RAWBYTES ||
-        !(data->flags & DETECT_PCRE_RELATIVE));
-
-    s->next = SigInit(de_ctx, "alert tcp any any -> any any "
-                      "(msg:\"Testing bytejump_body\"; "
-                      "dce_iface:3919286a-b10c-11d0-9ba8-00c04fd92ef5; "
-                      "dce_stub_data; "
-                      "pcre:/bamboo/RB; sid:1;)");
-    FAIL_IF(s->next == NULL);
-    s = s->next;
-    FAIL_IF(s->sm_lists_tail[g_dce_stub_data_buffer_id] == NULL);
-    FAIL_IF_NOT(s->sm_lists_tail[g_dce_stub_data_buffer_id]->type == DETECT_PCRE);
-    data = (DetectPcreData *)s->sm_lists_tail[g_dce_stub_data_buffer_id]->ctx;
-    FAIL_IF(!(data->flags & DETECT_PCRE_RAWBYTES) ||
-        !(data->flags & DETECT_PCRE_RELATIVE));
-
-    s->next = SigInit(de_ctx, "alert tcp any any -> any any "
-                      "(msg:\"Testing bytejump_body\"; "
-                      "content:\"one\"; pcre:/bamboo/; sid:1;)");
-    FAIL_IF(s->next == NULL);
-    s = s->next;
-    FAIL_IF(s->sm_lists_tail[g_dce_stub_data_buffer_id] != NULL);
-
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
-    DetectEngineCtxFree(de_ctx);
-
-    PASS;
-}
-
-/**
- * \test Test pcre option with file data. pcre is relative to file_data,
- *       so relative flag should be unset.
- */
-static int DetectPcreParseTest12(void)
-{
-    DetectEngineCtx *de_ctx = NULL;
-    Signature *s = NULL;
-    DetectPcreData *data = NULL;
-
-    de_ctx = DetectEngineCtxInit();
-    FAIL_IF_NULL(de_ctx);
-
-    de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
-                               "(file_data; pcre:/abc/R; sid:1;)");
-    FAIL_IF (de_ctx->sig_list == NULL);
-
-    s = de_ctx->sig_list;
-    FAIL_IF(s->sm_lists_tail[g_file_data_buffer_id] == NULL);
-
-    FAIL_IF(s->sm_lists_tail[g_file_data_buffer_id]->type != DETECT_PCRE);
-
-    data = (DetectPcreData *)s->sm_lists_tail[g_file_data_buffer_id]->ctx;
-    FAIL_IF(data->flags & DETECT_PCRE_RAWBYTES ||
-        !(data->flags & DETECT_PCRE_RELATIVE));
-
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
-    DetectEngineCtxFree(de_ctx);
-
-    PASS;
-}
-
-/**
- * \test Test pcre option with file data.
- */
-static int DetectPcreParseTest13(void)
-{
-    DetectEngineCtx *de_ctx = NULL;
-    Signature *s = NULL;
-    DetectPcreData *data = NULL;
-
-    de_ctx = DetectEngineCtxInit();
-    FAIL_IF_NULL(de_ctx);
-
-    de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
-                               "(file_data; content:\"abc\"; pcre:/def/R; sid:1;)");
-    FAIL_IF(de_ctx->sig_list == NULL);
-
-    s = de_ctx->sig_list;
-    FAIL_IF(s->sm_lists_tail[g_file_data_buffer_id] == NULL);
-
-    FAIL_IF(s->sm_lists_tail[g_file_data_buffer_id]->type != DETECT_PCRE);
-
-    data = (DetectPcreData *)s->sm_lists_tail[g_file_data_buffer_id]->ctx;
-    FAIL_IF(data->flags & DETECT_PCRE_RAWBYTES ||
-        !(data->flags & DETECT_PCRE_RELATIVE));
-
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
-    DetectEngineCtxFree(de_ctx);
-
-    PASS;
-}
-
-/**
- * \test Test pcre option with file data.
- */
-static int DetectPcreParseTest14(void)
-{
-    DetectEngineCtx *de_ctx = NULL;
-    Signature *s = NULL;
-    DetectPcreData *data = NULL;
-
-    de_ctx = DetectEngineCtxInit();
-    FAIL_IF(de_ctx == NULL);
-
-    de_ctx->flags |= DE_QUIET;
-    de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
-                               "(file_data; pcre:/def/; sid:1;)");
-    FAIL_IF(de_ctx->sig_list == NULL);
-
-    s = de_ctx->sig_list;
-    FAIL_IF(s->sm_lists_tail[g_file_data_buffer_id] == NULL);
-
-    FAIL_IF(s->sm_lists_tail[g_file_data_buffer_id]->type != DETECT_PCRE);
-
-    data = (DetectPcreData *)s->sm_lists_tail[g_file_data_buffer_id]->ctx;
-    FAIL_IF(data->flags & DETECT_PCRE_RAWBYTES ||
-        data->flags & DETECT_PCRE_RELATIVE);
-
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
-    DetectEngineCtxFree(de_ctx);
-
-    PASS;
-}
-
 /** \test Check a signature with pcre relative method */
 static int DetectPcreParseTest15(void)
 {
@@ -2187,10 +2021,6 @@ static void DetectPcreRegisterTests(void)
     UtRegisterTest("DetectPcreParseTest08", DetectPcreParseTest08);
     UtRegisterTest("DetectPcreParseTest09", DetectPcreParseTest09);
     UtRegisterTest("DetectPcreParseTest10", DetectPcreParseTest10);
-    UtRegisterTest("DetectPcreParseTest11", DetectPcreParseTest11);
-    UtRegisterTest("DetectPcreParseTest12", DetectPcreParseTest12);
-    UtRegisterTest("DetectPcreParseTest13", DetectPcreParseTest13);
-    UtRegisterTest("DetectPcreParseTest14", DetectPcreParseTest14);
     UtRegisterTest("DetectPcreParseTest15", DetectPcreParseTest15);
     UtRegisterTest("DetectPcreParseTest16", DetectPcreParseTest16);
     UtRegisterTest("DetectPcreParseTest17", DetectPcreParseTest17);