detect/sip.protocol: add sticky buffer

Matches on protocol field in SIP.

diff --git a/rust/src/sip/detect.rs b/rust/src/sip/detect.rs
index 8e105fd1c9e3170554a2c59b9ec2023d4fcee868..c5e5beef038063d3c991cb69a5c6563929a8e74d 100644 (file)
--- a/rust/src/sip/detect.rs
+++ b/rust/src/sip/detect.rs
@@ -18,7 +18,7 @@
 // written by Giuseppe Longo <giuseppe@glongo.it>
 
 use std::ptr;
-
+use core::{STREAM_TOCLIENT, STREAM_TOSERVER};
 use sip::sip::SIPTransaction;
 
 #[no_mangle]
@@ -62,3 +62,40 @@ pub unsafe extern "C" fn rs_sip_tx_get_uri(tx:  &mut SIPTransaction,
 
     return 0;
 }
+
+#[no_mangle]
+pub unsafe extern "C" fn rs_sip_tx_get_protocol(tx:  &mut SIPTransaction,
+                                                buffer: *mut *const u8,
+                                                buffer_len: *mut u32,
+                                                direction: u8)
+                                                -> u8
+{
+    match direction {
+        STREAM_TOSERVER => {
+            if let Some(ref r) = tx.request {
+                let v = &r.version;
+                if v.len() > 0 {
+                    *buffer = v.as_ptr();
+                    *buffer_len = v.len() as u32;
+                    return 1;
+                }
+            }
+        }
+        STREAM_TOCLIENT => {
+            if let Some(ref r) = tx.response {
+                let v = &r.version;
+                if v.len() > 0 {
+                    *buffer = v.as_ptr();
+                    *buffer_len = v.len() as u32;
+                    return 1;
+                }
+            }
+        }
+        _ => {}
+    }
+
+    *buffer = ptr::null();
+    *buffer_len = 0;
+
+    return 0;
+}

diff --git a/src/Makefile.am b/src/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index e81872e..f768cac
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -247,6 +247,7 @@ detect-snmp-pdu_type.c detect-snmp-pdu_type.h \
 detect-snmp-version.c detect-snmp-version.h \
 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-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 6d62be2a269b2f81f46c14740a6e65e5e3d784e9..72bca86583833d777b2a2b4ca72c7d53e12b2785 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -181,6 +181,7 @@
 #include "detect-krb5-sname.h"
 #include "detect-sip-method.h"
 #include "detect-sip-uri.h"
+#include "detect-sip-protocol.h"
 #include "detect-target.h"
 #include "detect-template-rust-buffer.h"
 #include "detect-snmp-version.h"
@@ -548,6 +549,7 @@ void SigTableSetup(void)
     DetectKrb5SNameRegister();
     DetectSipMethodRegister();
     DetectSipUriRegister();
+    DetectSipProtocolRegister();
     DetectTargetRegister();
     DetectTemplateRustBufferRegister();
     DetectSNMPVersionRegister();

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
index 2652c7f4cabcaa877c63da6af2bb77d72a67e44a..b575434212fad4d44f8a1c0f8ffc19266dde08b2 100644 (file)
--- a/src/detect-engine-register.h
+++ b/src/detect-engine-register.h
@@ -228,6 +228,7 @@ enum {
 
     DETECT_AL_SIP_METHOD,
     DETECT_AL_SIP_URI,
+    DETECT_AL_SIP_PROTOCOL,
 
     DETECT_TEMPLATE,
     DETECT_TEMPLATE2,

diff --git a/src/detect-sip-protocol.c b/src/detect-sip-protocol.c
new file mode 100644 (file)
index 0000000..4bc3d47
--- /dev/null
+++ b/src/detect-sip-protocol.c
@@ -0,0 +1,123 @@
+ /* 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 sip.protocol 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-engine-content-inspection.h"
+#include "detect-content.h"
+#include "detect-pcre.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-protocol.h"
+#include "stream-tcp.h"
+
+#include "rust.h"
+#include "app-layer-sip.h"
+#include "rust-sip-detect-gen.h"
+
+#define KEYWORD_NAME "sip.protocol"
+#define KEYWORD_DOC  "sip-keywords.html#sip-protocol"
+#define BUFFER_NAME  "sip.protocol"
+#define BUFFER_DESC  "sip protocol"
+static int g_buffer_id = 0;
+
+static int DetectSipProtocolSetup(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_protocol(txv, &b, &b_len, flow_flags) != 1)
+            return NULL;
+        if (b == NULL || b_len == 0)
+            return NULL;
+        InspectionBufferSetup(buffer, b, b_len);
+        InspectionBufferApplyTransforms(buffer, transforms);
+    }
+
+    return buffer;
+}
+
+void DetectSipProtocolRegister(void)
+{
+    /* sip.protocol sticky buffer */
+    sigmatch_table[DETECT_AL_SIP_PROTOCOL].name = KEYWORD_NAME;
+    sigmatch_table[DETECT_AL_SIP_PROTOCOL].desc = "sticky buffer to match on the SIP protocol";
+    sigmatch_table[DETECT_AL_SIP_PROTOCOL].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC;
+    sigmatch_table[DETECT_AL_SIP_PROTOCOL].Setup = DetectSipProtocolSetup;
+    sigmatch_table[DETECT_AL_SIP_PROTOCOL].flags |= SIGMATCH_NOOPT;
+
+    DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
+            PrefilterGenericMpmRegister, GetData, ALPROTO_SIP,
+            1);
+    DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
+            PrefilterGenericMpmRegister, GetData, ALPROTO_SIP,
+            1);
+    DetectAppLayerInspectEngineRegister2(BUFFER_NAME,
+            ALPROTO_SIP, SIG_FLAG_TOSERVER, 1,
+            DetectEngineInspectBufferGeneric, GetData);
+    DetectAppLayerInspectEngineRegister2(BUFFER_NAME,
+            ALPROTO_SIP, SIG_FLAG_TOCLIENT, 1,
+            DetectEngineInspectBufferGeneric, GetData);
+
+    DetectBufferTypeSetDescriptionByName(BUFFER_NAME, BUFFER_DESC);
+
+    g_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME);
+
+    SCLogDebug("registering " BUFFER_NAME " rule option");
+}

diff --git a/src/detect-sip-protocol.h b/src/detect-sip-protocol.h
new file mode 100644 (file)
index 0000000..ca8f228
--- /dev/null
+++ b/src/detect-sip-protocol.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_PROTOCOL_H__
+#define __DETECT_SIP_PROTOCOL_H__
+
+void DetectSipProtocolRegister(void);
+
+#endif /* __DETECT_SIP_PROTOCOL_H__ */