Merge branch 'master' of github.com:shipt/specter

shipt · Nov 1, 2019 · 2bdbaa1 · 2bdbaa1
2 parents d9e7ab9 + 0c11b9d
commit 2bdbaa1
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/internal/logprocessor/logprocessor.go b/internal/logprocessor/logprocessor.go
@@ -2,6 +2,7 @@ package logprocessor
 
 import (
 	"encoding/json"
+	"net"
 
 	"github.com/shipt/specter/internal/ttlcache"
 
@@ -59,12 +60,10 @@ func (c *Client) parseResponse(body []byte) ([]byte, error) {
 	}
 
 	conn := connection{}
-	conn.XFwdFor = rb.XFwdFor
-	if conn.XFwdFor != "" {
-		if conn.XFwdFor != "-" {
-			conn.SrcIP = rb.XFwdFor
-		}
-	} else {
+
+	conn.SrcIP = rb.XFwdFor
+	validIP := net.ParseIP(rb.XFwdFor)
+	if validIP.To4() == nil {
 		conn.SrcIP = rb.SrcIP
 	}