From b236c34c945e430665f83ce40d04f6988efdfeae Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Wed, 16 Dec 2015 14:19:23 -0800
Subject: [PATCH] Don't send IPs and usernames until I know how to delete them

---
 socketserver/server/handlecore.go               | 10 ++++++----
 socketserver/server/logstasher/elasticsearch.go |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go
index 380d7549..46c0e1ce 100644
--- a/socketserver/server/handlecore.go
+++ b/socketserver/server/handlecore.go
@@ -265,10 +265,6 @@ func RunSocketConnection(conn *websocket.Conn) {
 	// Close the connection when we're done.
 	defer closer()
 
-	var report logstasher.ConnectionReport
-	report.ConnectTime = time.Now()
-	report.RemoteAddr = conn.RemoteAddr()
-
 	_clientChan := make(chan ClientMessage)
 	_serverMessageChan := make(chan ClientMessage, sendMessageBufferLength)
 	_errorChan := make(chan error)
@@ -279,6 +275,10 @@ func RunSocketConnection(conn *websocket.Conn) {
 	client.RemoteAddr = conn.RemoteAddr()
 	client.MsgChannelIsDone = stoppedChan
 
+	var report logstasher.ConnectionReport
+	report.ConnectTime = time.Now()
+	report.RemoteAddr = client.RemoteAddr
+
 	conn.SetPongHandler(func(pongBody string) error {
 		client.Mutex.Lock()
 		client.pingCount = 0
@@ -318,6 +318,8 @@ func RunSocketConnection(conn *websocket.Conn) {
 		atomic.AddUint64(&Statistics.CurrentClientCount, NegativeOne)
 	}
 
+	report.UsernameWasValidated = client.UsernameValidated
+	report.TwitchUsername = client.TwitchUsername
 	logstasher.Submit(&report)
 }
 
diff --git a/socketserver/server/logstasher/elasticsearch.go b/socketserver/server/logstasher/elasticsearch.go
index 9eece14c..c505e00e 100644
--- a/socketserver/server/logstasher/elasticsearch.go
+++ b/socketserver/server/logstasher/elasticsearch.go
@@ -113,7 +113,10 @@ type ConnectionReport struct {
 	DisconnectCode   int
 	DisconnectReason string
 
-	RemoteAddr net.Addr
+	UsernameWasValidated bool
+
+	RemoteAddr     net.Addr `json:"-"` // not transmitted until I can figure out data minimization
+	TwitchUsername string   `json:"-"` // also not transmitted
 }
 
 // FillReport sets all the calculated fields, and calls esReportBasic.FillReport().