X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/003a743e6767b3041c3a8321566c3586d73b399a..c6a3fa2cdbf7eb78964a5df7622482cdd8782d74:/hotline/client_conn.go diff --git a/hotline/client_conn.go b/hotline/client_conn.go index 4a471b3..6a27977 100644 --- a/hotline/client_conn.go +++ b/hotline/client_conn.go @@ -2,9 +2,14 @@ package hotline import ( "encoding/binary" + "fmt" + "go.uber.org/zap" "golang.org/x/crypto/bcrypt" + "io" "math/big" - "net" + "sort" + "strings" + "sync" ) type byClientID []*ClientConn @@ -23,7 +28,8 @@ func (s byClientID) Less(i, j int) bool { // 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 @@ -34,8 +40,12 @@ type ClientConn struct { Version *[]byte Idle bool AutoReply []byte - Transfers map[int][]*FileTransfer - Agreed bool + + transfersMU sync.Mutex + transfers map[int]map[[4]byte]*FileTransfer + + Agreed bool + logger *zap.SugaredLogger } func (cc *ClientConn) sendAll(t int, fields ...Field) { @@ -52,37 +62,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 } } - 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", - "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 { @@ -92,10 +88,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() @@ -141,37 +135,36 @@ func (cc *ClientConn) uint16ID() uint16 { // Authorize checks if the user account has the specified permission func (cc *ClientConn) Authorize(access int) bool { - if access == 0 { - 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 -func (cc ClientConn) Disconnect() { +func (cc *ClientConn) Disconnect() { cc.Server.mux.Lock() defer cc.Server.mux.Unlock() 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.Connection.RemoteAddr()) + cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.RemoteAddr) } } // 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 @@ -203,3 +196,66 @@ 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 +} + +const userInfoTemplate = `Nickname: %s +Name: %s +Account: %s +Address: %s + +-------- File Downloads --------- + +%s +------- Folder Downloads -------- + +%s +--------- File Uploads ---------- + +%s +-------- Folder Uploads --------- + +%s +------- Waiting Downloads ------- + +%s +` + +func formatDownloadList(fts map[[4]byte]*FileTransfer) (s string) { + if len(fts) == 0 { + return "None.\n" + } + + for _, dl := range fts { + s += dl.String() + } + + return s +} + +func (cc *ClientConn) String() string { + cc.transfersMU.Lock() + defer cc.transfersMU.Unlock() + template := fmt.Sprintf( + userInfoTemplate, + cc.UserName, + cc.Account.Name, + cc.Account.Login, + cc.RemoteAddr, + formatDownloadList(cc.transfers[FileDownload]), + formatDownloadList(cc.transfers[FolderDownload]), + formatDownloadList(cc.transfers[FileUpload]), + formatDownloadList(cc.transfers[FolderUpload]), + "None.\n", + ) + + return strings.Replace(template, "\n", "\r", -1) +}