Fix "No Agreement" behavior for 1.2.3 clients

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index a3c5258c48b9963ea292c1c9fd10a719ad3c2f31..076919fbd99f73aa9ef4543cba236d473d12ce64 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -2,11 +2,14 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

+       "fmt"

        "go.uber.org/zap"
        "golang.org/x/crypto/bcrypt"
        "io"
        "math/big"
        "sort"
        "go.uber.org/zap"
        "golang.org/x/crypto/bcrypt"
        "io"
        "math/big"
        "sort"

+       "strings"
+       "sync"

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


@@ -23,50 +26,26 @@ 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 {
        Connection io.ReadWriteCloser
        RemoteAddr string
        ID         *[]byte
 // ClientConn represents a client connected to a Server
 type ClientConn struct {
        Connection io.ReadWriteCloser
        RemoteAddr string
        ID         *[]byte

-       Icon       *[]byte
-       Flags      *[]byte
+       Icon       []byte
+       Flags      []byte

        UserName   []byte
        Account    *Account
        IdleTime   int
        Server     *Server
        UserName   []byte
        Account    *Account
        IdleTime   int
        Server     *Server

-       Version    *[]byte
+       Version    []byte

        Idle       bool
        AutoReply  []byte
        Idle       bool
        AutoReply  []byte

-       Transfers  map[int][]*FileTransfer
-       Agreed     bool
-       logger     *zap.SugaredLogger
+
+       transfersMU sync.Mutex
+       transfers   map[int]map[[4]byte]*FileTransfer
+
+       Agreed bool
+       logger *zap.SugaredLogger

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


@@ -75,7 +54,7 @@ func (cc *ClientConn) sendAll(t int, fields ...Field) {
        }
 }
 
        }
 }
 

-func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
+func (cc *ClientConn) handleTransaction(transaction Transaction) error {

        requestNum := binary.BigEndian.Uint16(transaction.Type)
        if handler, ok := TransactionHandlers[requestNum]; ok {
                for _, reqField := range handler.RequiredFields {
        requestNum := binary.BigEndian.Uint16(transaction.Type)
        if handler, ok := TransactionHandlers[requestNum]; ok {
                for _, reqField := range handler.RequiredFields {


@@ -99,9 +78,9 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
                        }
                }
 
                        }
                }
 

-               cc.logger.Infow("Received Transaction", "RequestType", handler.Name)
+               cc.logger.Debugw("Received Transaction", "RequestType", handler.Name)

 
 

-               transactions, err := handler.Handler(cc, transaction)
+               transactions, err := handler.Handler(cc, &transaction)

                if err != nil {
                        return err
                }
                if err != nil {
                        return err
                }


@@ -123,17 +102,17 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
                // if user was previously idle, mark as not idle and notify other connected clients that
                // the user is no longer away
                if cc.Idle {
                // if user was previously idle, mark as not idle and notify other connected clients that
                // the user is no longer away
                if cc.Idle {

-                       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*cc.Flags)))
+                       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags)))

                        flagBitmap.SetBit(flagBitmap, userFlagAway, 0)
                        flagBitmap.SetBit(flagBitmap, userFlagAway, 0)

-                       binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
+                       binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64()))

                        cc.Idle = false
 
                        cc.sendAll(
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *cc.ID),
                        cc.Idle = false
 
                        cc.sendAll(
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *cc.ID),

-                               NewField(fieldUserFlags, *cc.Flags),
+                               NewField(fieldUserFlags, cc.Flags),

                                NewField(fieldUserName, cc.UserName),
                                NewField(fieldUserName, cc.UserName),

-                               NewField(fieldUserIconID, *cc.Icon),
+                               NewField(fieldUserIconID, cc.Icon),

                        )
                }
        }
                        )
                }
        }


@@ -156,10 +135,6 @@ func (cc *ClientConn) uint16ID() uint16 {
 
 // Authorize checks if the user account has the specified permission
 func (cc *ClientConn) Authorize(access int) bool {
 
 // Authorize checks if the user account has the specified permission
 func (cc *ClientConn) Authorize(access int) bool {

-       if access == 0 {
-               return true
-       }
-

        i := big.NewInt(int64(binary.BigEndian.Uint64(*cc.Account.Access)))
 
        return i.Bit(63-access) == 1
        i := big.NewInt(int64(binary.BigEndian.Uint64(*cc.Account.Access)))
 
        return i.Bit(63-access) == 1


@@ -172,7 +147,9 @@ func (cc *ClientConn) Disconnect() {
 
        delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 
 
        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)
 
        if err := cc.Connection.Close(); err != nil {
                cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.RemoteAddr)


@@ -180,13 +157,14 @@ func (cc *ClientConn) Disconnect() {
 }
 
 // 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) (trans []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

-                       cc.Server.outbox <- t
+                       trans = append(trans, t)

                }
        }
                }
        }

+       return trans

 }
 
 // NewReply returns a reply Transaction with fields for the ClientConn
 }
 
 // NewReply returns a reply Transaction with fields for the ClientConn


@@ -228,3 +206,56 @@ func sortedClients(unsortedClients map[uint16]*ClientConn) (clients []*ClientCon
        sort.Sort(byClientID(clients))
        return clients
 }
        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)
+}