detect: ssh_software sticky buffer

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ab11b48d57b8230642fabb821e80a78354d112d..05e5ef539c77e9bad79a10c7f32700f93c1582bd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -215,6 +215,7 @@ detect-seq.c detect-seq.h \
 detect-sid.c detect-sid.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 \
 detect-ssh-software-version.c detect-ssh-software-version.h \
 detect-ssl-state.c detect-ssl-state.h \
 detect-ssl-version.c detect-ssl-version.h \

diff --git a/src/detect-ssh-software.c b/src/detect-ssh-software.c
new file mode 100644 (file)
index 0000000..528daed
--- /dev/null
+++ b/src/detect-ssh-software.c
@@ -0,0 +1,216 @@
+/* Copyright (C) 2007-2016 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.
+ */
+
+/**
+ * \ingroup sshlayer
+ *
+ * @{
+ */
+
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ *
+ * Implements support ssh_software sticky buffer
+ */
+
+#include "suricata-common.h"
+#include "threads.h"
+#include "decode.h"
+
+#include "detect.h"
+#include "detect-parse.h"
+#include "detect-engine.h"
+#include "detect-engine-mpm.h"
+#include "detect-engine-state.h"
+#include "detect-engine-prefilter.h"
+#include "detect-engine-content-inspection.h"
+
+#include "app-layer.h"
+#include "app-layer-parser.h"
+#include "app-layer-ssh.h"
+
+#define KEYWORD_NAME "ssh_software"
+#define KEYWORD_DOC "ssh-keywords#ssh-software"
+#define BUFFER_NAME "ssh_software"
+#define BUFFER_DESC "ssh software"
+static int g_buffer_id = 0;
+
+/** \brief SSH Software Mpm prefilter callback
+ *
+ *  \param det_ctx detection engine thread ctx
+ *  \param p packet to inspect
+ *  \param f flow to inspect
+ *  \param txv tx to inspect
+ *  \param pectx inspection context
+ */
+static void PrefilterTxSshRequestSoftware(DetectEngineThreadCtx *det_ctx,
+        const void *pectx,
+        Packet *p, Flow *f, void *txv,
+        const uint64_t idx, const uint8_t flags)
+{
+    SCEnter();
+
+    const MpmCtx *mpm_ctx = (MpmCtx *)pectx;
+    const SshState *ssh_state = txv;
+
+    if (ssh_state->cli_hdr.software_version == NULL)
+        return;
+
+    uint32_t buffer_len = strlen((char *)ssh_state->cli_hdr.software_version);
+    const uint8_t *buffer = ssh_state->cli_hdr.software_version;
+
+    if (buffer_len >= mpm_ctx->minlen) {
+        (void)mpm_table[mpm_ctx->mpm_type].Search(mpm_ctx,
+                &det_ctx->mtcu, &det_ctx->pmq, buffer, buffer_len);
+    }
+}
+
+static int PrefilterTxSshRequestSoftwareRegister(SigGroupHead *sgh, MpmCtx *mpm_ctx)
+{
+    SCEnter();
+
+    int r = PrefilterAppendTxEngine(sgh, PrefilterTxSshRequestSoftware,
+        ALPROTO_SSH, SSH_STATE_BANNER_DONE,
+        mpm_ctx, NULL, KEYWORD_NAME " (request)");
+    return r;
+}
+
+/** \brief SSH Software Mpm prefilter callback
+ *
+ *  \param det_ctx detection engine thread ctx
+ *  \param p packet to inspect
+ *  \param f flow to inspect
+ *  \param txv tx to inspect
+ *  \param pectx inspection context
+ */
+static void PrefilterTxSshResponseSoftware(DetectEngineThreadCtx *det_ctx,
+        const void *pectx,
+        Packet *p, Flow *f, void *txv,
+        const uint64_t idx, const uint8_t flags)
+{
+    SCEnter();
+
+    const MpmCtx *mpm_ctx = (MpmCtx *)pectx;
+    const SshState *ssh_state = txv;
+
+    if (ssh_state->srv_hdr.software_version == NULL)
+        return;
+
+    uint32_t buffer_len = strlen((char *)ssh_state->srv_hdr.software_version);
+    const uint8_t *buffer = ssh_state->srv_hdr.software_version;
+
+    if (buffer_len >= mpm_ctx->minlen) {
+        (void)mpm_table[mpm_ctx->mpm_type].Search(mpm_ctx,
+                &det_ctx->mtcu, &det_ctx->pmq, buffer, buffer_len);
+    }
+}
+
+static int PrefilterTxSshResponseSoftwareRegister(SigGroupHead *sgh, MpmCtx *mpm_ctx)
+{
+    SCEnter();
+
+    int r = PrefilterAppendTxEngine(sgh, PrefilterTxSshResponseSoftware,
+        ALPROTO_SSH, SSH_STATE_BANNER_DONE,
+        mpm_ctx, NULL, KEYWORD_NAME " (response)");
+    return r;
+}
+
+static int InspectEngineSshSoftware(ThreadVars *tv,
+        DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
+        const Signature *s, const SigMatchData *smd,
+        Flow *f, uint8_t flags, void *alstate, void *tx, uint64_t tx_id)
+{
+    uint8_t *software = NULL;
+    SshState *ssh_state = alstate;
+
+    if (flags & STREAM_TOSERVER)
+        software = ssh_state->cli_hdr.software_version;
+    else if (flags & STREAM_TOCLIENT)
+        software = ssh_state->srv_hdr.software_version;
+    if (software == NULL)
+        goto end;
+
+    uint32_t buffer_len = strlen((char *)software);
+    uint8_t *buffer = software;
+    if (buffer == NULL ||buffer_len == 0)
+        goto end;
+
+    det_ctx->buffer_offset = 0;
+    det_ctx->discontinue_matching = 0;
+    det_ctx->inspection_recursion_counter = 0;
+    int r = DetectEngineContentInspection(de_ctx, det_ctx, s, smd,
+                                          f,
+                                          buffer, buffer_len,
+                                          0,
+                                          DETECT_ENGINE_CONTENT_INSPECTION_MODE_STATE, NULL);
+    if (r == 1)
+        return DETECT_ENGINE_INSPECT_SIG_MATCH;
+
+ end:
+    if (flags & STREAM_TOSERVER) {
+        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
+            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
+    } else {
+        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
+            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
+    }
+    return DETECT_ENGINE_INSPECT_SIG_NO_MATCH;
+}
+
+static int DetectSshSoftwareSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg)
+{
+    s->init_data->list = g_buffer_id;
+    return 0;
+}
+
+static void DetectSshSoftwareSetupCallback(Signature *s)
+{
+    SCLogDebug("callback invoked by %u", s->id);
+    s->mask |= SIG_MASK_REQUIRE_SSH_STATE;
+}
+
+void DetectSshSoftwareRegister(void)
+{
+    sigmatch_table[DETECT_AL_SSH_SOFTWARE].name = KEYWORD_NAME;
+    sigmatch_table[DETECT_AL_SSH_SOFTWARE].desc = BUFFER_NAME " sticky buffer";
+    sigmatch_table[DETECT_AL_SSH_SOFTWARE].url = DOC_URL DOC_VERSION "/rules/" KEYWORD_DOC;
+    sigmatch_table[DETECT_AL_SSH_SOFTWARE].Setup = DetectSshSoftwareSetup;
+    sigmatch_table[DETECT_AL_SSH_SOFTWARE].flags |= SIGMATCH_NOOPT ;
+
+    DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
+            PrefilterTxSshRequestSoftwareRegister);
+    DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
+            PrefilterTxSshResponseSoftwareRegister);
+
+    DetectAppLayerInspectEngineRegister(BUFFER_NAME,
+            ALPROTO_SSH, SIG_FLAG_TOSERVER,
+            InspectEngineSshSoftware);
+    DetectAppLayerInspectEngineRegister(BUFFER_NAME,
+            ALPROTO_SSH, SIG_FLAG_TOCLIENT,
+            InspectEngineSshSoftware);
+
+    DetectBufferTypeSetDescriptionByName(BUFFER_NAME,
+            BUFFER_DESC);
+
+    DetectBufferTypeRegisterSetupCallback(BUFFER_NAME,
+            DetectSshSoftwareSetupCallback);
+
+    g_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME);
+}

diff --git a/src/detect-ssh-software.h b/src/detect-ssh-software.h
new file mode 100644 (file)
index 0000000..a741b87
--- /dev/null
+++ b/src/detect-ssh-software.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2016 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_SSH_SOFTWARE_H__
+#define __DETECT_SSH_SOFTWARE_H__
+
+void DetectSshSoftwareRegister(void);
+
+#endif /* __DETECT_SSH_SOFTWARE_H__ */

diff --git a/src/detect.c b/src/detect.c
index 4d2f2678c2e446a9cf999649a32fd9b1b6bb3732..22db7be12ff859a018239c6c64b8adee7cee9d1d 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -184,6 +184,7 @@
 #include "detect-tls-version.h"
 #include "detect-ssh-proto.h"
 #include "detect-ssh-proto-version.h"
+#include "detect-ssh-software.h"
 #include "detect-ssh-software-version.h"
 #include "detect-http-stat-code.h"
 #include "detect-ssl-version.h"
@@ -4095,6 +4096,7 @@ void SigTableSetup(void)
     DetectAsn1Register();
     DetectSshProtocolRegister();
     DetectSshVersionRegister();
+    DetectSshSoftwareRegister();
     DetectSshSoftwareVersionRegister();
     DetectSslStateRegister();
     DetectSslVersionRegister();

diff --git a/src/detect.h b/src/detect.h
index 3c6f17acf2492bf177f7d337e9bc0501d092e7cf..50a735e47c52b5c94e252ca80506ccd3fdc2dd15 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -1251,6 +1251,7 @@ enum {
     DETECT_AL_HTTP_RESPONSE_LINE,
     DETECT_AL_SSH_PROTOCOL,
     DETECT_AL_SSH_PROTOVERSION,
+    DETECT_AL_SSH_SOFTWARE,
     DETECT_AL_SSH_SOFTWAREVERSION,
     DETECT_AL_SSL_VERSION,
     DETECT_AL_SSL_STATE,