detect/sip.request_line: add sticky buffer

Matches on request line field in SIP.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1aca38f5549e38ccba567206fe369daf7128c4a5..46a0fb70ad9527ddd84473f6aaf663483c8fab63 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -250,6 +250,7 @@ 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-sip-request-line.c detect-sip-request-line.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 6bbd758d63222014f8fedc12731d3c5f7546f7de..f3531f3e2997a56c2208c4b86ba6e763a1cf1636 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -184,6 +184,7 @@
 #include "detect-sip-protocol.h"
 #include "detect-sip-stat-code.h"
 #include "detect-sip-stat-msg.h"
+#include "detect-sip-request-line.h"
 #include "detect-target.h"
 #include "detect-template-rust-buffer.h"
 #include "detect-snmp-version.h"
@@ -554,6 +555,7 @@ void SigTableSetup(void)
     DetectSipProtocolRegister();
     DetectSipStatCodeRegister();
     DetectSipStatMsgRegister();
+    DetectSipRequestLineRegister();
     DetectTargetRegister();
     DetectTemplateRustBufferRegister();
     DetectSNMPVersionRegister();

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
index f980a7a7aa88db3ed5e4e8aadecc2ba60e53f7f3..145505f12ed61288c53a22b5174ef738b10d50b8 100644 (file)
--- a/src/detect-engine-register.h
+++ b/src/detect-engine-register.h
@@ -231,6 +231,7 @@ enum {
     DETECT_AL_SIP_PROTOCOL,
     DETECT_AL_SIP_STAT_CODE,
     DETECT_AL_SIP_STAT_MSG,
+    DETECT_AL_SIP_REQUEST_LINE,
 
     DETECT_TEMPLATE,
     DETECT_TEMPLATE2,

diff --git a/src/detect-sip-request-line.c b/src/detect-sip-request-line.c
new file mode 100644 (file)
index 0000000..20fe8a7
--- /dev/null
+++ b/src/detect-sip-request-line.c
@@ -0,0 +1,118 @@
+/* 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.request_line 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-request-line.h"
+#include "stream-tcp.h"
+
+#include "rust.h"
+#include "app-layer-sip.h"
+#include "rust-sip-detect-gen.h"
+
+#define KEYWORD_NAME "sip.request_line"
+#define KEYWORD_DOC  "sip-keywords.html#sip-request-line"
+#define BUFFER_NAME  "sip.request_line"
+#define BUFFER_DESC  "sip request line"
+static int g_buffer_id = 0;
+
+static int DetectSipRequestLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
+{
+    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)
+{
+    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_request_line(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 DetectSipRequestLineRegister(void)
+{
+    /* sip.request_line sticky buffer */
+    sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].name = KEYWORD_NAME;
+    sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].desc = "sticky buffer to match on the SIP request line";
+    sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC;
+    sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].Setup = DetectSipRequestLineSetup;
+    sigmatch_table[DETECT_AL_SIP_REQUEST_LINE].flags |= SIGMATCH_NOOPT;
+
+    DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_SIP,
+            SIG_FLAG_TOSERVER, 0,
+            DetectEngineInspectBufferGeneric, GetData);
+
+    DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
+            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-request-line.h b/src/detect-sip-request-line.h
new file mode 100644 (file)
index 0000000..88efffa
--- /dev/null
+++ b/src/detect-sip-request-line.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_REQUEST_LINE_H__
+#define __DETECT_SIP_REQUEST_LINE_H__
+
+void DetectSipRequestLineRegister(void);
+
+#endif /* __DETECT_SIP_REQUEST_LINE_H__ */