]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
eve-log: SMTP JSON logger
authorTom DeCanio <decanio.tom@gmail.com>
Wed, 2 Apr 2014 19:48:01 +0000 (12:48 -0700)
committerVictor Julien <victor@inliniac.net>
Thu, 30 Oct 2014 12:33:53 +0000 (13:33 +0100)
12 files changed:
src/Makefile.am
src/log-filestore.c
src/mime-decode.c
src/mime-decode.h
src/output-json-email-common.c [new file with mode: 0644]
src/output-json-email-common.h [new file with mode: 0644]
src/output-json-file.c
src/output-json-smtp.c [new file with mode: 0644]
src/output-json-smtp.h [new file with mode: 0644]
src/suricata.c
src/tm-modules.c
src/tm-threads-common.h

index 6d6be901fae609b8adf805b3baec73779b436e3f..48d894803850dd9a9944d92ea73429cd557b5742 100644 (file)
@@ -222,10 +222,12 @@ output-flow.c output-flow.h \
 output-json-alert.c output-json-alert.h \
 output-json-dns.c output-json-dns.h \
 output-json-drop.c output-json-drop.h \
+output-json-email-common.c output-json-email-common.h \
 output-json-file.c output-json-file.h \
 output-json-flow.c output-json-flow.h \
 output-json-netflow.c output-json-netflow.h \
 output-json-http.c output-json-http.h \
+output-json-smtp.c output-json-smtp.h \
 output-json-ssh.c output-json-ssh.h \
 output-json-tls.c output-json-tls.h \
 output-lua.c output-lua.h \
index 771cc8105dbd0fb7b7cade57c2d5e7c8b4c89e3b..f962b3a398dc0a56b71ba2cae59d56637766e8ed 100644 (file)
@@ -141,7 +141,7 @@ static void LogFilestoreMetaGetUserAgent(FILE *fp, const Packet *p, const File *
     fprintf(fp, "<unknown>");
 }
 
-static void LogFilestoreMetaGetSmtp(FILE *fp, Packet *p, File *ff) {
+static void LogFilestoreMetaGetSmtp(FILE *fp, const Packet *p, const File *ff) {
 
     SMTPState *state = (SMTPState *) p->flow->alstate;
     if (state != NULL && state->msg_tail != NULL) {
index fdca4f07bc0fd04ec1cefce51c2f0700086306d4..3068511b5985fdfa20805513c39788e9afdcbcc3 100644 (file)
@@ -79,6 +79,7 @@
 /* Globally hold configuration data */
 static MimeDecConfig mime_dec_config = { 1, 1, 1, MAX_HEADER_VALUE };
 
+#ifdef DEBUG
 /* Mime Parser String translation */
 static const char *StateFlags[] = { "NONE",
         "HEADER_READY",
@@ -90,6 +91,7 @@ static const char *StateFlags[] = { "NONE",
         "PARSE_DONE",
         "PARSE_ERROR",
         NULL };
+#endif
 
 /* URL executable file extensions */
 static const char *UrlExeExts[] = { ".exe",
@@ -1019,10 +1021,14 @@ static int FindUrlStrings(const char *line, uint32_t len,
                 } else {
                     /* Not an EXE URL */
                     /* Cut off length at first '/' */
+                    /* If seems that BAESystems had done the following
+                       in support of PEScan.  We don't want it for logging.
+                       Therefore its been removed.
                     tok = FindString(tempUrl, tempUrlLen, "/");
                     if (tok != NULL) {
                         tempUrlLen = tok - tempUrl;
                     }
+                    */
                 }
 
                 /* Make sure remaining URL exists */
index 381907c66ecaa2174e1fd95505564aedec7e1f3c..e5188b74da97144ce174e14ea24769264055ba08 100644 (file)
@@ -34,6 +34,7 @@
 #include "util-debug.h"
 
 /* Header Flags */
+#define HDR_IS_LOGGED         1
 
 /* Content Flags */
 #define CTNT_IS_MSG           1
diff --git a/src/output-json-email-common.c b/src/output-json-email-common.c
new file mode 100644 (file)
index 0000000..15a8b31
--- /dev/null
@@ -0,0 +1,254 @@
+/* Copyright (C) 2007-2014 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 Tom DeCanio <td@npulsetech.com>
+ *
+ * Implements json common email logging portion of the engine.
+ */
+
+#include "suricata-common.h"
+#include "debug.h"
+#include "detect.h"
+#include "pkt-var.h"
+#include "conf.h"
+
+#include "threads.h"
+#include "threadvars.h"
+#include "tm-threads.h"
+#include "tm-threads-common.h"
+
+#include "util-print.h"
+#include "util-unittest.h"
+
+#include "util-debug.h"
+#include "app-layer-parser.h"
+#include "output.h"
+#include "app-layer-smtp.h"
+#include "app-layer.h"
+#include "util-privs.h"
+#include "util-buffer.h"
+#include "util-byte.h"
+
+#include "util-logopenfile.h"
+#include "util-crypt.h"
+
+#include "output-json.h"
+#include "output-json-email-common.h"
+
+#ifdef HAVE_LIBJANSSON
+#include <jansson.h>
+
+/* JSON format logging */
+static TmEcode JsonEmailLogJson(JsonEmailLogThread *aft,
+                                json_t *js,
+                                const Packet *p)
+{
+    SMTPState *smtp_state;
+    MimeDecParseState *mime_state;
+    MimeDecEntity *entity;
+    char *protos = NULL;
+
+    /* no flow, no smtp state */
+    if (p->flow == NULL) {
+        SCReturnInt(TM_ECODE_FAILED);
+    }
+
+    json_t *sjs = json_object();
+    if (sjs == NULL) {
+        SCReturnInt(TM_ECODE_FAILED);
+    }
+
+    /* check if we have SMTP state or not */
+    FLOWLOCK_WRLOCK(p->flow); /* WRITE lock before we updated flow logged id */
+    AppProto proto = FlowGetAppProtocol(p->flow);
+    switch (proto) {
+        case ALPROTO_SMTP:
+            smtp_state = (SMTPState *)FlowGetAppState(p->flow);
+            if (smtp_state == NULL) {
+                SCLogDebug("no smtp state, so no request logging");
+                FLOWLOCK_UNLOCK(p->flow);
+                SCReturnInt(TM_ECODE_FAILED);
+            }
+            mime_state = smtp_state->mime_state;
+            entity = smtp_state->msg_tail;
+            protos = "smtp";
+            break;
+        default:
+            /* don't know how we got here */
+            FLOWLOCK_UNLOCK(p->flow);
+            SCReturnInt(TM_ECODE_FAILED);
+    }
+    if ((mime_state != NULL) &&
+        (mime_state->state_flag == PARSE_DONE)) {
+
+        if (entity == NULL) {
+            FLOWLOCK_UNLOCK(p->flow);
+            SCReturnInt(TM_ECODE_FAILED);
+        }
+
+        if ((entity->header_flags & HDR_IS_LOGGED) == 0) {
+            MimeDecField *field;
+            //printf("email LOG\n");
+
+            /* From: */
+            field = MimeDecFindField(entity, "From");
+            if (field != NULL) {
+                char *s = BytesToString((uint8_t *)field->value,
+                                        (size_t)field->value_len);
+                if (likely(s != NULL)) {
+                    //printf("From: \"%s\"\n", s);
+                    json_object_set_new(sjs, "from", json_string(s));
+                    SCFree(s);
+                }
+            }
+
+            /* To: */
+            char *to_line = NULL;
+            field = MimeDecFindField(entity, "To");
+            if (field != NULL) {
+                json_t *js_to = json_array();
+                if (likely(js_to != NULL)) {
+                    char *savep;
+                    char *p;
+                    to_line = BytesToString((uint8_t *)field->value,
+                                            (size_t)field->value_len);
+                    //printf("to_line:: TO: \"%s\" (%d)\n", to_line, strlen(to_line));
+                    p = strtok_r(to_line, ",", &savep);
+                    //printf("got another addr: \"%s\"\n", p);
+                    json_array_append_new(js_to, json_string(p));
+                    while ((p = strtok_r(NULL, ",", &savep)) != NULL) {
+                        //printf("got another addr: \"%s\"\n", p);
+                        json_array_append_new(js_to, json_string(&p[strspn(p, " ")]));
+                    }
+                    json_object_set_new(sjs, "to", js_to);
+                }
+            }
+
+            /* Cc: */
+            char *cc_line = NULL;
+            field = MimeDecFindField(entity, "Cc");
+            if (field != NULL) {
+                json_t *js_cc = json_array();
+                if (likely(js_cc != NULL)) {
+                    char *savep;
+                    char *p;
+                    cc_line = BytesToString((uint8_t *)field->value,
+                                            (size_t)field->value_len);
+                    //printf("cc_line:: CC: \"%s\" (%d)\n", to_line, strlen(to_line));
+                    p = strtok_r(cc_line, ",", &savep);
+                    //printf("got another addr: \"%s\"\n", p);
+                    json_array_append_new(js_cc, json_string(p));
+                    while ((p = strtok_r(NULL, ",", &savep)) != NULL) {
+                        //printf("got another addr: \"%s\"\n", p);
+                        json_array_append_new(js_cc, json_string(&p[strspn(p, " ")]));
+                    }
+                    json_object_set_new(sjs, "cc", js_cc);
+                }
+            }
+
+            /* Subject: */
+            field = MimeDecFindField(entity, "Subject");
+            if (field != NULL) {
+                char *s = strndup(field->value, (int) field->value_len);
+                if (likely(s != NULL)) {
+                    //printf("Subject: \"%s\"\n", s);
+                    json_object_set_new(sjs, "subject", json_string(s));
+                    SCFree(s);
+                }
+            }
+
+            entity->header_flags |= HDR_IS_LOGGED;
+
+            entity = (MimeDecEntity *)mime_state->stack->top->data;
+            int attch_cnt = 0;
+            int url_cnt = 0;
+            json_t *js_attch = json_array();
+            json_t *js_url = json_array();
+            for (entity = entity->child; entity != NULL; entity = entity->next) {
+                if (entity->ctnt_flags & CTNT_IS_ATTACHMENT) {
+
+                    char *s = BytesToString((uint8_t *)entity->filename,
+                                            (size_t)entity->filename_len);
+                    //printf("found attachment \"%s\"\n", s);
+                    json_array_append_new(js_attch,
+                                          json_string(s));
+                    SCFree(s);
+                    attch_cnt += 1;
+                }
+                if (entity->url_list != NULL) {
+                    MimeDecUrl *url;
+                    for (url = entity->url_list; url != NULL; url = url->next) {
+                        char *s = BytesToString((uint8_t *)url->url,
+                                                (size_t)url->url_len);
+                        if (s != NULL) {
+                            //printf("URL: \"%s\"\n", s);
+                            json_array_append_new(js_url,
+                                              json_string(s));
+                            SCFree(s);
+                            url_cnt += 1;
+                        }
+                    }
+                }
+            }
+            if (attch_cnt > 0) {
+                json_object_set_new(sjs, "attachment", js_attch);
+            } else {
+                json_decref(js_attch);
+            }
+            if (url_cnt > 0) {
+                json_object_set_new(sjs, "url", js_url);
+            } else {
+                json_decref(js_url);
+            }
+            json_object_set_new(js, protos, sjs);
+
+            FLOWLOCK_UNLOCK(p->flow);
+            SCReturnInt(TM_ECODE_OK);
+        }
+    }
+
+    FLOWLOCK_UNLOCK(p->flow);
+    SCReturnInt(TM_ECODE_DONE);
+}
+
+int JsonEmailLogger(ThreadVars *tv, void *thread_data, const Packet *p) {
+    SCEnter();
+    JsonEmailLogThread *jhl = (JsonEmailLogThread *)thread_data;
+    MemBuffer *buffer = (MemBuffer *)jhl->buffer;
+
+    json_t *js = CreateJSONHeader((Packet *)p, 1, "smtp");
+    if (unlikely(js == NULL))
+        return TM_ECODE_OK;
+
+    /* reset */
+    MemBufferReset(buffer);
+
+    if (JsonEmailLogJson(jhl, js, p) == TM_ECODE_OK) {
+        OutputJSONBuffer(js, jhl->emaillog_ctx->file_ctx, buffer);
+    }
+    json_object_del(js, "smtp");
+
+    json_object_clear(js);
+    json_decref(js);
+
+    SCReturnInt(TM_ECODE_OK);
+}
+
+#endif
diff --git a/src/output-json-email-common.h b/src/output-json-email-common.h
new file mode 100644 (file)
index 0000000..b073d93
--- /dev/null
@@ -0,0 +1,40 @@
+/* Copyright (C) 2007-2014 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 Tom DeCanio <td@npulsetech.com>
+ */
+
+#ifndef __OUTPUT_JSON_EMAIL_COMMON_H__
+#define __OUTPUT_JSON_EMAIL_COMMON_H__
+
+typedef struct OutputJsonEmailCtx_ {
+    LogFileCtx *file_ctx;
+    uint32_t flags; /** Store mode */
+} OutputJsonEmailCtx;
+
+
+typedef struct JsonEmailLogThread_ {
+    OutputJsonEmailCtx *emaillog_ctx;
+    MemBuffer *buffer;
+} JsonEmailLogThread;
+
+int JsonEmailLogger(ThreadVars *tv, void *thread_data, const Packet *p);
+
+#endif /* __OUTPUT_JSON_EMAIL_COMMON_H__ */
index aacb60c6c16de18d9b8b004207c98191db38e43b..93250fb4f636aa776d1a3e8ad303503eb67f63ae 100644 (file)
@@ -187,11 +187,16 @@ static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const F
         return;
     }
 
-    json_object_set_new(hjs, "url", LogFileMetaGetUri(p, ff));
-    json_object_set_new(hjs, "hostname", LogFileMetaGetHost(p, ff));
-    json_object_set_new(hjs, "http_refer", LogFileMetaGetReferer(p, ff));
-    json_object_set_new(hjs, "http_user_agent", LogFileMetaGetUserAgent(p, ff));
-    json_object_set_new(js, "http", hjs);
+    switch (p->flow->alproto) {
+        case ALPROTO_HTTP:
+            json_object_set_new(hjs, "url", LogFileMetaGetUri(p, ff));
+            json_object_set_new(hjs, "hostname", LogFileMetaGetHost(p, ff));
+            json_object_set_new(hjs, "http_refer", LogFileMetaGetReferer(p, ff));
+            json_object_set_new(hjs, "http_user_agent", LogFileMetaGetUserAgent(p, ff));
+            json_object_set_new(js, "http", hjs);
+            break;
+    }
+
 
     json_t *fjs = json_object();
     if (unlikely(fjs == NULL)) {
diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
new file mode 100644 (file)
index 0000000..db6374e
--- /dev/null
@@ -0,0 +1,237 @@
+/* Copyright (C) 2007-2013 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 Tom DeCanio <td@npulsetech.com>
+ *
+ * Implements SMTP JSON logging portion of the engine.
+ */
+
+#include "suricata-common.h"
+#include "debug.h"
+#include "detect.h"
+#include "pkt-var.h"
+#include "conf.h"
+
+#include "threads.h"
+#include "threadvars.h"
+#include "tm-threads.h"
+
+#include "util-print.h"
+#include "util-unittest.h"
+
+#include "util-debug.h"
+
+#include "output.h"
+#include "app-layer-smtp.h"
+#include "app-layer.h"
+#include "app-layer-parser.h"
+#include "util-privs.h"
+#include "util-buffer.h"
+#include "util-proto-name.h"
+#include "util-logopenfile.h"
+#include "util-time.h"
+
+#include "output-json.h"
+#include "output-json-email-common.h"
+
+#ifdef HAVE_LIBJANSSON
+#include <jansson.h>
+
+static int JsonSmtpLogger(ThreadVars *tv, void *thread_data, const Packet *p)
+{
+    SCEnter();
+
+    SCReturnInt(JsonEmailLogger(tv, thread_data, p));
+}
+
+#define DEFAULT_LOG_FILENAME "smtp.json"
+OutputCtx *OutputSmtpLogInit(ConfNode *conf)
+{
+    LogFileCtx *file_ctx = LogFileNewCtx();
+    if(file_ctx == NULL) {
+        SCLogError(SC_ERR_HTTP_LOG_GENERIC, "couldn't create new file_ctx");
+        return NULL;
+    }
+
+    if (SCConfLogOpenGeneric(conf, file_ctx, DEFAULT_LOG_FILENAME) < 0) {
+        LogFileFreeCtx(file_ctx);
+        return NULL;
+    }
+
+    OutputJsonEmailCtx *email_ctx = SCMalloc(sizeof(OutputJsonEmailCtx));
+    if (unlikely(email_ctx == NULL)) {
+        LogFileFreeCtx(file_ctx);
+        return NULL;
+    }
+
+    OutputCtx *output_ctx = SCCalloc(1, sizeof(OutputCtx));
+    if (unlikely(output_ctx == NULL)) {
+        LogFileFreeCtx(file_ctx);
+        SCFree(email_ctx);
+        return NULL;
+    }
+
+    email_ctx->file_ctx = file_ctx;
+
+    output_ctx->data = email_ctx;
+    output_ctx->DeInit = NULL;
+
+    /* enable the logger for the app layer */
+    AppLayerParserRegisterLogger(IPPROTO_TCP, ALPROTO_SMTP);
+
+    return output_ctx;
+}
+
+static OutputCtx *OutputSmtpLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
+{
+    AlertJsonThread *ajt = parent_ctx->data;
+
+    OutputJsonEmailCtx *email_ctx = SCMalloc(sizeof(OutputJsonEmailCtx));
+    if (unlikely(email_ctx == NULL))
+        return NULL;
+
+    OutputCtx *output_ctx = SCCalloc(1, sizeof(OutputCtx));
+    if (unlikely(output_ctx == NULL)) {
+        SCFree(email_ctx);
+        return NULL;
+    }
+
+    email_ctx->file_ctx = ajt->file_ctx;
+
+    output_ctx->data = email_ctx;
+    output_ctx->DeInit = NULL;
+
+    /* enable the logger for the app layer */
+    AppLayerParserRegisterLogger(IPPROTO_TCP, ALPROTO_SMTP);
+
+    return output_ctx;
+}
+
+#define OUTPUT_BUFFER_SIZE 65535
+static TmEcode JsonSmtpLogThreadInit(ThreadVars *t, void *initdata, void **data)
+{
+    JsonEmailLogThread *aft = SCMalloc(sizeof(JsonEmailLogThread));
+    if (unlikely(aft == NULL))
+        return TM_ECODE_FAILED;
+    memset(aft, 0, sizeof(JsonEmailLogThread));
+
+    if(initdata == NULL)
+    {
+        SCLogDebug("Error getting context for HTTPLog.  \"initdata\" argument NULL");
+        SCFree(aft);
+        return TM_ECODE_FAILED;
+    }
+
+    /* Use the Ouptut Context (file pointer and mutex) */
+    aft->emaillog_ctx = ((OutputCtx *)initdata)->data;
+
+    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    if (aft->buffer == NULL) {
+        SCFree(aft);
+        return TM_ECODE_FAILED;
+    }
+
+    *data = (void *)aft;
+    return TM_ECODE_OK;
+}
+
+static TmEcode JsonSmtpLogThreadDeinit(ThreadVars *t, void *data)
+{
+    JsonEmailLogThread *aft = (JsonEmailLogThread *)data;
+    if (aft == NULL) {
+        return TM_ECODE_OK;
+    }
+
+    MemBufferFree(aft->buffer);
+    /* clear memory */
+    memset(aft, 0, sizeof(JsonEmailLogThread));
+
+    SCFree(aft);
+    return TM_ECODE_OK;
+}
+
+/** \internal
+ *  \brief Condition function for SMTP logger
+ *  \retval bool true or false -- log now?
+ */
+static int JsonSmtpCondition(ThreadVars *tv, const Packet *p) {
+    if (p->flow == NULL) {
+        return FALSE;
+    }
+
+    if (!(PKT_IS_TCP(p))) {
+        return FALSE;
+    }
+
+    FLOWLOCK_RDLOCK(p->flow);
+    uint16_t proto = FlowGetAppProtocol(p->flow);
+    if (proto != ALPROTO_SMTP)
+        goto dontlog;
+
+    SMTPState *smtp_state = (SMTPState *)FlowGetAppState(p->flow);
+    if (smtp_state == NULL) {
+        SCLogDebug("no smtp state, so no request logging");
+        goto dontlog;
+    }
+
+    FLOWLOCK_UNLOCK(p->flow);
+    return TRUE;
+dontlog:
+    FLOWLOCK_UNLOCK(p->flow);
+    return FALSE;
+}
+
+void TmModuleJsonSmtpLogRegister (void) {
+    tmm_modules[TMM_JSONSMTPLOG].name = "JsonSmtpLog";
+    tmm_modules[TMM_JSONSMTPLOG].ThreadInit = JsonSmtpLogThreadInit;
+    tmm_modules[TMM_JSONSMTPLOG].ThreadDeinit = JsonSmtpLogThreadDeinit;
+    tmm_modules[TMM_JSONSMTPLOG].RegisterTests = NULL;
+    tmm_modules[TMM_JSONSMTPLOG].cap_flags = 0;
+    tmm_modules[TMM_JSONSMTPLOG].flags = TM_FLAG_LOGAPI_TM;
+
+    /* register as separate module */
+    OutputRegisterPacketModule("JsonSmtpLog", "smtp-json-log",
+                               OutputSmtpLogInit,
+                               JsonSmtpLogger,
+                               JsonSmtpCondition);
+
+    /* also register as child of eve-log */
+    OutputRegisterPacketSubModule("eve-log", "JsonSmtpLog",
+                                  "eve-log.smtp",
+                                  OutputSmtpLogInitSub,
+                                  JsonSmtpLogger,
+                                  JsonSmtpCondition);
+}
+
+#else
+
+static TmEcode OutputJsonThreadInit(ThreadVars *t, void *initdata, void **data)
+{
+    SCLogInfo("Can't init JSON output - JSON support was disabled during build.");
+    return TM_ECODE_FAILED;
+}
+
+void TmModuleJsonSmtpLogRegister (void)
+{
+    tmm_modules[TMM_JSONSMTPLOG].name = "JsonSmtpLog";
+    tmm_modules[TMM_JSONSMTPLOG].ThreadInit = OutputJsonThreadInit;
+}
+
+#endif
diff --git a/src/output-json-smtp.h b/src/output-json-smtp.h
new file mode 100644 (file)
index 0000000..d38187c
--- /dev/null
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2010 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 Tom DeCanio <td@npulsetech.com>
+ */
+
+#ifndef __OUTPUT_JSON_SMTP_H__
+#define __OUTPUT_JSON_SMTP_H__
+
+void TmModuleJsonSmtpLogRegister (void);
+
+#endif /* __OUTPUT_JSON_SMTP_H__ */
index 13cdd8ea1fe72d10d229e05361c0049388ba568b..853904f3a3c674e7635480c53005cf09915d3ace 100644 (file)
@@ -93,6 +93,7 @@
 #include "log-pcap.h"
 #include "log-file.h"
 #include "output-json-file.h"
+#include "output-json-smtp.h"
 #include "log-filestore.h"
 #include "log-tcp-data.h"
 
@@ -870,6 +871,8 @@ void RegisterAllModules()
     TmModuleJsonDropLogRegister();
     /* json log */
     TmModuleOutputJsonRegister();
+    /* email logs */
+    TmModuleJsonSmtpLogRegister();
     /* http log */
     TmModuleLogHttpLogRegister();
     TmModuleJsonHttpLogRegister();
index 791938e6b10f32498242b0d14fad21969ffe0198..8503f02686f20d128a731f69808ec535792033ce 100644 (file)
@@ -260,6 +260,7 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_JSONFILELOG);
         CASE_CODE (TMM_JSONFLOWLOG);
         CASE_CODE (TMM_JSONNETFLOWLOG);
+        CASE_CODE (TMM_JSONSMTPLOG);
         CASE_CODE (TMM_JSONSSHLOG);
         CASE_CODE (TMM_JSONTLSLOG);
         CASE_CODE (TMM_OUTPUTJSON);
index 867190d745d3f13b4242edec5a77f79a4a8c554e..0137e1027917cda2b1af2aa1dfe22bfbcaf4bee4 100644 (file)
@@ -88,6 +88,7 @@ typedef enum {
     TMM_JSONDROPLOG,
     TMM_JSONHTTPLOG,
     TMM_JSONDNSLOG,
+    TMM_JSONSMTPLOG,
     TMM_JSONSSHLOG,
     TMM_JSONTLSLOG,
     TMM_JSONFILELOG,