From: Jason Ish <ish@unx.ca>
Date: Mon, 11 Dec 2017 21:50:42 +0000 (-0600)
Subject: eve: http: global metadata config
X-Git-Tag: suricata-4.1.0-beta1~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eaca7c239fb62b3c98cebc735f1626910cb545e;p=thirdparty%2Fsuricata.git

eve: http: global metadata config
---

diff --git a/src/output-json-http.c b/src/output-json-http.c
index bb60ce3e56..453e2011f4 100644
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -58,6 +58,7 @@ typedef struct LogHttpFileCtx_ {
     LogFileCtx *file_ctx;
     uint32_t flags; /** Store mode */
     uint64_t fields;/** Store fields */
+    bool include_metadata;
 } LogHttpFileCtx;
 
 typedef struct JsonHttpLogThread_ {
@@ -455,6 +456,10 @@ static int JsonHttpLogger(ThreadVars *tv, void *thread_data, const Packet *p, Fl
     if (unlikely(js == NULL))
         return TM_ECODE_OK;
 
+    if (jhl->httplog_ctx->include_metadata) {
+        JsonAddMetadata(p, f, js);
+    }
+
     SCLogDebug("got a HTTP request and now logging !!");
 
     /* reset */
@@ -576,6 +581,7 @@ static OutputInitResult OutputHttpLogInitSub(ConfNode *conf, OutputCtx *parent_c
 
     http_ctx->file_ctx = ojc->file_ctx;
     http_ctx->flags = LOG_HTTP_DEFAULT;
+    http_ctx->include_metadata = ojc->include_metadata;
 
     if (conf) {
         const char *extended = ConfNodeLookupChildValue(conf, "extended");