detect/sip.uri: add sticky buffer

Matches on uri field in SIP.

diff --git a/rust/src/sip/detect.rs b/rust/src/sip/detect.rs
index 3ca496a821439e4e64ea41ff683453b35366295f..8e105fd1c9e3170554a2c59b9ec2023d4fcee868 100644 (file)
--- a/rust/src/sip/detect.rs
+++ b/rust/src/sip/detect.rs
@@ -41,3 +41,24 @@ pub unsafe extern "C" fn rs_sip_tx_get_method(tx:  &mut SIPTransaction,
 
     return 0;
 }
+
+#[no_mangle]
+pub unsafe extern "C" fn rs_sip_tx_get_uri(tx:  &mut SIPTransaction,
+                                           buffer: *mut *const u8,
+                                           buffer_len: *mut u32)
+                                           -> u8
+{
+    if let Some(ref r) = tx.request {
+        let p = &r.path;
+        if p.len() > 0 {
+            *buffer = p.as_ptr();
+            *buffer_len = p.len() as u32;
+            return 1;
+        }
+    }
+
+    *buffer = ptr::null();
+    *buffer_len = 0;
+
+    return 0;
+}

diff --git a/src/Makefile.am b/src/Makefile.am
index 8caeff8f6c5cdc8945e0ba9a679d8c816840d771..e81872e70d983042c413ffc42614f5ad4e2def60 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -246,6 +246,7 @@ detect-snmp-community.c detect-snmp-community.h \
 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-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 b52c05b2f99f9948437ede3d4659d37ce1cccfe7..6d62be2a269b2f81f46c14740a6e65e5e3d784e9 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -180,6 +180,7 @@
 #include "detect-krb5-msgtype.h"
 #include "detect-krb5-sname.h"
 #include "detect-sip-method.h"
+#include "detect-sip-uri.h"
 #include "detect-target.h"
 #include "detect-template-rust-buffer.h"
 #include "detect-snmp-version.h"
@@ -546,6 +547,7 @@ void SigTableSetup(void)
     DetectKrb5MsgTypeRegister();
     DetectKrb5SNameRegister();
     DetectSipMethodRegister();
+    DetectSipUriRegister();
     DetectTargetRegister();
     DetectTemplateRustBufferRegister();
     DetectSNMPVersionRegister();

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

diff --git a/src/detect-sip-uri.c b/src/detect-sip-uri.c
new file mode 100644 (file)
index 0000000..74bcddc
--- /dev/null
+++ b/src/detect-sip-uri.c
@@ -0,0 +1,136 @@
+/* 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.uri 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-uri.h"
+#include "stream-tcp.h"
+
+#include "rust.h"
+#include "app-layer-sip.h"
+#include "rust-sip-detect-gen.h"
+
+#define KEYWORD_NAME "sip.uri"
+#define KEYWORD_DOC  "sip-keywords.html#sip-uri"
+#define BUFFER_NAME  "sip.uri"
+#define BUFFER_DESC  "sip request uri"
+static int g_buffer_id = 0;
+
+static bool DetectSipUriValidateCallback(const Signature *s, const char **sigerror)
+{
+    return DetectUrilenValidateContent(s, g_buffer_id, sigerror);
+}
+
+static void DetectSipUriSetupCallback(const DetectEngineCtx *de_ctx,
+                                       Signature *s)
+{
+    SCLogDebug("callback invoked by %u", s->id);
+    DetectUrilenApplyToContent(s, g_buffer_id);
+}
+
+static int DetectSipUriSetup(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)
+{
+    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_uri(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 DetectSipUriRegister(void)
+{
+    sigmatch_table[DETECT_AL_SIP_URI].name = KEYWORD_NAME;
+    sigmatch_table[DETECT_AL_SIP_URI].desc = "sticky buffer to match on the SIP URI";
+    sigmatch_table[DETECT_AL_SIP_URI].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC;
+    sigmatch_table[DETECT_AL_SIP_URI].Setup = DetectSipUriSetup;
+    sigmatch_table[DETECT_AL_SIP_URI].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);
+
+    DetectBufferTypeRegisterSetupCallback(BUFFER_NAME,
+            DetectSipUriSetupCallback);
+
+    DetectBufferTypeRegisterValidateCallback(BUFFER_NAME,
+            DetectSipUriValidateCallback);
+
+    g_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME);
+
+    SCLogDebug("registering " BUFFER_NAME " rule option");
+}

diff --git a/src/detect-sip-uri.h b/src/detect-sip-uri.h
new file mode 100644 (file)
index 0000000..1614205
--- /dev/null
+++ b/src/detect-sip-uri.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_URI_H__
+#define __DETECT_SIP_URI_H__
+
+void DetectSipUriRegister(void);
+
+#endif /* __DETECT_SIP_URI_H__ */