Added explicit support for X-Forwarded-For. #60

elastic · Sep 18, 2014 · 571fd38 · 571fd38
1 parent 6b75989
commit 571fd38
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/http.go b/http.go
@@ -43,6 +43,7 @@ type HttpMessage struct {
     ContentLength int
     ContentType   string
     ReasonPhrase  string
+    XForwardedFor string
 
     Raw []byte
 
@@ -148,6 +149,8 @@ func httpParseHeader(m *HttpMessage, data []byte) (bool, bool, int) {
                 m.connection = string(bytes.Trim(data[i+1:p], " \t"))
             } else if bytes.Equal(bytes.ToLower(data[:i]), []byte("transfer-encoding")) {
                 m.transfer_encoding = string(bytes.Trim(data[i+1:p], " \t"))
+            } else if bytes.Equal(bytes.ToLower(data[:i]), []byte("x-forwarded-for")) {
+                m.XForwardedFor = string(bytes.Trim(data[i+1:p], " \t"))
             }
 
             return true, true, p + 2
@@ -489,10 +492,12 @@ func receivedHttpRequest(msg *HttpMessage) {
     trans.Http = bson.M{
         "host": msg.Host,
         "request": bson.M{
-            "method":   msg.Method,
-            "uri":      msg.RequestUri,
-            "line":     msg.FirstLine,
-            "line.raw": msg.FirstLine,
+            "method":          msg.Method,
+            "uri":             msg.RequestUri,
+            "uri.raw":         msg.RequestUri,
+            "line":            msg.FirstLine,
+            "line.raw":        msg.FirstLine,
+            "x-forwarded-for": msg.XForwardedFor,
         },
     }
 

diff --git a/log_unix.go b/log_unix.go
@@ -28,9 +28,9 @@ const (
 )
 
 type Logger struct {
-    toSyslog  bool
-    level     syslog.Priority
-    selectors map[string]bool
+    toSyslog            bool
+    level               syslog.Priority
+    selectors           map[string]bool
     debug_all_selectors bool
 
     logger *log.Logger

diff --git a/log_windows.go b/log_windows.go
@@ -8,9 +8,9 @@ import (
 )
 
 type Logger struct {
-    toSyslog  bool
-    level     Priority
-    selectors map[string]bool
+    toSyslog            bool
+    level               Priority
+    selectors           map[string]bool
     debug_all_selectors bool
 
     logger *log.Logger

diff --git a/procs.go b/procs.go
@@ -3,10 +3,10 @@ package main
 import (
     "bufio"
     "bytes"
+    "io"
     "io/ioutil"
     "net"
     "os"
-    "io"
     "path/filepath"
     "runtime"
     "strconv"

diff --git a/publish.go b/publish.go
@@ -367,7 +367,6 @@ func (publisher *PublisherType) Init(publishDisabled bool) error {
         INFO("No agent name configured, using hostname '%s'", publisher.name)
     }
 
-
     if !publisher.disabled && publisher.TopologyOutput != nil {
         RefreshTopologyFreq := 10 * time.Second
         if _Config.Agent.Refresh_topology_freq != 0 {