Fix failing tests

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 4a471b3382b4533160bc62d89fc0afc5a54280f4..4e703c2762b53961cecd0db5d8af94c5d9a10954 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -2,9 +2,11 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

+       "go.uber.org/zap"

        "golang.org/x/crypto/bcrypt"
        "golang.org/x/crypto/bcrypt"

+       "io"

        "math/big"
        "math/big"

-       "net"
+       "sort"

 )
 
 type byClientID []*ClientConn
 )
 
 type byClientID []*ClientConn


@@ -21,9 +23,37 @@ func (s byClientID) Less(i, j int) bool {
        return s[i].uint16ID() < s[j].uint16ID()
 }
 
        return s[i].uint16ID() < s[j].uint16ID()
 }
 

+const template = `Nickname:   %s
+Name:       %s
+Account:    %s
+Address:    %s
+
+-------- File Downloads ---------
+
+%s
+
+------- Folder Downloads --------
+
+None.
+
+--------- File Uploads ----------
+
+None.
+
+-------- Folder Uploads ---------
+
+None.
+
+------- Waiting Downloads -------
+
+None.
+
+       `
+

 // ClientConn represents a client connected to a Server
 type ClientConn struct {
 // ClientConn represents a client connected to a Server
 type ClientConn struct {

-       Connection net.Conn
+       Connection io.ReadWriteCloser
+       RemoteAddr string

        ID         *[]byte
        Icon       *[]byte
        Flags      *[]byte
        ID         *[]byte
        Icon       *[]byte
        Flags      *[]byte


@@ -36,6 +66,7 @@ type ClientConn struct {
        AutoReply  []byte
        Transfers  map[int][]*FileTransfer
        Agreed     bool
        AutoReply  []byte
        Transfers  map[int][]*FileTransfer
        Agreed     bool

+       logger     *zap.SugaredLogger

 }
 
 func (cc *ClientConn) sendAll(t int, fields ...Field) {
 }
 
 func (cc *ClientConn) sendAll(t int, fields ...Field) {


@@ -67,20 +98,9 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
                                return nil
                        }
                }
                                return nil
                        }
                }

-               if !authorize(cc.Account.Access, handler.Access) {
-                       cc.Server.Logger.Infow(
-                               "Unauthorized Action",
-                               "Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name,
-                       )
-                       cc.Server.outbox <- cc.NewErrReply(transaction, handler.DenyMsg)

 
 

-                       return nil
-               }
-
-               cc.Server.Logger.Infow(
+               cc.logger.Infow(

                        "Received Transaction",
                        "Received Transaction",

-                       "login", cc.Account.Login,
-                       "name", string(cc.UserName),

                        "RequestType", handler.Name,
                )
 
                        "RequestType", handler.Name,
                )
 


@@ -145,13 +165,13 @@ func (cc *ClientConn) Authorize(access int) bool {
                return true
        }
 
                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
 }
 
 // Disconnect notifies other clients that a client has disconnected

-func (cc ClientConn) Disconnect() {
+func (cc *ClientConn) Disconnect() {

        cc.Server.mux.Lock()
        defer cc.Server.mux.Unlock()
 
        cc.Server.mux.Lock()
        defer cc.Server.mux.Unlock()
 


@@ -160,12 +180,12 @@ func (cc ClientConn) Disconnect() {
        cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID)))
 
        if err := cc.Connection.Close(); err != nil {
        cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID)))
 
        if err := cc.Connection.Close(); err != nil {

-               cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.Connection.RemoteAddr())
+               cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.RemoteAddr)

        }
 }
 
 // notifyOthers sends transaction t to other clients connected to the server
        }
 }
 
 // notifyOthers sends transaction t to other clients connected to the server

-func (cc ClientConn) notifyOthers(t Transaction) {
+func (cc *ClientConn) notifyOthers(t Transaction) {

        for _, c := range sortedClients(cc.Server.Clients) {
                if c.ID != cc.ID && c.Agreed {
                        t.clientID = c.ID
        for _, c := range sortedClients(cc.Server.Clients) {
                if c.ID != cc.ID && c.Agreed {
                        t.clientID = c.ID


@@ -203,3 +223,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
+}