Keyword pkt_data

diff --git a/src/Makefile.am b/src/Makefile.am
index 7812c37a07fde40546311d336feed06e8a91f7d0..94c687c81329e8c7703aacb02d2ae57f43eb0534 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,6 +173,7 @@ detect-filemagic.c detect-filemagic.h \
 detect-filemd5.c detect-filemd5.h \
 detect-filesize.c detect-filesize.h \
 detect-http-stat-code.c detect-http-stat-code.h \
+detect-pkt-data.c detect-pkt-data.h \
 detect-ssl-version.c detect-ssl-version.h \
 detect-ssl-state.c detect-ssl-state.h \
 detect-byte-extract.c detect-byte-extract.h \

diff --git a/src/detect-pkt-data.c b/src/detect-pkt-data.c
new file mode 100644 (file)
index 0000000..859b019
--- /dev/null
+++ b/src/detect-pkt-data.c
@@ -0,0 +1,145 @@
+/* Copyright (C) 2012 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Xavier Lange <xrlange@gmail.com>
+ *
+ */
+
+#include "suricata-common.h"
+#include "threads.h"
+#include "debug.h"
+#include "decode.h"
+
+#include "detect.h"
+#include "detect-parse.h"
+
+#include "detect-engine.h"
+#include "detect-engine-mpm.h"
+#include "detect-engine-state.h"
+
+#include "flow.h"
+#include "flow-var.h"
+#include "flow-util.h"
+
+#include "util-debug.h"
+#include "util-spm-bm.h"
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
+
+static int DetectPktDataSetup (DetectEngineCtx *, Signature *, char *);
+static void DetectPktDataTestRegister(void);
+
+/**
+ * \brief Registration function for keyword: file_data
+ */
+void DetectPktDataRegister(void) {
+    sigmatch_table[DETECT_PKT_DATA].name = "pkt_data";
+    sigmatch_table[DETECT_PKT_DATA].Match = NULL;
+    sigmatch_table[DETECT_PKT_DATA].AppLayerMatch = NULL;
+    sigmatch_table[DETECT_PKT_DATA].alproto = ALPROTO_HTTP;
+    sigmatch_table[DETECT_PKT_DATA].Setup = DetectPktDataSetup;
+    sigmatch_table[DETECT_PKT_DATA].Free  = NULL;
+    sigmatch_table[DETECT_PKT_DATA].RegisterTests = DetectPktDataTestRegister;
+}
+
+/**
+ * \brief this function is used to parse pkt_data options
+ * \brief into the current signature
+ *
+ * \param de_ctx pointer to the Detection Engine Context
+ * \param s pointer to the Current Signature
+ * \param str pointer to the user provided "filestore" option
+ *
+ * \retval 0 on Success
+ * \retval -1 on Failure
+ */
+static int DetectPktDataSetup (DetectEngineCtx *de_ctx, Signature *s, char *str)
+{
+    SCEnter();
+    s->init_flags &= (~SIG_FLAG_INIT_FILE_DATA);
+
+    return 0;
+}
+
+/************************************Unittests*********************************/
+
+static int DetectPktDataTest01(void)
+{
+    DetectEngineCtx *de_ctx = NULL;
+    int result = 0;
+    SigMatch *sm = NULL;
+
+    de_ctx = DetectEngineCtxInit();
+    if (de_ctx == NULL)
+        goto end;
+
+    de_ctx->flags |= DE_QUIET;
+
+    Signature *sig = SigInit(de_ctx, "alert tcp any any -> any any "
+                               "(file_data; content:\"in file data\";"
+                               " pkt_data; content:\"in pkt data\";)");
+    de_ctx->sig_list = sig;
+    if (de_ctx->sig_list == NULL) {
+        SCLogError(SC_ERR_INVALID_SIGNATURE,"could not load test signature");
+        goto end;
+    }
+
+    /* sm should be in the MATCH list */
+    sm = de_ctx->sig_list->sm_lists[DETECT_SM_LIST_HSBDMATCH];
+    if (sm == NULL) {
+        printf("sm not in DETECT_SM_LIST_HSBDMATCH: ");
+        goto end;
+    }
+
+    sm = de_ctx->sig_list->sm_lists[DETECT_SM_LIST_PMATCH];
+    if (sm == NULL) {
+        printf("sm not in DETECT_SM_LIST_PMATCH: ");
+        goto end;
+    }
+
+    if (sm->type != DETECT_CONTENT) {
+        printf("sm type not DETECT_AL_HTTP_SERVER_BODY: ");
+        goto end;
+    }
+
+    if (sm->next != NULL) {
+        goto end;
+    }
+
+
+    if (sig->init_flags & SIG_FLAG_INIT_FILE_DATA) {
+        printf("sm init_flags SIG_FLAG_INIT_FILE_DATA set: ");
+        goto end;
+    }
+
+    result = 1;
+end:
+    SigGroupCleanup(de_ctx);
+    SigCleanSignatures(de_ctx);
+    DetectEngineCtxFree(de_ctx);
+
+    return result;
+}
+
+static void DetectPktDataTestRegister(void){
+#ifdef UNITTESTS
+    UtRegisterTest("DetectPktDataTest01", DetectPktDataTest01, 1);
+#endif
+}
\ No newline at end of file

diff --git a/src/detect-pkt-data.h b/src/detect-pkt-data.h
new file mode 100644 (file)
index 0000000..fbaf8b9
--- /dev/null
+++ b/src/detect-pkt-data.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2012 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ */
+
+#ifndef __DETECT_PKTDATA_H__
+#define __DETECT_PKTDATA_H__
+
+/* prototypes */
+void DetectPktDataRegister (void);
+
+#endif /* __DETECT_PKTDATA_H__ */

diff --git a/src/detect.c b/src/detect.c
index 3e274f23527651a30afd5673de438f906869bb93..9d70d29e5b9d476840e0916c7f18defbcf1f5740 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -138,6 +138,7 @@
 #include "detect-engine-hua.h"
 #include "detect-byte-extract.h"
 #include "detect-file-data.h"
+#include "detect-pkt-data.h"
 #include "detect-replace.h"
 #include "detect-tos.h"
 #include "detect-app-layer-event.h"
@@ -4655,6 +4656,7 @@ void SigTableSetup(void) {
     DetectSslVersionRegister();
     DetectByteExtractRegister();
     DetectFiledataRegister();
+    DetectPktDataRegister();
     DetectFilenameRegister();
     DetectFileextRegister();
     DetectFilestoreRegister();

diff --git a/src/detect.h b/src/detect.h
index 1a49106b40c57353e64dbc7616782bcffca59f14..9b32954e8fd21d4d4e981705e3e00e290cf7d5c8 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -1066,6 +1066,7 @@ enum {
     DETECT_AL_SSL_STATE,
     DETECT_BYTE_EXTRACT,
     DETECT_FILE_DATA,
+    DETECT_PKT_DATA,
     DETECT_AL_APP_LAYER_EVENT,
 
     DETECT_DCE_IFACE,