suricata checkin based on commit id a4bce14770beee46a537eda3c3f6e8e8565d5d0a

Change-Id: I9a214fa0ee95e58fc640e50bd604dac7f42db48f

1 files changed, 222 insertions, 0 deletions

diff --git a/framework/src/suricata/src/detect-sameip.c b/framework/src/suricata/src/detect-sameip.c
new file mode 100644
index 00000000..a8e02908
--- /dev/null
+++ b/framework/src/suricata/src/detect-sameip.c
@@ -0,0 +1,222 @@
+/* Copyright (C) 2007-2010 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 Brian Rectanus <brectanu@gmail.com>
+ *
+ * Implements the sameip keyword.
+ */
+
+#include "suricata-common.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-sameip.h"
+
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
+
+static int DetectSameipMatch(ThreadVars *, DetectEngineThreadCtx *, Packet *,
+                             Signature *, const SigMatchCtx *);
+static int DetectSameipSetup(DetectEngineCtx *, Signature *, char *);
+static void DetectSameipRegisterTests(void);
+
+/**
+ * \brief Registration function for sameip: keyword
+ * \todo add support for no_stream and stream_only
+ */
+void DetectSameipRegister(void)
+{
+    sigmatch_table[DETECT_SAMEIP].name = "sameip";
+    sigmatch_table[DETECT_SAMEIP].desc = "check if the IP address of the source is the same as the IP address of the destination";
+    sigmatch_table[DETECT_SAMEIP].url = "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Header_keywords#sameip";
+    sigmatch_table[DETECT_SAMEIP].Match = DetectSameipMatch;
+    sigmatch_table[DETECT_SAMEIP].Setup = DetectSameipSetup;
+    sigmatch_table[DETECT_SAMEIP].Free = NULL;
+    sigmatch_table[DETECT_SAMEIP].RegisterTests = DetectSameipRegisterTests;
+    sigmatch_table[DETECT_SAMEIP].flags = SIGMATCH_NOOPT;
+}
+
+/**
+ * \internal
+ * \brief This function is used to match packets with same src/dst IPs
+ *
+ * \param t pointer to thread vars
+ * \param det_ctx pointer to the pattern matcher thread
+ * \param p pointer to the current packet
+ * \param m pointer to the sigmatch that we will cast into DetectSameipData
+ *
+ * \retval 0 no match
+ * \retval 1 match
+ */
+static int DetectSameipMatch(ThreadVars *t, DetectEngineThreadCtx *det_ctx,
+                             Packet *p, Signature *s, const SigMatchCtx *ctx)
+{
+    return CMP_ADDR(&p->src, &p->dst) ? 1 : 0;
+}
+
+/**
+ * \internal
+ * \brief this function is used to add the sameip option into the signature
+ *
+ * \param de_ctx pointer to the Detection Engine Context
+ * \param s pointer to the Current Signature
+ * \param optstr pointer to the user provided options
+ *
+ * \retval 0 on Success
+ * \retval -1 on Failure
+ */
+static int DetectSameipSetup(DetectEngineCtx *de_ctx, Signature *s, char *optstr)
+{
+    SigMatch *sm = NULL;
+
+    /* Get this into a SigMatch and put it in the Signature. */
+    sm = SigMatchAlloc();
+    if (sm == NULL)
+        goto error;
+
+    sm->type = DETECT_SAMEIP;
+    sm->ctx = NULL;
+
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_MATCH);
+    s->flags |= SIG_FLAG_REQUIRE_PACKET;
+
+    return 0;
+
+error:
+    if (sm != NULL)
+        SCFree(sm);
+    return -1;
+
+}
+
+#ifdef UNITTESTS
+
+/* NOTE: No parameters, so no parse tests */
+
+/**
+ * \internal
+ * \brief This test tests sameip success and failure.
+ */
+static int DetectSameipSigTest01Real(int mpm_type)
+{
+    uint8_t *buf = (uint8_t *)
+                    "GET / HTTP/1.0\r\n"
+                    "\r\n";
+    uint16_t buflen = strlen((char *)buf);
+    Packet *p1 = NULL;
+    Packet *p2 = NULL;
+    ThreadVars th_v;
+    DetectEngineThreadCtx *det_ctx;
+    int result = 0;
+
+    memset(&th_v, 0, sizeof(th_v));
+
+    /* First packet has same IPs */
+    p1 = UTHBuildPacketSrcDst(buf, buflen, IPPROTO_TCP, "1.2.3.4", "1.2.3.4");
+
+    /* Second packet does not have same IPs */
+    p2 = UTHBuildPacketSrcDst(buf, buflen, IPPROTO_TCP, "1.2.3.4", "4.3.2.1");
+
+    DetectEngineCtx *de_ctx = DetectEngineCtxInit();
+    if (de_ctx == NULL) {
+        goto end;
+    }
+
+    de_ctx->mpm_matcher = mpm_type;
+    de_ctx->flags |= DE_QUIET;
+
+    de_ctx->sig_list = SigInit(de_ctx,
+                                     "alert tcp any any -> any any "
+                                     "(msg:\"Testing sameip\"; sameip; sid:1;)");
+    if (de_ctx->sig_list == NULL) {
+        goto end;
+    }
+
+    SigGroupBuild(de_ctx);
+    DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
+
+    SigMatchSignatures(&th_v, de_ctx, det_ctx, p1);
+    if (PacketAlertCheck(p1, 1) == 0) {
+        printf("sid 2 did not alert, but should have: ");
+        goto cleanup;
+    }
+
+    SigMatchSignatures(&th_v, de_ctx, det_ctx, p2);
+    if (PacketAlertCheck(p2, 1) != 0) {
+        printf("sid 2 alerted, but should not have: ");
+        goto cleanup;
+    }
+
+    result = 1;
+
+cleanup:
+    SigGroupCleanup(de_ctx);
+    SigCleanSignatures(de_ctx);
+
+    DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
+    DetectEngineCtxFree(de_ctx);
+
+end:
+    return result;
+}
+
+/**
+ * \test DetectSameipSigTest01B2g tests sameip under B2g MPM
+ */
+static int DetectSameipSigTest01B2g(void)
+{
+    return DetectSameipSigTest01Real(MPM_B2G);
+}
+
+/**
+ * \test DetectSameipSigTest01B2g tests sameip under B3g MPM
+ */
+static int DetectSameipSigTest01B3g(void)
+{
+    return DetectSameipSigTest01Real(MPM_B3G);
+}
+
+/**
+ * \test DetectSameipSigTest01B2g tests sameip under WuManber MPM
+ */
+static int DetectSameipSigTest01Wm(void)
+{
+    return DetectSameipSigTest01Real(MPM_WUMANBER);
+}
+
+#endif /* UNITTESTS */
+
+/**
+ * \internal
+ * \brief This function registers unit tests for DetectSameip
+ */
+static void DetectSameipRegisterTests(void)
+{
+#ifdef UNITTESTS
+    UtRegisterTest("DetectSameipSigTest01B2g", DetectSameipSigTest01B2g, 1);
+    UtRegisterTest("DetectSameipSigTest01B3g", DetectSameipSigTest01B3g, 1);
+    UtRegisterTest("DetectSameipSigTest01Wm", DetectSameipSigTest01Wm, 1);
+#endif /* UNITTESTS */
+}