detect: add ipv6.hdr sticky buffer

Inspects IPv6 header and extension headers.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d875d43ba932c5503bc7c4405f882a62fc0d846..b3a3cc720f392ff64fd9314b97c844f8032c7d59 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -202,6 +202,7 @@ detect-ipopts.c detect-ipopts.h \
 detect-ipproto.c detect-ipproto.h \
 detect-iprep.c detect-iprep.h \
 detect-ipv4hdr.c detect-ipv4hdr.h \
+detect-ipv6hdr.c detect-ipv6hdr.h \
 detect-isdataat.c detect-isdataat.h \
 detect-itype.c detect-itype.h \
 detect-krb5-cname.c detect-krb5-cname.h \

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index b880113c6f471b279c0e45248819e070c6598302..893f6ac8942d92dbf5932d89b686be06edf8c76a 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -171,6 +171,7 @@
 #include "detect-tcpmss.h"
 #include "detect-udphdr.h"
 #include "detect-ipv4hdr.h"
+#include "detect-ipv6hdr.h"
 #include "detect-krb5-cname.h"
 #include "detect-krb5-errcode.h"
 #include "detect-krb5-msgtype.h"
@@ -531,6 +532,7 @@ void SigTableSetup(void)
     DetectUdphdrRegister();
     DetectTcpmssRegister();
     DetectIpv4hdrRegister();
+    DetectIpv6hdrRegister();
     DetectKrb5CNameRegister();
     DetectKrb5ErrCodeRegister();
     DetectKrb5MsgTypeRegister();

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
index dc978d4788b1c0cda256b3a01de3f6e878a454e0..2a86e73f2fb6a7e5b987417523bb73fca0f354cb 100644 (file)
--- a/src/detect-engine-register.h
+++ b/src/detect-engine-register.h
@@ -226,6 +226,7 @@ enum {
     DETECT_TEMPLATE,
     DETECT_TEMPLATE2,
     DETECT_IPV4HDR,
+    DETECT_IPV6HDR,
     DETECT_TCPHDR,
     DETECT_UDPHDR,
     DETECT_TCPMSS,

diff --git a/src/detect-ipv6hdr.c b/src/detect-ipv6hdr.c
new file mode 100644 (file)
index 0000000..35b40fe
--- /dev/null
+++ b/src/detect-ipv6hdr.c
@@ -0,0 +1,126 @@
+/* Copyright (C) 2007-2019 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>
+ *
+ */
+
+#include "suricata-common.h"
+
+#include "detect.h"
+#include "detect-parse.h"
+#include "detect-engine.h"
+#include "detect-engine-mpm.h"
+#include "detect-engine-prefilter.h"
+#include "detect-engine-content-inspection.h"
+#include "detect-fast-pattern.h"
+#include "detect-ipv6hdr.h"
+
+/* prototypes */
+static int DetectIpv6hdrSetup (DetectEngineCtx *, Signature *, const char *);
+#ifdef UNITTESTS
+void DetectIpv6hdrRegisterTests (void);
+#endif
+
+static int g_ipv6hdr_buffer_id = 0;
+
+static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
+        const DetectEngineTransforms *transforms, Packet *p, const int list_id);
+
+/**
+ * \brief Registration function for ipv6.hdr: keyword
+ */
+void DetectIpv6hdrRegister(void)
+{
+    sigmatch_table[DETECT_IPV6HDR].name = "ipv6.hdr";
+    sigmatch_table[DETECT_IPV6HDR].desc = "sticky buffer to match on the IPV4 header";
+    sigmatch_table[DETECT_IPV6HDR].url = DOC_URL DOC_VERSION "/rules/header-keywords.html#ipv6hdr";
+    sigmatch_table[DETECT_IPV6HDR].Setup = DetectIpv6hdrSetup;
+    sigmatch_table[DETECT_IPV6HDR].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER;
+#ifdef UNITTESTS
+    sigmatch_table[DETECT_IPV6HDR].RegisterTests = DetectIpv6hdrRegisterTests;
+#endif
+
+    g_ipv6hdr_buffer_id = DetectBufferTypeRegister("ipv6.hdr");
+    BUG_ON(g_ipv6hdr_buffer_id < 0);
+
+    DetectBufferTypeSupportsPacket("ipv6.hdr");
+
+    DetectPktMpmRegister("ipv6.hdr", 2, PrefilterGenericMpmPktRegister, GetData);
+
+    DetectPktInspectEngineRegister("ipv6.hdr", GetData,
+            DetectEngineInspectPktBufferGeneric);
+
+    return;
+}
+
+/**
+ * \brief setup ipv6.hdr sticky buffer
+ *
+ * \param de_ctx pointer to the Detection Engine Context
+ * \param s pointer to the Current Signature
+ * \param _unused unused
+ *
+ * \retval 0 on Success
+ * \retval -1 on Failure
+ */
+static int DetectIpv6hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char *_unused)
+{
+    s->proto.flags |= DETECT_PROTO_IPV6; // TODO
+
+    s->flags |= SIG_FLAG_REQUIRE_PACKET;
+
+    if (DetectBufferSetActiveList(s, g_ipv6hdr_buffer_id) < 0)
+        return -1;
+
+    return 0;
+}
+
+static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
+        const DetectEngineTransforms *transforms, Packet *p, const int list_id)
+{
+    SCEnter();
+
+    InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
+    if (buffer->inspect == NULL) {
+        uint32_t hlen = IPV6_HEADER_LEN + IPV6_GET_EXTHDRS_LEN(p);
+        if (((uint8_t *)p->ip6h + (ptrdiff_t)hlen) >
+                ((uint8_t *)GET_PKT_DATA(p) + (ptrdiff_t)GET_PKT_LEN(p)))
+        {
+            SCLogDebug("data out of range: %p > %p (exthdrs_len %u)",
+                    ((uint8_t *)p->ip6h + (ptrdiff_t)hlen),
+                    ((uint8_t *)GET_PKT_DATA(p) + (ptrdiff_t)GET_PKT_LEN(p)),
+                    IPV6_GET_EXTHDRS_LEN(p));
+            return NULL;
+        }
+
+        const uint32_t data_len = hlen;
+        const uint8_t *data = (const uint8_t *)p->ip6h;
+
+        InspectionBufferSetup(buffer, data, data_len);
+        InspectionBufferApplyTransforms(buffer, transforms);
+    }
+
+    return buffer;
+}
+
+#ifdef UNITTESTS
+#include "tests/detect-ipv6hdr.c"
+#endif

diff --git a/src/detect-ipv6hdr.h b/src/detect-ipv6hdr.h
new file mode 100644 (file)
index 0000000..0ff454d
--- /dev/null
+++ b/src/detect-ipv6hdr.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2019 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_IPV6HDR_H
+#define _DETECT_IPV6HDR_H
+
+void DetectIpv6hdrRegister(void);
+
+#endif /* _DETECT_IPV6HDR_H */

diff --git a/src/tests/detect-ipv6hdr.c b/src/tests/detect-ipv6hdr.c
new file mode 100644 (file)
index 0000000..1373ad7
--- /dev/null
+++ b/src/tests/detect-ipv6hdr.c
@@ -0,0 +1,47 @@
+/* Copyright (C) 2007-2018 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.
+ */
+
+#include "../suricata-common.h"
+
+#include "../detect.h"
+#include "../detect-parse.h"
+#include "../detect-engine-prefilter-common.h"
+
+#include "../detect-ipv6hdr.h"
+
+#include "../util-unittest.h"
+
+static int DetectIpv6hdrParseTest01 (void)
+{
+    DetectEngineCtx *de_ctx = DetectEngineCtxInit();
+    FAIL_IF_NULL(de_ctx);
+
+    Signature *sig = DetectEngineAppendSig(de_ctx,
+            "alert ip any any -> any any (ipv6.hdr; content:\"A\"; sid:1; rev:1;)");
+    FAIL_IF_NULL(sig);
+
+    DetectEngineCtxFree(de_ctx);
+    PASS;
+}
+
+/**
+ * \brief this function registers unit tests for DetectIpv6hdr
+ */
+void DetectIpv6hdrRegisterTests(void)
+{
+    UtRegisterTest("DetectIpv6hdrParseTest01", DetectIpv6hdrParseTest01);
+}