X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/0a92e50b2704c1eb02233c9aa5778d21455d345b..46b48603ea0e69aab8084a3ce32b31995b31b09c:/hotline/client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 65e18ee..a8ace87 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -3,8 +3,9 @@ package hotline
 import (
 	"encoding/binary"
 	"golang.org/x/crypto/bcrypt"
+	"io"
 	"math/big"
-	"net"
+	"sort"
 )
 
 type byClientID []*ClientConn
@@ -21,9 +22,37 @@ func (s byClientID) Less(i, j int) bool {
 	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 {
-	Connection net.Conn
+	Connection io.ReadWriteCloser
+	RemoteAddr string
 	ID         *[]byte
 	Icon       *[]byte
 	Flags      *[]byte
@@ -67,15 +96,6 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 				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(
 			"Received Transaction",
@@ -145,9 +165,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
@@ -160,7 +180,7 @@ func (cc *ClientConn) Disconnect() {
 	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)
 	}
 }
 
@@ -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
+}