output-filedata.c output-filedata.h \
output-packet.c output-packet.h \
output-tx.c output-tx.h \
+output-dnslog.c output-dnslog.h \
+output-httplog.c output-httplog.h \
packet-queue.c packet-queue.h \
pkt-var.c pkt-var.h \
reputation.c reputation.h \
#include "util-print.h"
#include "util-proto-name.h"
#include "util-optimize.h"
+#include "util-buffer.h"
#include "util-logopenfile.h"
/*#undef HAVE_LIBJANSSON for testing without messing with config */
#define DEFAULT_ALERT_SYSLOG_LEVEL LOG_INFO
#define MODULE_NAME "AlertJSON"
+#define OUTPUT_BUFFER_SIZE 65535
+
extern uint8_t engine_mode;
#ifndef OS_WIN32
static int alert_syslog_level = DEFAULT_ALERT_SYSLOG_LEVEL;
typedef struct AlertJsonThread_ {
/** LogFileCtx has the pointer to the file and a mutex to allow multithreading */
LogFileCtx* file_ctx;
+
+ MemBuffer *buffer;
} AlertJsonThread;
TmEcode AlertJsonIPv4(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
if (p->alerts.cnt == 0)
return TM_ECODE_OK;
+ MemBufferReset(aft->buffer);
+
CreateTimeString(&p->ts, timebuf, sizeof(timebuf));
char srcip[16], dstip[16];
#endif
SCMutexLock(&aft->file_ctx->fp_mutex);
if (json_out == ALERT_FILE) {
+#if 1
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteString(aft->buffer, "%s", s);
+ MemBufferWriteString(aft->buffer, "\n");
+ free(s);
+ (void)MemBufferPrintToFPAsString(aft->buffer, aft->file_ctx->fp);
+ fflush(aft->file_ctx->fp);
+#else
json_dumpf(js, aft->file_ctx->fp,
((format == INDENT) ? JSON_INDENT(2) : 0) |
JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
if (format == INDENT) {
fputs("\n", aft->file_ctx->fp);
}
+#endif
} else {
char *js_s;
js_s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
if (p->alerts.cnt == 0)
return TM_ECODE_OK;
+ MemBufferReset(aft->buffer);
+
CreateTimeString(&p->ts, timebuf, sizeof(timebuf));
char srcip[46], dstip[46];
PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip));
for (i = 0; i < p->alerts.cnt; i++) {
PacketAlert *pa = &p->alerts.alerts[i];
- json_t *js;
if (unlikely(pa->s == NULL)) {
continue;
}
} else {
snprintf(proto, sizeof(proto), "PROTO:%03" PRIu32, IP_GET_IPPROTO(p));
}
+#if 1
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+
+ json_t *ajs = json_object();
+ if (ajs == NULL) {
+ free(js);
+ return;
+ }
+
+ /* time & tx */
+ json_object_set_new(js, "time", json_string(timebuf));
+
+ /* tuple */
+ json_object_set_new(js, "srcip", json_string(srcip));
+ json_object_set_new(js, "sp", json_integer(p->sp));
+ json_object_set_new(js, "dstip", json_string(dstip));
+ json_object_set_new(js, "dp", json_integer(p->dp));
+ json_object_set_new(js, "proto", json_integer(proto));
+
+ json_object_set_new(ajs, "action", json_string(action));
+ json_object_set_new(ajs, "gid", json_integer(pa->s->gid));
+ json_object_set_new(ajs, "id", json_integer(pa->s->id));
+ json_object_set_new(ajs, "rev", json_integer(pa->s->rev));
+ json_object_set_new(ajs, "msg",
+ json_string((pa->s->msg) ? pa->s->msg : ""));
+ json_object_set_new(ajs, "class",
+ json_string((pa->s->class_msg) ? pa->s->class_msg : ""));
+ json_object_set_new(ajs, "pri", json_integer(pa->s->prio));
+
+ /* alert */
+ json_object_set_new(js, "alert", ajs);
+#else
json_error_t error;
js = json_pack_ex(
&error, 0,
SCLogInfo("json_pack error %s", error.text);
return TM_ECODE_OK;
}
-
+#endif
SCMutexLock(&aft->file_ctx->fp_mutex);
if (json_out == ALERT_FILE) {
+#if 1
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteString(aft->buffer, "%s", s);
+ MemBufferWriteString(aft->buffer, "\n");
+ free(s);
+ (void)MemBufferPrintToFPAsString(aft->buffer, aft->file_ctx->fp);
+ fflush(aft->file_ctx->fp);
+#else
json_dumpf(js, aft->file_ctx->fp,
((format == INDENT) ? JSON_INDENT(2) : 0) |
JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
if (format == INDENT) {
fputs("\n", aft->file_ctx->fp);
}
+#endif
} else {
char *js_s;
js_s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
if (p->alerts.cnt == 0)
return TM_ECODE_OK;
+ MemBufferReset(aft->buffer);
+
CreateTimeString(&p->ts, timebuf, sizeof(timebuf));
for (i = 0; i < p->alerts.cnt; i++) {
PacketAlert *pa = &p->alerts.alerts[i];
- json_t *js;
if (unlikely(pa->s == NULL)) {
continue;
}
char buf[(32 * 3) + 1];
PrintRawLineHexBuf(buf, sizeof(buf), GET_PKT_DATA(p), GET_PKT_LEN(p) < 32 ? GET_PKT_LEN(p) : 32);
+#if 1
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+
+ json_t *ajs = json_object();
+ if (ajs == NULL) {
+ free(js);
+ return;
+ }
+
+ /* time & tx */
+ json_object_set_new(js, "time", json_string(timebuf));
+
+ /* tuple */
+ //json_object_set_new(js, "srcip", json_string(srcip));
+ //json_object_set_new(js, "sp", json_integer(p->sp));
+ //json_object_set_new(js, "dstip", json_string(dstip));
+ //json_object_set_new(js, "dp", json_integer(p->dp));
+ //json_object_set_new(js, "proto", json_integer(proto));
+
+ json_object_set_new(ajs, "action", json_string(action));
+ json_object_set_new(ajs, "gid", json_integer(pa->s->gid));
+ json_object_set_new(ajs, "id", json_integer(pa->s->id));
+ json_object_set_new(ajs, "rev", json_integer(pa->s->rev));
+ json_object_set_new(ajs, "msg",
+ json_string((pa->s->msg) ? pa->s->msg : ""));
+ json_object_set_new(ajs, "class",
+ json_string((pa->s->class_msg) ? pa->s->class_msg : ""));
+ json_object_set_new(ajs, "pri", json_integer(pa->s->prio));
+
+ /* alert */
+ json_object_set_new(js, "alert", ajs);
+#else
json_error_t error;
js = json_pack_ex(
&error, 0,
SCLogInfo("json_pack error %s", error.text);
return TM_ECODE_OK;
}
+#endif
SCMutexLock(&aft->file_ctx->fp_mutex);
if (json_out == ALERT_FILE) {
+#if 1
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteString(aft->buffer, "%s", s);
+ MemBufferWriteString(aft->buffer, "\n");
+ free(s);
+ (void)MemBufferPrintToFPAsString(aft->buffer, aft->file_ctx->fp);
+ fflush(aft->file_ctx->fp);
+#else
json_dumpf(js, aft->file_ctx->fp,
((format == INDENT) ? JSON_INDENT(2) : 0) |
JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
- if (format == INDENT) {
+ //if (format == INDENT) {
fputs("\n", aft->file_ctx->fp);
- }
+ //}
+#endif
} else {
char *js_s;
js_s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
SCFree(aft);
return TM_ECODE_FAILED;
}
+ aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+ if (aft->buffer == NULL) {
+ SCFree(aft);
+ return TM_ECODE_FAILED;
+ }
+
/** Use the Ouptut Context (file pointer and mutex) */
//aft->ctx = ((OutputCtx *)initdata)->data;
aft->file_ctx = ((OutputCtx *)initdata)->data;
--- /dev/null
+/* 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 Victor Julien <victor@inliniac.net>
+ *
+ * Implements dns 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 "output-dnslog.h"
+#include "app-layer-dns-udp.h"
+#include "app-layer.h"
+#include "util-privs.h"
+#include "util-buffer.h"
+
+#include "util-logopenfile.h"
+#include "util-time.h"
+
+#ifdef HAVE_LIBJANSSON
+#include <jansson.h>
+
+#define DEFAULT_DNS_SYSLOG_FACILITY_STR "local0"
+#define DEFAULT_DNS_SYSLOG_FACILITY LOG_LOCAL0
+#define DEFAULT_DNS_SYSLOG_LEVEL LOG_INFO
+
+#ifndef OS_WIN32
+static int dns_syslog_level = DEFAULT_DNS_SYSLOG_LEVEL;
+#endif
+#endif
+
+#define DEFAULT_LOG_FILENAME "dns.log"
+
+#define MODULE_NAME "DnsJson"
+
+#define OUTPUT_BUFFER_SIZE 65535
+
+/* we can do query logging as well, but it's disabled for now as the
+ * TX id handling doesn't expect it */
+#define QUERY 0
+
+TmEcode DnsJson (ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
+TmEcode DnsJsonIPv4(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
+TmEcode DnsJsonIPv6(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
+TmEcode DnsJsonThreadInit(ThreadVars *, void *, void **);
+TmEcode DnsJsonThreadDeinit(ThreadVars *, void *);
+void DnsJsonExitPrintStats(ThreadVars *, void *);
+static void DnsJsonDeInitCtx(OutputCtx *);
+
+void TmModuleDnsJsonRegister (void) {
+ tmm_modules[TMM_LOGDNSJSON].name = MODULE_NAME;
+ tmm_modules[TMM_LOGDNSJSON].ThreadInit = DnsJsonThreadInit;
+ tmm_modules[TMM_LOGDNSJSON].Func = DnsJson;
+ tmm_modules[TMM_LOGDNSJSON].ThreadExitPrintStats = DnsJsonExitPrintStats;
+ tmm_modules[TMM_LOGDNSJSON].ThreadDeinit = DnsJsonThreadDeinit;
+ tmm_modules[TMM_LOGDNSJSON].RegisterTests = NULL;
+ tmm_modules[TMM_LOGDNSJSON].cap_flags = 0;
+
+ OutputRegisterModule(MODULE_NAME, "dns-log-json", DnsJsonInitCtx);
+
+ /* enable the logger for the app layer */
+ AppLayerRegisterLogger(ALPROTO_DNS_UDP);
+ AppLayerRegisterLogger(ALPROTO_DNS_TCP);
+ SCLogDebug("registered %s", MODULE_NAME);
+}
+
+typedef struct LogDnsFileCtx_ {
+ LogFileCtx *file_ctx;
+ uint32_t flags; /** Store mode */
+} LogDnsFileCtx;
+
+#define LOG_DNS_DEFAULT 0
+#define LOG_DNS_JSON_SYSLOG 2 /* JSON output via syslog */
+
+typedef struct LogDnsLogThread_ {
+ LogDnsFileCtx *dnslog_ctx;
+ /** LogFileCtx has the pointer to the file and a mutex to allow multithreading */
+ uint32_t dns_cnt;
+
+ MemBuffer *buffer;
+} LogDnsLogThread;
+
+static void CreateTypeString(uint16_t type, char *str, size_t str_size) {
+ if (type == DNS_RECORD_TYPE_A) {
+ snprintf(str, str_size, "A");
+ } else if (type == DNS_RECORD_TYPE_NS) {
+ snprintf(str, str_size, "NS");
+ } else if (type == DNS_RECORD_TYPE_AAAA) {
+ snprintf(str, str_size, "AAAA");
+ } else if (type == DNS_RECORD_TYPE_TXT) {
+ snprintf(str, str_size, "TXT");
+ } else if (type == DNS_RECORD_TYPE_CNAME) {
+ snprintf(str, str_size, "CNAME");
+ } else if (type == DNS_RECORD_TYPE_SOA) {
+ snprintf(str, str_size, "SOA");
+ } else if (type == DNS_RECORD_TYPE_MX) {
+ snprintf(str, str_size, "MX");
+ } else if (type == DNS_RECORD_TYPE_PTR) {
+ snprintf(str, str_size, "PTR");
+ } else if (type == DNS_RECORD_TYPE_ANY) {
+ snprintf(str, str_size, "ANY");
+ } else if (type == DNS_RECORD_TYPE_TKEY) {
+ snprintf(str, str_size, "TKEY");
+ } else if (type == DNS_RECORD_TYPE_TSIG) {
+ snprintf(str, str_size, "TSIG");
+ } else {
+ snprintf(str, str_size, "%04x/%u", type, type);
+ }
+}
+
+static void LogQuery(LogDnsLogThread *aft, char *timebuf, char *srcip, char *dstip, Port sp, Port dp, DNSTransaction *tx, DNSQueryEntry *entry) {
+ LogDnsFileCtx *hlog = aft->dnslog_ctx;
+
+ SCLogDebug("got a DNS request and now logging !!");
+
+ /* reset */
+ MemBufferReset(aft->buffer);
+
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+
+ json_t *djs = json_object();
+ if (djs == NULL) {
+ free(js);
+ return;
+ }
+
+ /* time & tx */
+ json_object_set_new(js, "time", json_string(timebuf));
+
+ /* tuple */
+ json_object_set_new(js, "srcip", json_string(srcip));
+ json_object_set_new(js, "sp", json_integer(sp));
+ json_object_set_new(js, "dstip", json_string(dstip));
+ json_object_set_new(js, "dp", json_integer(dp));
+
+ /* type */
+ json_object_set_new(djs, "type", json_string("query"));
+
+ /* id */
+ json_object_set_new(djs, "id", json_integer(tx->tx_id));
+
+ /* query */
+ char *c;
+ json_object_set_new(djs, "query",
+ json_string(c = strndup(
+ (char *)((char *)entry + sizeof(DNSQueryEntry)),
+ entry->len)));
+ if (c) free(c);
+
+ /* name */
+ char record[16] = "";
+ CreateTypeString(entry->type, record, sizeof(record));
+ json_object_set_new(djs, "record", json_string(record));
+
+ /* dns */
+ json_object_set_new(js, "dns", djs);
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteString(aft->buffer, "%s", s);
+ free(s);
+ free(djs);
+ free(js);
+
+ aft->dns_cnt++;
+
+ SCMutexLock(&hlog->file_ctx->fp_mutex);
+#ifdef HAVE_LIBJANSSON
+ if (hlog->flags & LOG_DNS_JSON_SYSLOG) {
+ syslog(dns_syslog_level, "%s", (char *)aft->buffer->buffer);
+ } else {
+ MemBufferWriteString(aft->buffer, "\n");
+#endif
+ (void)MemBufferPrintToFPAsString(aft->buffer, hlog->file_ctx->fp);
+ fflush(hlog->file_ctx->fp);
+#ifdef HAVE_LIBJANSSON
+ }
+#endif
+ SCMutexUnlock(&hlog->file_ctx->fp_mutex);
+}
+#if 0
+static void LogAnswer(LogDnsLogThread *aft, char *timebuf, char *srcip, char *dstip, Port sp, Port dp, DNSTransaction *tx, DNSAnswerEntry *entry) {
+ LogDnsFileCtx *hlog = aft->dnslog_ctx;
+
+ SCLogDebug("got a DNS response and now logging !!");
+
+ /* reset */
+ MemBufferReset(aft->buffer);
+
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+
+ json_t *djs = json_object();
+ if (djs == NULL) {
+ free(js);
+ return;
+ }
+
+ /* time & tx */
+ json_object_set_new(js, "time", json_string(timebuf));
+
+ /* tuple */
+ json_object_set_new(js, "srcip", json_string(srcip));
+ json_object_set_new(js, "sp", json_integer(sp));
+ json_object_set_new(js, "dstip", json_string(dstip));
+ json_object_set_new(js, "dp", json_integer(dp));
+
+ /* type */
+ json_object_set_new(djs, "type", json_string("answer"));
+
+ /* id */
+ json_object_set_new(djs, "id", json_integer(tx->tx_id));
+
+ if (entry != NULL) {
+ /* query */
+ if (entry->fqdn_len > 0) {
+ char *c;
+ json_object_set_new(djs, "query",
+ json_string(c = strndup(
+ (char *)((char *)entry + sizeof(DNSAnswerEntry)),
+ entry->fqdn_len)));
+ if (c) free(c);
+ }
+
+ /* name */
+ char record[16] = "";
+ CreateTypeString(entry->type, record, sizeof(record));
+ json_object_set_new(djs, "record", json_string(record));
+
+ /* ttl */
+ json_object_set_new(djs, "ttl", json_integer(entry->ttl));
+
+ uint8_t *ptr = (uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)+ entry->fqdn_len);
+ if (entry->type == DNS_RECORD_TYPE_A) {
+ char a[16] = "";
+ PrintInet(AF_INET, (const void *)ptr, a, sizeof(a));
+ json_object_set_new(djs, "addr", json_string(a));
+ } else if (entry->type == DNS_RECORD_TYPE_AAAA) {
+ char a[46] = "";
+ PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a));
+ json_object_set_new(djs, "addr", json_string(a));
+ } else if (entry->data_len == 0) {
+ json_object_set_new(djs, "addr", json_string(""));
+ }
+ }
+
+ /* dns */
+ json_object_set_new(js, "dns", djs);
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteString(aft->buffer, "%s", s);
+ free(s);
+ free(djs);
+ free(js);
+
+ aft->dns_cnt++;
+
+ SCMutexLock(&hlog->file_ctx->fp_mutex);
+#ifdef HAVE_LIBJANSSON
+ if (hlog->flags & LOG_DNS_JSON_SYSLOG) {
+ syslog(dns_syslog_level, "%s", (char *)aft->buffer->buffer);
+ } else {
+ MemBufferWriteString(aft->buffer, "\n");
+#endif
+ (void)MemBufferPrintToFPAsString(aft->buffer, hlog->file_ctx->fp);
+ fflush(hlog->file_ctx->fp);
+#ifdef HAVE_LIBJANSSON
+ }
+#endif
+ SCMutexUnlock(&hlog->file_ctx->fp_mutex);
+}
+#endif
+static void AppendAnswer(json_t *djs, DNSTransaction *tx, DNSAnswerEntry *entry) {
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+
+ /* type */
+ json_object_set_new(js, "type", json_string("answer"));
+
+ /* id */
+ json_object_set_new(js, "id", json_integer(tx->tx_id));
+
+ if (entry != NULL) {
+ /* query */
+ if (entry->fqdn_len > 0) {
+ char *c;
+ json_object_set_new(js, "query",
+ json_string(c = strndup(
+ (char *)((char *)entry + sizeof(DNSAnswerEntry)),
+ entry->fqdn_len)));
+ if (c) free(c);
+ }
+
+ /* name */
+ char record[16] = "";
+ CreateTypeString(entry->type, record, sizeof(record));
+ json_object_set_new(js, "record", json_string(record));
+
+ /* ttl */
+ json_object_set_new(js, "ttl", json_integer(entry->ttl));
+
+ uint8_t *ptr = (uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)+ entry->fqdn_len);
+ if (entry->type == DNS_RECORD_TYPE_A) {
+ char a[16] = "";
+ PrintInet(AF_INET, (const void *)ptr, a, sizeof(a));
+ json_object_set_new(js, "addr", json_string(a));
+ } else if (entry->type == DNS_RECORD_TYPE_AAAA) {
+ char a[46] = "";
+ PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a));
+ json_object_set_new(js, "addr", json_string(a));
+ } else if (entry->data_len == 0) {
+ json_object_set_new(js, "addr", json_string(""));
+ }
+ }
+ json_array_append_new(djs, js);
+}
+
+static void LogAnswers(LogDnsLogThread *aft, char *timebuf, char *srcip, char *dstip, Port sp, Port dp, DNSTransaction *tx) {
+ LogDnsFileCtx *hlog = aft->dnslog_ctx;
+
+ SCLogDebug("got a DNS response and now logging !!");
+
+ /* reset */
+ MemBufferReset(aft->buffer);
+
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+
+ json_t *djs = json_array();
+ if (djs == NULL) {
+ free(js);
+ return;
+ }
+
+ /* time & tx */
+ json_object_set_new(js, "time", json_string(timebuf));
+
+ /* tuple */
+ json_object_set_new(js, "srcip", json_string(srcip));
+ json_object_set_new(js, "sp", json_integer(sp));
+ json_object_set_new(js, "dstip", json_string(dstip));
+ json_object_set_new(js, "dp", json_integer(dp));
+
+#if 1
+ if (tx->no_such_name) {
+ AppendAnswer(djs, tx, NULL);
+ }
+
+ DNSAnswerEntry *entry = NULL;
+ TAILQ_FOREACH(entry, &tx->answer_list, next) {
+ AppendAnswer(djs, tx, entry);
+ }
+
+ entry = NULL;
+ TAILQ_FOREACH(entry, &tx->authority_list, next) {
+ AppendAnswer(djs, tx, entry);
+ }
+#else
+ /* type */
+ json_object_set_new(djs, "type", json_string("answer"));
+
+ /* id */
+ json_object_set_new(djs, "id", json_integer(tx->tx_id));
+
+ if (entry != NULL) {
+ /* query */
+ if (entry->fqdn_len > 0) {
+ char *c;
+ json_object_set_new(djs, "query",
+ json_string(c = strndup(
+ (char *)((char *)entry + sizeof(DNSAnswerEntry)),
+ entry->fqdn_len)));
+ if (c) free(c);
+ }
+
+ /* name */
+ char record[16] = "";
+ CreateTypeString(entry->type, record, sizeof(record));
+ json_object_set_new(djs, "record", json_string(record));
+
+ /* ttl */
+ json_object_set_new(djs, "ttl", json_integer(entry->ttl));
+
+ uint8_t *ptr = (uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)+ entry->fqdn_len);
+ if (entry->type == DNS_RECORD_TYPE_A) {
+ char a[16] = "";
+ PrintInet(AF_INET, (const void *)ptr, a, sizeof(a));
+ json_object_set_new(djs, "addr", json_string(a));
+ } else if (entry->type == DNS_RECORD_TYPE_AAAA) {
+ char a[46] = "";
+ PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a));
+ json_object_set_new(djs, "addr", json_string(a));
+ } else if (entry->data_len == 0) {
+ json_object_set_new(djs, "addr", json_string(""));
+ }
+ }
+#endif
+
+ /* dns */
+ json_object_set_new(js, "dns", djs);
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteString(aft->buffer, "%s", s);
+ free(s);
+ free(djs);
+ free(js);
+
+ aft->dns_cnt++;
+
+ SCMutexLock(&hlog->file_ctx->fp_mutex);
+#ifdef HAVE_LIBJANSSON
+ if (hlog->flags & LOG_DNS_JSON_SYSLOG) {
+ syslog(dns_syslog_level, "%s", (char *)aft->buffer->buffer);
+ } else {
+ MemBufferWriteString(aft->buffer, "\n");
+#endif
+ (void)MemBufferPrintToFPAsString(aft->buffer, hlog->file_ctx->fp);
+ fflush(hlog->file_ctx->fp);
+#ifdef HAVE_LIBJANSSON
+ }
+#endif
+ SCMutexUnlock(&hlog->file_ctx->fp_mutex);
+}
+
+static TmEcode DnsJsonIPWrapper(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
+ PacketQueue *postpq, int ipproto)
+{
+ SCEnter();
+
+ LogDnsLogThread *aft = (LogDnsLogThread *)data;
+ char timebuf[64];
+
+ /* no flow, no htp state */
+ if (p->flow == NULL) {
+ SCLogDebug("no flow");
+ SCReturnInt(TM_ECODE_OK);
+ }
+
+ /* check if we have DNS state or not */
+ FLOWLOCK_WRLOCK(p->flow); /* WRITE lock before we updated flow logged id */
+ uint16_t proto = AppLayerGetProtoFromPacket(p);
+ if (proto != ALPROTO_DNS_UDP && proto != ALPROTO_DNS_TCP) {
+ SCLogDebug("proto not ALPROTO_DNS_UDP: %u", proto);
+ goto end;
+ }
+
+ DNSState *dns_state = (DNSState *)AppLayerGetProtoStateFromPacket(p);
+ if (dns_state == NULL) {
+ SCLogDebug("no dns state, so no request logging");
+ goto end;
+ }
+
+ uint64_t total_txs = AppLayerGetTxCnt(proto, dns_state);
+ uint64_t tx_id = AppLayerTransactionGetLogId(p->flow);
+ //int tx_progress_done_value_ts = AppLayerGetAlstateProgressCompletionStatus(proto, 0);
+ //int tx_progress_done_value_tc = AppLayerGetAlstateProgressCompletionStatus(proto, 1);
+
+ SCLogDebug("pcap_cnt %"PRIu64, p->pcap_cnt);
+ CreateTimeString(&p->ts, timebuf, sizeof(timebuf));
+
+ char srcip[46], dstip[46];
+ Port sp, dp;
+ if ((PKT_IS_TOCLIENT(p))) {
+ switch (ipproto) {
+ case AF_INET:
+ PrintInet(AF_INET, (const void *)GET_IPV4_SRC_ADDR_PTR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET, (const void *)GET_IPV4_DST_ADDR_PTR(p), dstip, sizeof(dstip));
+ break;
+ case AF_INET6:
+ PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip));
+ break;
+ default:
+ goto end;
+ }
+ sp = p->sp;
+ dp = p->dp;
+ } else {
+ switch (ipproto) {
+ case AF_INET:
+ PrintInet(AF_INET, (const void *)GET_IPV4_DST_ADDR_PTR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET, (const void *)GET_IPV4_SRC_ADDR_PTR(p), dstip, sizeof(dstip));
+ break;
+ case AF_INET6:
+ PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), dstip, sizeof(dstip));
+ break;
+ default:
+ goto end;
+ }
+ sp = p->dp;
+ dp = p->sp;
+ }
+#if QUERY
+ if (PKT_IS_TOSERVER(p)) {
+ DNSTransaction *tx = NULL;
+ TAILQ_FOREACH(tx, &dns_state->tx_list, next) {
+ DNSQueryEntry *entry = NULL;
+ TAILQ_FOREACH(entry, &tx->query_list, next) {
+ LogQuery(aft, timebuf, srcip, dstip, sp, dp, tx, entry);
+ }
+ }
+ } else
+#endif
+ if ((PKT_IS_TOCLIENT(p))) {
+ DNSTransaction *tx = NULL;
+ for (; tx_id < total_txs; tx_id++)
+ {
+ tx = AppLayerGetTx(proto, dns_state, tx_id);
+ if (tx == NULL)
+ continue;
+
+ DNSQueryEntry *query = NULL;
+ TAILQ_FOREACH(query, &tx->query_list, next) {
+ LogQuery(aft, timebuf, dstip, srcip, dp, sp, tx, query);
+ }
+
+#if 1
+ LogAnswers(aft, timebuf, srcip, dstip, sp, dp, tx);
+#else
+ if (tx->no_such_name) {
+ LogAnswer(aft, timebuf, srcip, dstip, sp, dp, tx, NULL);
+ }
+
+ DNSAnswerEntry *entry = NULL;
+ TAILQ_FOREACH(entry, &tx->answer_list, next) {
+ LogAnswer(aft, timebuf, srcip, dstip, sp, dp, tx, entry);
+ }
+
+ entry = NULL;
+ TAILQ_FOREACH(entry, &tx->authority_list, next) {
+ LogAnswer(aft, timebuf, srcip, dstip, sp, dp, tx, entry);
+ }
+#endif
+
+ SCLogDebug("calling AppLayerTransactionUpdateLoggedId");
+ AppLayerTransactionUpdateLogId(ALPROTO_DNS_UDP, p->flow);
+ }
+ }
+
+end:
+ FLOWLOCK_UNLOCK(p->flow);
+ SCReturnInt(TM_ECODE_OK);
+}
+
+TmEcode DnsJsonIPv4(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+{
+ return DnsJsonIPWrapper(tv, p, data, pq, postpq, AF_INET);
+}
+
+TmEcode DnsJsonIPv6(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+{
+ return DnsJsonIPWrapper(tv, p, data, pq, postpq, AF_INET6);
+}
+
+TmEcode DnsJson (ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+{
+ SCEnter();
+
+ SCLogDebug("pcap_cnt %"PRIu64, p->pcap_cnt);
+ /* no flow, no htp state */
+ if (p->flow == NULL) {
+ SCReturnInt(TM_ECODE_OK);
+ }
+
+ if (!(PKT_IS_UDP(p)) && !(PKT_IS_TCP(p))) {
+ SCReturnInt(TM_ECODE_OK);
+ }
+
+ if (PKT_IS_IPV4(p)) {
+ int r = DnsJsonIPv4(tv, p, data, pq, postpq);
+ SCReturnInt(r);
+ } else if (PKT_IS_IPV6(p)) {
+ int r = DnsJsonIPv6(tv, p, data, pq, postpq);
+ SCReturnInt(r);
+ }
+
+ SCReturnInt(TM_ECODE_OK);
+}
+
+TmEcode DnsJsonThreadInit(ThreadVars *t, void *initdata, void **data)
+{
+ LogDnsLogThread *aft = SCMalloc(sizeof(LogDnsLogThread));
+ if (unlikely(aft == NULL))
+ return TM_ECODE_FAILED;
+ memset(aft, 0, sizeof(LogDnsLogThread));
+
+ if(initdata == NULL)
+ {
+ SCLogDebug("Error getting context for DNSLog. \"initdata\" argument NULL");
+ SCFree(aft);
+ return TM_ECODE_FAILED;
+ }
+
+ aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+ if (aft->buffer == NULL) {
+ SCFree(aft);
+ return TM_ECODE_FAILED;
+ }
+
+ /* Use the Ouptut Context (file pointer and mutex) */
+ aft->dnslog_ctx= ((OutputCtx *)initdata)->data;
+
+ *data = (void *)aft;
+ return TM_ECODE_OK;
+}
+
+TmEcode DnsJsonThreadDeinit(ThreadVars *t, void *data)
+{
+ LogDnsLogThread *aft = (LogDnsLogThread *)data;
+ if (aft == NULL) {
+ return TM_ECODE_OK;
+ }
+
+ MemBufferFree(aft->buffer);
+ /* clear memory */
+ memset(aft, 0, sizeof(LogDnsLogThread));
+
+ SCFree(aft);
+ return TM_ECODE_OK;
+}
+
+void DnsJsonExitPrintStats(ThreadVars *tv, void *data) {
+ LogDnsLogThread *aft = (LogDnsLogThread *)data;
+ if (aft == NULL) {
+ return;
+ }
+
+ SCLogInfo("DNS logger logged %" PRIu32 " requests", aft->dns_cnt);
+}
+
+/** \brief Create a new dns log LogFileCtx.
+ * \param conf Pointer to ConfNode containing this loggers configuration.
+ * \return NULL if failure, LogFileCtx* to the file_ctx if succesful
+ * */
+OutputCtx *DnsJsonInitCtx(ConfNode *conf)
+{
+ LogFileCtx* file_ctx = LogFileNewCtx();
+
+ if(file_ctx == NULL) {
+ SCLogError(SC_ERR_DNS_LOG_GENERIC, "couldn't create new file_ctx");
+ return NULL;
+ }
+
+ if (SCConfLogOpenGeneric(conf, file_ctx, DEFAULT_LOG_FILENAME) < 0) {
+ LogFileFreeCtx(file_ctx);
+ return NULL;
+ }
+
+ LogDnsFileCtx *dnslog_ctx = SCMalloc(sizeof(LogDnsFileCtx));
+ if (unlikely(dnslog_ctx == NULL)) {
+ LogFileFreeCtx(file_ctx);
+ return NULL;
+ }
+ memset(dnslog_ctx, 0x00, sizeof(LogDnsFileCtx));
+
+ dnslog_ctx->file_ctx = file_ctx;
+
+#ifdef HAVE_LIBJANSSON
+ const char *json = ConfNodeLookupChildValue(conf, "json");
+ if (json) {
+ if (strcmp(json, "syslog") == 0) {
+ dnslog_ctx->flags |= LOG_DNS_JSON_SYSLOG;
+ }
+ }
+#endif
+
+ OutputCtx *output_ctx = SCCalloc(1, sizeof(OutputCtx));
+ if (unlikely(output_ctx == NULL)) {
+ LogFileFreeCtx(file_ctx);
+ SCFree(dnslog_ctx);
+ return NULL;
+ }
+
+ output_ctx->data = dnslog_ctx;
+ output_ctx->DeInit = DnsJsonDeInitCtx;
+
+ SCLogDebug("DNS json output initialized");
+
+ return output_ctx;
+}
+
+static void DnsJsonDeInitCtx(OutputCtx *output_ctx)
+{
+ LogDnsFileCtx *dnslog_ctx = (LogDnsFileCtx *)output_ctx->data;
+ LogFileFreeCtx(dnslog_ctx->file_ctx);
+ SCFree(dnslog_ctx);
+ SCFree(output_ctx);
+}
--- /dev/null
+/* 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 Victor Julien <victor@inliniac.net>
+ */
+
+#ifndef __OUTPUT_DNSLOG_H__
+#define __OUTPUT_DNSLOG_H__
+
+void TmModuleDnsJsonRegister (void);
+void TmModuleDnsJsonIPv4Register (void);
+void TmModuleDnsJsonIPv6Register (void);
+OutputCtx *DnsJsonInitCtx(ConfNode *);
+
+#endif /* __OUTPUT_DNSLOG_H__ */
--- /dev/null
+/* 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 Victor Julien <victor@inliniac.net>
+ * \author Ignacio Sanchez <sanchezmartin.ji@gmail.com>
+ *
+ * Implements http 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 "output-httplog.h"
+#include "app-layer-htp.h"
+#include "app-layer.h"
+#include "util-privs.h"
+#include "util-buffer.h"
+
+#include "util-logopenfile.h"
+#include "util-time.h"
+
+#ifdef HAVE_LIBJANSSON
+#include <jansson.h>
+
+#define DEFAULT_HTTP_SYSLOG_FACILITY_STR "local0"
+#define DEFAULT_HTTP_SYSLOG_FACILITY LOG_LOCAL0
+#define DEFAULT_HTTP_SYSLOG_LEVEL LOG_INFO
+
+#ifndef OS_WIN32
+static int http_syslog_level = DEFAULT_HTTP_SYSLOG_LEVEL;
+#endif
+#endif
+
+#define DEFAULT_LOG_FILENAME "http.log"
+
+#define MODULE_NAME "HttpJson"
+
+#define OUTPUT_BUFFER_SIZE 65535
+
+TmEcode HttpJson (ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
+TmEcode HttpJsonIPv4(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
+TmEcode HttpJsonIPv6(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
+TmEcode HttpJsonThreadInit(ThreadVars *, void *, void **);
+TmEcode HttpJsonThreadDeinit(ThreadVars *, void *);
+void HttpJsonExitPrintStats(ThreadVars *, void *);
+static void HttpJsonDeInitCtx(OutputCtx *);
+
+void TmModuleHttpJsonRegister (void) {
+ tmm_modules[TMM_LOGHTTPJSON].name = MODULE_NAME;
+ tmm_modules[TMM_LOGHTTPJSON].ThreadInit = HttpJsonThreadInit;
+ tmm_modules[TMM_LOGHTTPJSON].Func = HttpJson;
+ tmm_modules[TMM_LOGHTTPJSON].ThreadExitPrintStats = HttpJsonExitPrintStats;
+ tmm_modules[TMM_LOGHTTPJSON].ThreadDeinit = HttpJsonThreadDeinit;
+ tmm_modules[TMM_LOGHTTPJSON].RegisterTests = NULL;
+ tmm_modules[TMM_LOGHTTPJSON].cap_flags = 0;
+
+ OutputRegisterModule(MODULE_NAME, "http-log-json", HttpJsonInitCtx);
+
+ /* enable the logger for the app layer */
+ AppLayerRegisterLogger(ALPROTO_HTTP);
+}
+
+void TmModuleHttpJsonIPv4Register (void) {
+ tmm_modules[TMM_LOGHTTPJSON4].name = "HttpJsonIPv4";
+ tmm_modules[TMM_LOGHTTPJSON4].ThreadInit = HttpJsonThreadInit;
+ tmm_modules[TMM_LOGHTTPJSON4].Func = HttpJsonIPv4;
+ tmm_modules[TMM_LOGHTTPJSON4].ThreadExitPrintStats = HttpJsonExitPrintStats;
+ tmm_modules[TMM_LOGHTTPJSON4].ThreadDeinit = HttpJsonThreadDeinit;
+ tmm_modules[TMM_LOGHTTPJSON4].RegisterTests = NULL;
+}
+
+void TmModuleHttpJsonIPv6Register (void) {
+ tmm_modules[TMM_LOGHTTPJSON6].name = "HttpJsonIPv6";
+ tmm_modules[TMM_LOGHTTPJSON6].ThreadInit = HttpJsonThreadInit;
+ tmm_modules[TMM_LOGHTTPJSON6].Func = HttpJsonIPv6;
+ tmm_modules[TMM_LOGHTTPJSON6].ThreadExitPrintStats = HttpJsonExitPrintStats;
+ tmm_modules[TMM_LOGHTTPJSON6].ThreadDeinit = HttpJsonThreadDeinit;
+ tmm_modules[TMM_LOGHTTPJSON6].RegisterTests = NULL;
+}
+
+#define LOG_HTTP_MAXN_NODES 64
+#define LOG_HTTP_NODE_STRLEN 256
+#define LOG_HTTP_NODE_MAXOUTPUTLEN 8192
+
+#define TIMESTAMP_DEFAULT_FORMAT "%b %d, %Y; %H:%M:%S"
+#define LOG_HTTP_CF_NONE "-"
+#define LOG_HTTP_CF_LITERAL '%'
+#define LOG_HTTP_CF_REQUEST_HOST 'h'
+#define LOG_HTTP_CF_REQUEST_PROTOCOL 'H'
+#define LOG_HTTP_CF_REQUEST_METHOD 'm'
+#define LOG_HTTP_CF_REQUEST_URI 'u'
+#define LOG_HTTP_CF_REQUEST_TIME 't'
+#define LOG_HTTP_CF_REQUEST_HEADER 'i'
+#define LOG_HTTP_CF_REQUEST_COOKIE 'C'
+#define LOG_HTTP_CF_REQUEST_LEN 'b'
+#define LOG_HTTP_CF_RESPONSE_STATUS 's'
+#define LOG_HTTP_CF_RESPONSE_HEADER 'o'
+#define LOG_HTTP_CF_RESPONSE_LEN 'B'
+#define LOG_HTTP_CF_TIMESTAMP 't'
+#define LOG_HTTP_CF_TIMESTAMP_U 'z'
+#define LOG_HTTP_CF_CLIENT_IP 'a'
+#define LOG_HTTP_CF_SERVER_IP 'A'
+#define LOG_HTTP_CF_CLIENT_PORT 'p'
+#define LOG_HTTP_CF_SERVER_PORT 'P'
+
+typedef struct LogHttpCustomFormatNode_ {
+ uint32_t type; /** Node format type. ie: LOG_HTTP_CF_LITERAL, LOG_HTTP_CF_REQUEST_HEADER */
+ uint32_t maxlen; /** Maximun length of the data */
+ char data[LOG_HTTP_NODE_STRLEN]; /** optional data. ie: http header name */
+} LogHttpCustomFormatNode;
+
+typedef struct LogHttpFileCtx_ {
+ LogFileCtx *file_ctx;
+ uint32_t flags; /** Store mode */
+ uint32_t cf_n; /** Total number of custom string format nodes */
+ LogHttpCustomFormatNode *cf_nodes[LOG_HTTP_MAXN_NODES]; /** Custom format string nodes */
+} LogHttpFileCtx;
+
+#define LOG_HTTP_DEFAULT 0
+#define LOG_HTTP_EXTENDED 1
+#define LOG_HTTP_CUSTOM 2
+#define LOG_HTTP_JSON_SYSLOG 8 /* JSON output via syslog */
+
+typedef struct LogHttpLogThread_ {
+ LogHttpFileCtx *httplog_ctx;
+ /** LogFileCtx has the pointer to the file and a mutex to allow multithreading */
+ uint32_t uri_cnt;
+
+ MemBuffer *buffer;
+} LogHttpLogThread;
+
+/* Retrieves the selected cookie value */
+static uint32_t GetCookieValue(uint8_t *rawcookies, uint32_t rawcookies_len, char *cookiename,
+ uint8_t **cookievalue) {
+ uint8_t *p = rawcookies;
+ uint8_t *cn = p; /* ptr to cookie name start */
+ uint8_t *cv = NULL; /* ptr to cookie value start */
+ while (p < rawcookies + rawcookies_len) {
+ if (cv == NULL && *p == '=') {
+ cv = p + 1;
+ } else if (cv != NULL && (*p == ';' || p == rawcookies + rawcookies_len - 1) ) {
+ /* Found end of cookie */
+ p++;
+ if (strlen(cookiename) == (unsigned int) (cv-cn-1) &&
+ strncmp(cookiename, (char *) cn, cv-cn-1) == 0) {
+ *cookievalue = cv;
+ return (uint32_t) (p-cv);
+ }
+ cv = NULL;
+ cn = p + 1;
+ }
+ p++;
+ }
+ return 0;
+}
+
+/* Custom format logging */
+static void LogHttpLogJSONCustom(LogHttpLogThread *aft, htp_tx_t *tx, const struct timeval *ts,
+ char *srcip, Port sp, char *dstip, Port dp)
+{
+ LogHttpFileCtx *httplog_ctx = aft->httplog_ctx;
+ uint32_t i;
+ uint32_t datalen;
+ char buf[128];
+
+ uint8_t *cvalue;
+ uint32_t cvalue_len = 0;
+
+ htp_header_t *h_request_hdr;
+ htp_header_t *h_response_hdr;
+
+ time_t time = ts->tv_sec;
+ struct tm local_tm;
+ struct tm *timestamp = SCLocalTime(time, &local_tm);
+
+ for (i = 0; i < httplog_ctx->cf_n; i++) {
+ h_request_hdr = NULL;
+ h_response_hdr = NULL;
+ switch (httplog_ctx->cf_nodes[i]->type){
+ case LOG_HTTP_CF_LITERAL:
+ /* LITERAL */
+ MemBufferWriteString(aft->buffer, "%s", httplog_ctx->cf_nodes[i]->data);
+ break;
+ case LOG_HTTP_CF_TIMESTAMP:
+ /* TIMESTAMP */
+ if (httplog_ctx->cf_nodes[i]->data[0] == '\0') {
+ strftime(buf, 62, TIMESTAMP_DEFAULT_FORMAT, timestamp);
+ } else {
+ strftime(buf, 62, httplog_ctx->cf_nodes[i]->data, timestamp);
+ }
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)buf,strlen(buf));
+ break;
+ case LOG_HTTP_CF_TIMESTAMP_U:
+ /* TIMESTAMP USECONDS */
+ snprintf(buf, 62, "%06u", (unsigned int) ts->tv_usec);
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)buf,strlen(buf));
+ break;
+ case LOG_HTTP_CF_CLIENT_IP:
+ /* CLIENT IP ADDRESS */
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)srcip,strlen(srcip));
+ break;
+ case LOG_HTTP_CF_SERVER_IP:
+ /* SERVER IP ADDRESS */
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)dstip,strlen(dstip));
+ break;
+ case LOG_HTTP_CF_CLIENT_PORT:
+ /* CLIENT PORT */
+ MemBufferWriteString(aft->buffer, "%" PRIu16 "", sp);
+ break;
+ case LOG_HTTP_CF_SERVER_PORT:
+ /* SERVER PORT */
+ MemBufferWriteString(aft->buffer, "%" PRIu16 "", dp);
+ break;
+ case LOG_HTTP_CF_REQUEST_METHOD:
+ /* METHOD */
+ if (tx->request_method != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_method),
+ bstr_len(tx->request_method));
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_REQUEST_URI:
+ /* URI */
+ if (tx->request_uri != NULL) {
+ datalen = httplog_ctx->cf_nodes[i]->maxlen;
+ if (datalen == 0 || datalen > bstr_len(tx->request_uri)) {
+ datalen = bstr_len(tx->request_uri);
+ }
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_uri),
+ datalen);
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_REQUEST_HOST:
+ /* HOSTNAME */
+ if (tx->request_hostname != NULL)
+ {
+ datalen = httplog_ctx->cf_nodes[i]->maxlen;
+ if (datalen == 0 || datalen > bstr_len(tx->parsed_uri->hostname)) {
+ datalen = bstr_len(tx->parsed_uri->hostname);
+ }
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_hostname),
+ bstr_len(tx->request_hostname));
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_REQUEST_PROTOCOL:
+ /* PROTOCOL */
+ if (tx->request_protocol != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_protocol),
+ bstr_len(tx->request_protocol));
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_REQUEST_HEADER:
+ /* REQUEST HEADER */
+ if (tx->request_headers != NULL) {
+ h_request_hdr = htp_table_get_c(tx->request_headers, httplog_ctx->cf_nodes[i]->data);
+ }
+ if (h_request_hdr != NULL) {
+ datalen = httplog_ctx->cf_nodes[i]->maxlen;
+ if (datalen == 0 || datalen > bstr_len(h_request_hdr->value)) {
+ datalen = bstr_len(h_request_hdr->value);
+ }
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(h_request_hdr->value),
+ datalen);
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_REQUEST_COOKIE:
+ /* REQUEST COOKIE */
+ if (tx->request_headers != NULL) {
+ h_request_hdr = htp_table_get_c(tx->request_headers, "Cookie");
+ if (h_request_hdr != NULL) {
+ cvalue_len = GetCookieValue((uint8_t *) bstr_ptr(h_request_hdr->value),
+ bstr_len(h_request_hdr->value), (char *) httplog_ctx->cf_nodes[i]->data,
+ &cvalue);
+ }
+ }
+ if (cvalue_len > 0) {
+ datalen = httplog_ctx->cf_nodes[i]->maxlen;
+ if (datalen == 0 || datalen > cvalue_len) {
+ datalen = cvalue_len;
+ }
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, cvalue, datalen);
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_REQUEST_LEN:
+ /* REQUEST LEN */
+ MemBufferWriteString(aft->buffer, "%"PRIuMAX"", (uintmax_t)tx->request_message_len);
+ break;
+ case LOG_HTTP_CF_RESPONSE_STATUS:
+ /* RESPONSE STATUS */
+ if (tx->response_status != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(tx->response_status),
+ bstr_len(tx->response_status));
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_RESPONSE_HEADER:
+ /* RESPONSE HEADER */
+ if (tx->response_headers != NULL) {
+ h_response_hdr = htp_table_get_c(tx->response_headers,
+ httplog_ctx->cf_nodes[i]->data);
+ }
+ if (h_response_hdr != NULL) {
+ datalen = httplog_ctx->cf_nodes[i]->maxlen;
+ if (datalen == 0 || datalen > bstr_len(h_response_hdr->value)) {
+ datalen = bstr_len(h_response_hdr->value);
+ }
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
+ aft->buffer->size, (uint8_t *)bstr_ptr(h_response_hdr->value),
+ datalen);
+ } else {
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ }
+ break;
+ case LOG_HTTP_CF_RESPONSE_LEN:
+ /* RESPONSE LEN */
+ MemBufferWriteString(aft->buffer, "%"PRIuMAX"", (uintmax_t)tx->response_message_len);
+ break;
+ default:
+ /* NO MATCH */
+ MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
+ SCLogDebug("No matching parameter %%%c for custom http log.", httplog_ctx->cf_nodes[i]->type);
+ break;
+ }
+ }
+ MemBufferWriteString(aft->buffer, "\n");
+}
+
+#ifdef HAVE_LIBJANSSON
+/* JSON format logging */
+static void LogHttpLogJSON(LogHttpLogThread *aft, htp_tx_t *tx, char * timebuf,
+ char *srcip, Port sp, char *dstip, Port dp)
+{
+ LogHttpFileCtx *hlog = aft->httplog_ctx;
+ json_t *js = json_object();
+ if (js == NULL)
+ return;
+#if 0
+ json_t *hjs = js;
+#else
+ json_t *hjs = json_object();
+ if (hjs == NULL) {
+ free(js);
+ return;
+ }
+#endif
+
+ /* time */
+ json_object_set_new(js, "time", json_string(timebuf));
+
+ /* tuple */
+ json_object_set_new(js, "srcip", json_string(srcip));
+ json_object_set_new(js, "sp", json_integer(sp));
+ json_object_set_new(js, "dstip", json_string(dstip));
+ json_object_set_new(js, "dp", json_integer(dp));
+
+
+ char *c;
+ /* hostname */
+ if (tx->request_hostname != NULL)
+ {
+ json_object_set_new(hjs, "hostname",
+ json_string(c = strndup(bstr_ptr(tx->request_hostname),
+ bstr_len(tx->request_hostname))));
+ if (c) free(c);
+ } else {
+ json_object_set_new(hjs, "hostname", json_string("<hostname unknown>"));
+ }
+
+ /* uri */
+ if (tx->request_uri != NULL)
+ {
+ json_object_set_new(hjs, "uri",
+ json_string(c = strndup(bstr_ptr(tx->request_uri),
+ bstr_len(tx->request_uri))));
+ if (c) free(c);
+ }
+
+ /* user agent */
+ htp_header_t *h_user_agent = NULL;
+ if (tx->request_headers != NULL) {
+ h_user_agent = htp_table_get_c(tx->request_headers, "user-agent");
+ }
+ if (h_user_agent != NULL) {
+ json_object_set_new(hjs, "user-agent",
+ json_string(c = strndup(bstr_ptr(h_user_agent->value),
+ bstr_len(h_user_agent->value))));
+ if (c) free(c);
+ } else {
+ json_object_set_new(hjs, "user-agent", json_string("<useragent unknown>"));
+ }
+
+ /* x-forwarded-for */
+ htp_header_t *h_x_forwarded_for = NULL;
+ if (tx->request_headers != NULL) {
+ h_x_forwarded_for = htp_table_get_c(tx->request_headers, "x-forwarded-for");
+ }
+ if (h_x_forwarded_for != NULL) {
+ json_object_set_new(hjs, "xff",
+ json_string(c = strndup(bstr_ptr(h_x_forwarded_for->value),
+ bstr_len(h_x_forwarded_for->value))));
+ if (c) free(c);
+ }
+
+ /* content-type */
+ htp_header_t *h_content_type = NULL;
+ if (tx->response_headers != NULL) {
+ h_content_type = htp_table_get_c(tx->response_headers, "content-type");
+ }
+ if (h_content_type != NULL) {
+ char *p;
+ c = strndup(bstr_ptr(h_content_type->value),
+ bstr_len(h_content_type->value));
+ p = strchrnul(c, ';');
+ *p = '\0';
+ json_object_set_new(hjs, "content-type", json_string(c));
+ if (c) free(c);
+ }
+
+ if (hlog->flags & LOG_HTTP_EXTENDED) {
+ /* referer */
+ htp_header_t *h_referer = NULL;
+ if (tx->request_headers != NULL) {
+ h_referer = htp_table_get_c(tx->request_headers, "referer");
+ }
+ if (h_referer != NULL) {
+ json_object_set_new(hjs, "referer",
+ json_string(c = strndup(bstr_ptr(h_referer->value),
+ bstr_len(h_referer->value))));
+ if (c) free(c);
+ }
+
+ /* method */
+ if (tx->request_method != NULL) {
+ json_object_set_new(hjs, "method",
+ json_string(c = strndup(bstr_ptr(tx->request_method),
+ bstr_len(tx->request_method))));
+ if (c) free(c);
+ }
+
+ /* protocol */
+ if (tx->request_protocol != NULL) {
+ json_object_set_new(hjs, "protocol",
+ json_string(c = strndup(bstr_ptr(tx->request_protocol),
+ bstr_len(tx->request_protocol))));
+ if (c) free(c);
+ }
+
+ /* response status */
+ if (tx->response_status != NULL) {
+ json_object_set_new(hjs, "status",
+ json_string(c = strndup(bstr_ptr(tx->response_status),
+ bstr_len(tx->response_status))));
+ if (c) free(c);
+
+ htp_header_t *h_location = htp_table_get_c(tx->response_headers, "location");
+ if (h_location != NULL) {
+ json_object_set_new(hjs, "redirect",
+ json_string(c = strndup(bstr_ptr(h_location->value),
+ bstr_len(h_location->value))));
+ if (c) free(c);
+ }
+ }
+
+ /* length */
+ json_object_set_new(hjs, "length", json_integer(tx->response_message_len));
+ }
+
+ json_object_set_new(js, "http", hjs);
+ char *s = json_dumps(js, JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII);
+ MemBufferWriteRaw(aft->buffer, s, strlen(s));
+ free(s);
+ free(hjs);
+ free(js);
+}
+#endif
+
+static void LogHttpLogExtended(LogHttpLogThread *aft, htp_tx_t *tx)
+{
+ MemBufferWriteString(aft->buffer, " [**] ");
+
+ /* referer */
+ htp_header_t *h_referer = NULL;
+ if (tx->request_headers != NULL) {
+ h_referer = htp_table_get_c(tx->request_headers, "referer");
+ }
+ if (h_referer != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
+ (uint8_t *)bstr_ptr(h_referer->value),
+ bstr_len(h_referer->value));
+ } else {
+ MemBufferWriteString(aft->buffer, "<no referer>");
+ }
+ MemBufferWriteString(aft->buffer, " [**] ");
+
+ /* method */
+ if (tx->request_method != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
+ (uint8_t *)bstr_ptr(tx->request_method),
+ bstr_len(tx->request_method));
+ }
+ MemBufferWriteString(aft->buffer, " [**] ");
+
+ /* protocol */
+ if (tx->request_protocol != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
+ (uint8_t *)bstr_ptr(tx->request_protocol),
+ bstr_len(tx->request_protocol));
+ } else {
+ MemBufferWriteString(aft->buffer, "<no protocol>");
+ }
+ MemBufferWriteString(aft->buffer, " [**] ");
+
+ /* response status */
+ if (tx->response_status != NULL) {
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
+ (uint8_t *)bstr_ptr(tx->response_status),
+ bstr_len(tx->response_status));
+ /* Redirect? */
+ if ((tx->response_status_number > 300) && ((tx->response_status_number) < 303)) {
+ htp_header_t *h_location = htp_table_get_c(tx->response_headers, "location");
+ if (h_location != NULL) {
+ MemBufferWriteString(aft->buffer, " => ");
+
+ PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
+ (uint8_t *)bstr_ptr(h_location->value),
+ bstr_len(h_location->value));
+ }
+ }
+ } else {
+ MemBufferWriteString(aft->buffer, "<no status>");
+ }
+
+ /* length */
+ MemBufferWriteString(aft->buffer, " [**] %"PRIuMAX" bytes", (uintmax_t)tx->response_message_len);
+}
+
+static TmEcode HttpJsonIPWrapper(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
+ PacketQueue *postpq, int ipproto)
+{
+ SCEnter();
+
+ uint64_t tx_id = 0;
+ uint64_t total_txs = 0;
+ htp_tx_t *tx = NULL;
+ HtpState *htp_state = NULL;
+ int tx_progress = 0;
+ int tx_progress_done_value_ts = 0;
+ int tx_progress_done_value_tc = 0;
+ LogHttpLogThread *aft = (LogHttpLogThread *)data;
+ LogHttpFileCtx *hlog = aft->httplog_ctx;
+ char timebuf[64];
+
+ /* no flow, no htp state */
+ if (p->flow == NULL) {
+ SCReturnInt(TM_ECODE_OK);
+ }
+
+ /* check if we have HTTP state or not */
+ FLOWLOCK_WRLOCK(p->flow); /* WRITE lock before we updated flow logged id */
+ uint16_t proto = AppLayerGetProtoFromPacket(p);
+ if (proto != ALPROTO_HTTP)
+ goto end;
+
+ htp_state = (HtpState *)AppLayerGetProtoStateFromPacket(p);
+ if (htp_state == NULL) {
+ SCLogDebug("no http state, so no request logging");
+ goto end;
+ }
+
+ total_txs = AppLayerGetTxCnt(ALPROTO_HTTP, htp_state);
+ tx_id = AppLayerTransactionGetLogId(p->flow);
+ tx_progress_done_value_ts = AppLayerGetAlstateProgressCompletionStatus(ALPROTO_HTTP, 0);
+ tx_progress_done_value_tc = AppLayerGetAlstateProgressCompletionStatus(ALPROTO_HTTP, 1);
+
+ CreateTimeString(&p->ts, timebuf, sizeof(timebuf));
+
+ char srcip[46], dstip[46];
+ Port sp, dp;
+ if ((PKT_IS_TOSERVER(p))) {
+ switch (ipproto) {
+ case AF_INET:
+ PrintInet(AF_INET, (const void *)GET_IPV4_SRC_ADDR_PTR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET, (const void *)GET_IPV4_DST_ADDR_PTR(p), dstip, sizeof(dstip));
+ break;
+ case AF_INET6:
+ PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), dstip, sizeof(dstip));
+ break;
+ default:
+ goto end;
+ }
+ sp = p->sp;
+ dp = p->dp;
+ } else {
+ switch (ipproto) {
+ case AF_INET:
+ PrintInet(AF_INET, (const void *)GET_IPV4_DST_ADDR_PTR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET, (const void *)GET_IPV4_SRC_ADDR_PTR(p), dstip, sizeof(dstip));
+ break;
+ case AF_INET6:
+ PrintInet(AF_INET6, (const void *)GET_IPV6_DST_ADDR(p), srcip, sizeof(srcip));
+ PrintInet(AF_INET6, (const void *)GET_IPV6_SRC_ADDR(p), dstip, sizeof(dstip));
+ break;
+ default:
+ goto end;
+ }
+ sp = p->dp;
+ dp = p->sp;
+ }
+
+ for (; tx_id < total_txs; tx_id++)
+ {
+ tx = AppLayerGetTx(ALPROTO_HTTP, htp_state, tx_id);
+ if (tx == NULL) {
+ SCLogDebug("tx is NULL not logging !!");
+ continue;
+ }
+
+ if (!(((AppLayerParserStateStore *)p->flow->alparser)->id_flags & APP_LAYER_TRANSACTION_EOF)) {
+ tx_progress = AppLayerGetAlstateProgress(ALPROTO_HTTP, tx, 0);
+ if (tx_progress < tx_progress_done_value_ts)
+ break;
+
+ tx_progress = AppLayerGetAlstateProgress(ALPROTO_HTTP, tx, 1);
+ if (tx_progress < tx_progress_done_value_tc)
+ break;
+ }
+
+ SCLogDebug("got a HTTP request and now logging !!");
+
+ /* reset */
+ MemBufferReset(aft->buffer);
+
+ if (hlog->flags & LOG_HTTP_CUSTOM) {
+ LogHttpLogJSONCustom(aft, tx, &p->ts, srcip, sp, dstip, dp);
+ //} else if (hlog->flags & LOG_HTTP_JSON) {
+ } else {
+ LogHttpLogJSON(aft, tx, timebuf, srcip, sp, dstip, dp);
+ }
+
+ aft->uri_cnt ++;
+
+ SCMutexLock(&hlog->file_ctx->fp_mutex);
+#ifdef HAVE_LIBJANSSON
+ if (hlog->flags & LOG_HTTP_JSON_SYSLOG) {
+ syslog(http_syslog_level, "%s", (char *)aft->buffer->buffer);
+ } else {
+ //if (hlog->flags & LOG_HTTP_JSON) {
+ if (TRUE) {
+ MemBufferWriteString(aft->buffer, "\n");
+ }
+#endif
+ (void)MemBufferPrintToFPAsString(aft->buffer, hlog->file_ctx->fp);
+ fflush(hlog->file_ctx->fp);
+#ifdef HAVE_LIBJANSSON
+ }
+#endif
+ SCMutexUnlock(&hlog->file_ctx->fp_mutex);
+
+ AppLayerTransactionUpdateLogId(ALPROTO_HTTP, p->flow);
+ }
+
+end:
+ FLOWLOCK_UNLOCK(p->flow);
+ SCReturnInt(TM_ECODE_OK);
+
+}
+
+TmEcode HttpJsonIPv4(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+{
+ return HttpJsonIPWrapper(tv, p, data, pq, postpq, AF_INET);
+}
+
+TmEcode HttpJsonIPv6(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+{
+ return HttpJsonIPWrapper(tv, p, data, pq, postpq, AF_INET6);
+}
+
+TmEcode HttpJson (ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
+{
+ SCEnter();
+
+ /* no flow, no htp state */
+ if (p->flow == NULL) {
+ SCReturnInt(TM_ECODE_OK);
+ }
+
+ if (!(PKT_IS_TCP(p))) {
+ SCReturnInt(TM_ECODE_OK);
+ }
+
+ if (PKT_IS_IPV4(p)) {
+ SCReturnInt(HttpJsonIPv4(tv, p, data, pq, postpq));
+ } else if (PKT_IS_IPV6(p)) {
+ SCReturnInt(HttpJsonIPv6(tv, p, data, pq, postpq));
+ }
+
+ SCReturnInt(TM_ECODE_OK);
+}
+
+TmEcode HttpJsonThreadInit(ThreadVars *t, void *initdata, void **data)
+{
+ LogHttpLogThread *aft = SCMalloc(sizeof(LogHttpLogThread));
+ if (unlikely(aft == NULL))
+ return TM_ECODE_FAILED;
+ memset(aft, 0, sizeof(LogHttpLogThread));
+
+ if(initdata == NULL)
+ {
+ SCLogDebug("Error getting context for HTTPLog. \"initdata\" argument NULL");
+ SCFree(aft);
+ return TM_ECODE_FAILED;
+ }
+
+ aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+ if (aft->buffer == NULL) {
+ SCFree(aft);
+ return TM_ECODE_FAILED;
+ }
+
+ /* Use the Ouptut Context (file pointer and mutex) */
+ aft->httplog_ctx= ((OutputCtx *)initdata)->data;
+
+ *data = (void *)aft;
+ return TM_ECODE_OK;
+}
+
+TmEcode HttpJsonThreadDeinit(ThreadVars *t, void *data)
+{
+ LogHttpLogThread *aft = (LogHttpLogThread *)data;
+ if (aft == NULL) {
+ return TM_ECODE_OK;
+ }
+
+ MemBufferFree(aft->buffer);
+ /* clear memory */
+ memset(aft, 0, sizeof(LogHttpLogThread));
+
+ SCFree(aft);
+ return TM_ECODE_OK;
+}
+
+void HttpJsonExitPrintStats(ThreadVars *tv, void *data) {
+ LogHttpLogThread *aft = (LogHttpLogThread *)data;
+ if (aft == NULL) {
+ return;
+ }
+
+ SCLogInfo("HTTP logger logged %" PRIu32 " requests", aft->uri_cnt);
+}
+
+/** \brief Create a new http log LogFileCtx.
+ * \param conf Pointer to ConfNode containing this loggers configuration.
+ * \return NULL if failure, LogFileCtx* to the file_ctx if succesful
+ * */
+OutputCtx *HttpJsonInitCtx(ConfNode *conf)
+{
+ LogFileCtx* file_ctx = LogFileNewCtx();
+ const char *p, *np;
+ uint32_t n;
+ 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;
+ }
+
+ LogHttpFileCtx *httplog_ctx = SCMalloc(sizeof(LogHttpFileCtx));
+ if (unlikely(httplog_ctx == NULL)) {
+ LogFileFreeCtx(file_ctx);
+ return NULL;
+ }
+ memset(httplog_ctx, 0x00, sizeof(LogHttpFileCtx));
+
+ httplog_ctx->file_ctx = file_ctx;
+ httplog_ctx->cf_n=0;
+
+ const char *extended = ConfNodeLookupChildValue(conf, "extended");
+ const char *custom = ConfNodeLookupChildValue(conf, "custom");
+ const char *customformat = ConfNodeLookupChildValue(conf, "customformat");
+ const char *json = ConfNodeLookupChildValue(conf, "json");
+
+ /* If custom logging format is selected, lets parse it */
+ if (custom != NULL && customformat != NULL && ConfValIsTrue(custom)) {
+ p=customformat;
+ httplog_ctx->flags |= LOG_HTTP_CUSTOM;
+ for (httplog_ctx->cf_n = 0; httplog_ctx->cf_n < LOG_HTTP_MAXN_NODES-1 && p && *p != '\0';
+ httplog_ctx->cf_n++){
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n] = SCMalloc(sizeof(LogHttpCustomFormatNode));
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n]->maxlen=0;
+ if (httplog_ctx->cf_nodes[httplog_ctx->cf_n] == NULL) {
+ for (n = 0; n < httplog_ctx->cf_n; n++) {
+ SCFree(httplog_ctx->cf_nodes[n]);
+ }
+ LogFileFreeCtx(file_ctx);
+ SCFree(httplog_ctx);
+ return NULL;
+ }
+ if (*p != '%'){
+ /* Literal found in format string */
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type = LOG_HTTP_CF_LITERAL;
+ np = strchr(p, '%');
+ if (np == NULL){
+ n = LOG_HTTP_NODE_STRLEN-2;
+ np = NULL; /* End */
+ }else{
+ n = np-p;
+ }
+ strlcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data,p,n+1);
+ p = np;
+ } else {
+ /* Non Literal found in format string */
+ p++;
+ if (*p == '[') { /* Check if maxlength has been specified (ie: [25]) */
+ p++;
+ np = strchr(p, ']');
+ if (np != NULL) {
+ if (np-p > 0 && np-p < 10){
+ long maxlen = strtol(p,NULL,10);
+ if (maxlen > 0 && maxlen < LOG_HTTP_NODE_MAXOUTPUTLEN) {
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n]->maxlen = (uint32_t) maxlen;
+ }
+ } else {
+ goto parsererror;
+ }
+ p = np + 1;
+ } else {
+ goto parsererror;
+ }
+ }
+ if (*p == '{') { /* Simple format char */
+ np = strchr(p, '}');
+ if (np != NULL && np-p > 1 && np-p < LOG_HTTP_NODE_STRLEN-2) {
+ p++;
+ n = np-p;
+ strlcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data, p, n+1);
+ p = np;
+ } else {
+ goto parsererror;
+ }
+ p++;
+ } else {
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data[0] = '\0';
+ }
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type = *p;
+ if (*p == '%'){
+ httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type = LOG_HTTP_CF_LITERAL;
+ strlcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data, "%", 2);
+ }
+ p++;
+ }
+ }
+ } else {
+ if (extended == NULL) {
+ httplog_ctx->flags |= LOG_HTTP_DEFAULT;
+ } else {
+ if (ConfValIsTrue(extended)) {
+ httplog_ctx->flags |= LOG_HTTP_EXTENDED;
+ }
+ }
+ }
+#ifdef HAVE_LIBJANSSON
+ if (json) {
+ if (strcmp(json, "syslog") == 0) {
+ httplog_ctx->flags |= LOG_HTTP_JSON_SYSLOG;
+ }
+ }
+#endif
+
+ OutputCtx *output_ctx = SCCalloc(1, sizeof(OutputCtx));
+ if (unlikely(output_ctx == NULL)) {
+ goto parsererror;
+ }
+
+ output_ctx->data = httplog_ctx;
+ output_ctx->DeInit = HttpJsonDeInitCtx;
+
+ SCLogDebug("HTTP log output initialized");
+
+ return output_ctx;
+
+parsererror:
+ for (n = 0;n < httplog_ctx->cf_n;n++) {
+ SCFree(httplog_ctx->cf_nodes[n]);
+ }
+ LogFileFreeCtx(file_ctx);
+ SCFree(httplog_ctx);
+ SCLogError(SC_ERR_INVALID_ARGUMENT,"Syntax error in custom http log format string.");
+ return NULL;
+
+}
+
+static void HttpJsonDeInitCtx(OutputCtx *output_ctx)
+{
+ LogHttpFileCtx *httplog_ctx = (LogHttpFileCtx *)output_ctx->data;
+ uint32_t i;
+ for (i = 0; i < httplog_ctx->cf_n; i++) {
+ SCFree(httplog_ctx->cf_nodes[i]);
+ }
+ LogFileFreeCtx(httplog_ctx->file_ctx);
+ SCFree(httplog_ctx);
+ SCFree(output_ctx);
+}
--- /dev/null
+/* 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 Victor Julien <victor@inliniac.net>
+ */
+
+#ifndef __OUTPUT_HTTPLOG_H__
+#define __OUTPUT_HTTPLOG_H__
+
+void TmModuleHttpJsonRegister (void);
+void TmModuleHttpJsonIPv4Register (void);
+void TmModuleHttpJsonIPv6Register (void);
+OutputCtx *HttpJsonInitCtx(ConfNode *);
+
+#endif /* __OUTPUT_HTTPLOG_H__ */
#include "log-file.h"
#include "log-filestore.h"
+#include "output-dnslog.h"
+#include "output-httplog.h"
+
#include "stream-tcp.h"
#include "source-nfq.h"
TMM_LOGTLSLOG6,
TMM_PCAPLOG,
TMM_FILELOG,
+ TMM_LOGDNSJSON,
+ TMM_LOGHTTPJSON,
+ TMM_LOGHTTPJSON4,
+ TMM_LOGHTTPJSON6,
TMM_FILESTORE,
TMM_STREAMTCP,
TMM_DECODEIPFW,
projects / thirdparty / suricata.git / commitdiff
