detect/sip.stat_msg: add sticky buffer

Matches on status msg field in SIP.

diff --git a/rust/src/sip/detect.rs b/rust/src/sip/detect.rs
index 53684baa9d50f184e8138b0af19216834806aecb..0ca29401121bb8aead78a2d8cddb2f9eb90039df 100644 (file)
--- a/rust/src/sip/detect.rs
+++ b/rust/src/sip/detect.rs
@@ -120,3 +120,24 @@ pub unsafe extern "C" fn rs_sip_tx_get_stat_code(tx:  &mut SIPTransaction,
 
     return 0;
 }
+
+#[no_mangle]
+pub unsafe extern "C" fn rs_sip_tx_get_stat_msg(tx:  &mut SIPTransaction,
+                                                buffer: *mut *const u8,
+                                                buffer_len: *mut u32)
+                                                -> u8
+{
+    if let Some(ref r) = tx.response {
+        let re = &r.reason;
+        if re.len() > 0 {
+            *buffer = re.as_ptr();
+            *buffer_len = re.len() as u32;
+            return 1;
+        }
+    }
+
+    *buffer = ptr::null();
+    *buffer_len = 0;
+
+    return 0;
+}

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b98a9259f81e8bfced4dcf5464454be0b5e0faf..1aca38f5549e38ccba567206fe369daf7128c4a5 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -249,6 +249,7 @@ detect-sip-method.c detect-sip-method.h \
 detect-sip-uri.c detect-sip-uri.h \
 detect-sip-protocol.c detect-sip-protocol.h \
 detect-sip-stat-code.c detect-sip-stat-code.h \
+detect-sip-stat-msg.c detect-sip-stat-msg.h \
 detect-ssh-proto.c detect-ssh-proto.h \
 detect-ssh-proto-version.c detect-ssh-proto-version.h \
 detect-ssh-software.c detect-ssh-software.h \

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index 34fcc00756998b33f0936cb707dcd663a9e7aaa8..6bbd758d63222014f8fedc12731d3c5f7546f7de 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -183,6 +183,7 @@
 #include "detect-sip-uri.h"
 #include "detect-sip-protocol.h"
 #include "detect-sip-stat-code.h"
+#include "detect-sip-stat-msg.h"
 #include "detect-target.h"
 #include "detect-template-rust-buffer.h"
 #include "detect-snmp-version.h"
@@ -552,6 +553,7 @@ void SigTableSetup(void)
     DetectSipUriRegister();
     DetectSipProtocolRegister();
     DetectSipStatCodeRegister();
+    DetectSipStatMsgRegister();
     DetectTargetRegister();
     DetectTemplateRustBufferRegister();
     DetectSNMPVersionRegister();

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
index 28b9f0400157090b11a588cbff12b75074ccae05..f980a7a7aa88db3ed5e4e8aadecc2ba60e53f7f3 100644 (file)
--- a/src/detect-engine-register.h
+++ b/src/detect-engine-register.h
@@ -230,6 +230,7 @@ enum {
     DETECT_AL_SIP_URI,
     DETECT_AL_SIP_PROTOCOL,
     DETECT_AL_SIP_STAT_CODE,
+    DETECT_AL_SIP_STAT_MSG,
 
     DETECT_TEMPLATE,
     DETECT_TEMPLATE2,

diff --git a/src/detect-sip-stat-msg.c b/src/detect-sip-stat-msg.c
new file mode 100644 (file)
index 0000000..ffc3aac
--- /dev/null
+++ b/src/detect-sip-stat-msg.c
@@ -0,0 +1,121 @@
+/* Copyright (C) 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.
+ */
+
+/**
+ *
+ * \author Giuseppe Longo <giuseppe@glongo.it>
+ *
+ * Implements the sip.stat_msg sticky buffer
+ *
+ */
+
+#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-prefilter.h"
+#include "detect-content.h"
+#include "detect-pcre.h"
+#include "detect-urilen.h"
+
+#include "flow.h"
+#include "flow-var.h"
+#include "flow-util.h"
+
+#include "util-debug.h"
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
+#include "util-spm.h"
+
+#include "app-layer.h"
+#include "app-layer-parser.h"
+
+#include "detect-sip-stat-msg.h"
+#include "stream-tcp.h"
+
+#include "rust.h"
+#include "app-layer-sip.h"
+#include "rust-sip-detect-gen.h"
+
+#define KEYWORD_NAME "sip.stat_msg"
+#define KEYWORD_DOC  "sip-keywords.html#sip-stat-msg"
+#define BUFFER_NAME  "sip.stat_msg"
+#define BUFFER_DESC  "sip response status message"
+static int g_buffer_id = 0;
+
+static int DetectSipStatMsgSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
+{
+    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+        return -1;
+
+    if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)
+        return -1;
+
+    return 0;
+}
+
+static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
+        const DetectEngineTransforms *transforms, Flow *_f,
+        const uint8_t _flow_flags, void *txv, const int list_id)
+{
+    SCEnter();
+
+    InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
+    if (buffer->inspect == NULL) {
+        const uint8_t *b = NULL;
+        uint32_t b_len = 0;
+
+        if (rs_sip_tx_get_stat_msg(txv, &b, &b_len) != 1)
+            return NULL;
+        if (b == NULL || b_len == 0)
+            return NULL;
+
+        InspectionBufferSetup(buffer, b, b_len);
+        InspectionBufferApplyTransforms(buffer, transforms);
+    }
+
+    return buffer;
+}
+
+void DetectSipStatMsgRegister (void)
+{
+    /* sip.stat_msg sticky buffer */
+    sigmatch_table[DETECT_AL_SIP_STAT_MSG].name = KEYWORD_NAME;
+    sigmatch_table[DETECT_AL_SIP_STAT_MSG].desc = "sticky buffer to match on the SIP status message";
+    sigmatch_table[DETECT_AL_SIP_STAT_MSG].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC;
+    sigmatch_table[DETECT_AL_SIP_STAT_MSG].Setup = DetectSipStatMsgSetup;
+    sigmatch_table[DETECT_AL_SIP_STAT_MSG].flags |= SIGMATCH_NOOPT;
+
+    DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_SIP,
+            SIG_FLAG_TOCLIENT, 1,
+            DetectEngineInspectBufferGeneric, GetData);
+
+    DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 3,
+            PrefilterGenericMpmRegister, GetData, ALPROTO_SIP,
+            1);
+
+    DetectBufferTypeSetDescriptionByName(BUFFER_NAME, BUFFER_DESC);
+
+    g_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME);
+
+    SCLogDebug("registering " BUFFER_NAME " rule option");
+}

diff --git a/src/detect-sip-stat-msg.h b/src/detect-sip-stat-msg.h
new file mode 100644 (file)
index 0000000..29b2e21
--- /dev/null
+++ b/src/detect-sip-stat-msg.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 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 Giuseppe Longo <giuseppe@glongo.it>
+ */
+
+#ifndef __DETECT_SIP_STAT_MSG_H__
+#define __DETECT_SIP_STAT_MSG_H__
+
+void DetectSipStatMsgRegister(void);
+
+#endif /* __DETECT_SIP_STAT_MSG_H__ */