X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/bd1ce11306527514218acbe0d12f7bcc23114239..40414f9295dd301f1c714bc3067392b7cc8f8427:/hotline/client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 8e9a614..c1ae4e3 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -1,12 +1,10 @@
 package hotline
 
 import (
-	"bytes"
 	"encoding/binary"
-	"errors"
 	"golang.org/x/crypto/bcrypt"
+	"io"
 	"math/big"
-	"net"
 )
 
 type byClientID []*ClientConn
@@ -23,19 +21,47 @@ 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
 	UserName   []byte
 	Account    *Account
-	IdleTime   *int
+	IdleTime   int
 	Server     *Server
 	Version    *[]byte
 	Idle       bool
-	AutoReply  *[]byte
+	AutoReply  []byte
 	Transfers  map[int][]*FileTransfer
 	Agreed     bool
 }
@@ -54,7 +80,7 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 
 			// Validate that required field is present
 			if field.ID == nil {
-				cc.Server.Logger.Infow(
+				cc.Server.Logger.Errorw(
 					"Missing required field",
 					"Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
 				)
@@ -69,15 +95,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",
@@ -103,28 +120,28 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 	cc.Server.mux.Lock()
 	defer cc.Server.mux.Unlock()
 
-	// if user was idle and this is a non-keepalive transaction
-	if *cc.IdleTime > userIdleSeconds && requestNum != tranKeepAlive {
-		flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*cc.Flags)))
-		flagBitmap.SetBit(flagBitmap, userFlagAway, 0)
-		binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
-		cc.Idle = false
-		//*cc.IdleTime = 0
-
-		cc.sendAll(
-			tranNotifyChangeUser,
-			NewField(fieldUserID, *cc.ID),
-			NewField(fieldUserFlags, *cc.Flags),
-			NewField(fieldUserName, cc.UserName),
-			NewField(fieldUserIconID, *cc.Icon),
-		)
-
-		//return nil
+	if requestNum != tranKeepAlive {
+		// reset the user idle timer
+		cc.IdleTime = 0
+
+		// 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.SetBit(flagBitmap, userFlagAway, 0)
+			binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
+			cc.Idle = false
+
+			cc.sendAll(
+				tranNotifyChangeUser,
+				NewField(fieldUserID, *cc.ID),
+				NewField(fieldUserFlags, *cc.Flags),
+				NewField(fieldUserName, cc.UserName),
+				NewField(fieldUserIconID, *cc.Icon),
+			)
+		}
 	}
 
-	// TODO: Don't we need to skip this if requestNum == tranKeepalive ??
-	*cc.IdleTime = 0
-
 	return nil
 }
 
@@ -153,21 +170,21 @@ func (cc *ClientConn) Authorize(access int) bool {
 }
 
 // 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)))
+	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
-func (cc ClientConn) NotifyOthers(t Transaction) {
+// notifyOthers sends transaction t to other clients connected to the server
+func (cc *ClientConn) notifyOthers(t Transaction) {
 	for _, c := range sortedClients(cc.Server.Clients) {
 		if c.ID != cc.ID && c.Agreed {
 			t.clientID = c.ID
@@ -176,47 +193,6 @@ func (cc ClientConn) NotifyOthers(t Transaction) {
 	}
 }
 
-type handshake struct {
-	Protocol    [4]byte // Must be 0x54525450 TRTP
-	SubProtocol [4]byte
-	Version     [2]byte // Always 1
-	SubVersion  [2]byte
-}
-
-// Handshake
-// After establishing TCP connection, both client and server start the handshake process
-// in order to confirm that each of them comply with requirements of the other.
-// The information provided in this initial data exchange identifies protocols,
-// and their versions, used in the communication. In the case where, after inspection,
-// the capabilities of one of the subjects do not comply with the requirements of the other,
-// the connection is dropped.
-//
-// The following information is sent to the server:
-// Description		Size 	Data	Note
-// Protocol ID		4		TRTP	0x54525450
-// Sub-protocol ID	4		HOTL	User defined
-// VERSION			2		1		Currently 1
-// Sub-version		2		2		User defined
-//
-// The server replies with the following:
-// Description		Size 	Data	Note
-// Protocol ID		4		TRTP
-//Error code		4				Error code returned by the server (0 = no error)
-func Handshake(conn net.Conn, buf []byte) error {
-	var h handshake
-	r := bytes.NewReader(buf)
-	if err := binary.Read(r, binary.BigEndian, &h); err != nil {
-		return err
-	}
-
-	if h.Protocol != [4]byte{0x54, 0x52, 0x54, 0x50} {
-		return errors.New("invalid handshake")
-	}
-
-	_, err := conn.Write([]byte{84, 82, 84, 80, 0, 0, 0, 0})
-	return err
-}
-
 // NewReply returns a reply Transaction with fields for the ClientConn
 func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction {
 	reply := Transaction{