X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d4c152a4dba0eec7c8ecd13732900909f51b1c97..21581958c38861f3a62ef7c27d0a8a6f4db2a1f8:/hotline/client_conn.go?ds=sidebyside

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index c1ae4e3..997b9c9 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -2,9 +2,11 @@ package hotline
 
 import (
 	"encoding/binary"
+	"go.uber.org/zap"
 	"golang.org/x/crypto/bcrypt"
 	"io"
 	"math/big"
+	"sort"
 )
 
 type byClientID []*ClientConn
@@ -64,6 +66,7 @@ type ClientConn struct {
 	AutoReply  []byte
 	Transfers  map[int][]*FileTransfer
 	Agreed     bool
+	logger     *zap.SugaredLogger
 }
 
 func (cc *ClientConn) sendAll(t int, fields ...Field) {
@@ -80,28 +83,23 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 
 			// Validate that required field is present
 			if field.ID == nil {
-				cc.Server.Logger.Errorw(
+				cc.logger.Errorw(
 					"Missing required field",
-					"Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
+					"RequestType", handler.Name, "FieldID", reqField.ID,
 				)
 				return nil
 			}
 
 			if len(field.Data) < reqField.minLen {
-				cc.Server.Logger.Infow(
+				cc.logger.Infow(
 					"Field does not meet minLen",
-					"Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
+					"RequestType", handler.Name, "FieldID", reqField.ID,
 				)
 				return nil
 			}
 		}
 
-		cc.Server.Logger.Infow(
-			"Received Transaction",
-			"login", cc.Account.Login,
-			"name", string(cc.UserName),
-			"RequestType", handler.Name,
-		)
+		cc.logger.Infow("Received Transaction", "RequestType", handler.Name)
 
 		transactions, err := handler.Handler(cc, transaction)
 		if err != nil {
@@ -111,10 +109,8 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 			cc.Server.outbox <- t
 		}
 	} else {
-		cc.Server.Logger.Errorw(
-			"Unimplemented transaction type received",
-			"UserName", string(cc.UserName), "RequestID", requestNum,
-		)
+		cc.logger.Errorw(
+			"Unimplemented transaction type received", "RequestID", requestNum)
 	}
 
 	cc.Server.mux.Lock()
@@ -164,9 +160,9 @@ func (cc *ClientConn) Authorize(access int) bool {
 		return true
 	}
 
-	accessBitmap := big.NewInt(int64(binary.BigEndian.Uint64(*cc.Account.Access)))
+	i := big.NewInt(int64(binary.BigEndian.Uint64(*cc.Account.Access)))
 
-	return accessBitmap.Bit(63-access) == 1
+	return i.Bit(63-access) == 1
 }
 
 // Disconnect notifies other clients that a client has disconnected
@@ -176,7 +172,9 @@ func (cc *ClientConn) Disconnect() {
 
 	delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 
-	cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID)))
+	for _, t := range cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID))) {
+		cc.Server.outbox <- t
+	}
 
 	if err := cc.Connection.Close(); err != nil {
 		cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.RemoteAddr)
@@ -184,13 +182,14 @@ func (cc *ClientConn) Disconnect() {
 }
 
 // notifyOthers sends transaction t to other clients connected to the server
-func (cc *ClientConn) notifyOthers(t Transaction) {
+func (cc *ClientConn) notifyOthers(t Transaction) (trans []Transaction) {
 	for _, c := range sortedClients(cc.Server.Clients) {
 		if c.ID != cc.ID && c.Agreed {
 			t.clientID = c.ID
-			cc.Server.outbox <- t
+			trans = append(trans, t)
 		}
 	}
+	return trans
 }
 
 // NewReply returns a reply Transaction with fields for the ClientConn
@@ -222,3 +221,13 @@ func (cc *ClientConn) NewErrReply(t *Transaction, errMsg string) Transaction {
 		},
 	}
 }
+
+// sortedClients is a utility function that takes a map of *ClientConn and returns a sorted slice of the values.
+// The purpose of this is to ensure that the ordering of client connections is deterministic so that test assertions work.
+func sortedClients(unsortedClients map[uint16]*ClientConn) (clients []*ClientConn) {
+	for _, c := range unsortedClients {
+		clients = append(clients, c)
+	}
+	sort.Sort(byClientID(clients))
+	return clients
+}