X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/c697d13aac49ede1258762b4cf41d9bdcabb4b27..7e2e07da8cc7985e773e619410801c6dd84afe8b:/hotline/server.go?ds=sidebyside

diff --git a/hotline/server.go b/hotline/server.go
index 61cd7fa..7b409d5 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -8,7 +8,6 @@ import (
 	"go.uber.org/zap"
 	"io"
 	"io/ioutil"
-	"log"
 	"math/big"
 	"math/rand"
 	"net"
@@ -21,7 +20,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/crypto/bcrypt"
 	"gopkg.in/yaml.v2"
 )
 
@@ -50,8 +48,8 @@ type Server struct {
 	APIListener  net.Listener
 	FileListener net.Listener
 
-	newsReader io.Reader
-	newsWriter io.WriteCloser
+	// newsReader io.Reader
+	// newsWriter io.WriteCloser
 
 	outbox chan Transaction
 
@@ -278,8 +276,8 @@ func (s *Server) keepaliveHandler() {
 		s.mux.Lock()
 
 		for _, c := range s.Clients {
-			*c.IdleTime += idleCheckInterval
-			if *c.IdleTime > userIdleSeconds && !c.Idle {
+			c.IdleTime += idleCheckInterval
+			if c.IdleTime > userIdleSeconds && !c.Idle {
 				c.Idle = true
 
 				flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*c.Flags)))
@@ -327,16 +325,13 @@ func (s *Server) NewClientConn(conn net.Conn) *ClientConn {
 		Connection: conn,
 		Server:     s,
 		Version:    &[]byte{},
-		IdleTime:   new(int),
-		AutoReply:  &[]byte{},
+		AutoReply:  []byte{},
 		Transfers:  make(map[int][]*FileTransfer),
 		Agreed:     false,
 	}
 	*s.NextGuestID++
 	ID := *s.NextGuestID
 
-	*clientConn.IdleTime = 0
-
 	binary.BigEndian.PutUint16(*clientConn.ID, ID)
 	s.Clients[ID] = clientConn
 
@@ -370,7 +365,7 @@ func (s *Server) DeleteUser(login string) error {
 
 	delete(s.Accounts, login)
 
-	return os.Remove(s.ConfigDir + "Users/" + login + ".yaml")
+	return FS.Remove(s.ConfigDir + "Users/" + login + ".yaml")
 }
 
 func (s *Server) connectedUsers() []Field {
@@ -379,7 +374,7 @@ func (s *Server) connectedUsers() []Field {
 
 	var connectedUsers []Field
 	for _, c := range sortedClients(s.Clients) {
-		if c.Agreed == false {
+		if !c.Agreed {
 			continue
 		}
 		user := User{
@@ -543,9 +538,16 @@ func (s *Server) handleNewConnection(conn net.Conn) error {
 	// assume simplified hotline v1.2.3 login flow that does not require agreement
 	if *c.Version == nil {
 		c.Agreed = true
-		if _, err := c.notifyNewUserHasJoined(); err != nil {
-			return err
-		}
+
+		c.notifyOthers(
+			*NewTransaction(
+				tranNotifyChangeUser, nil,
+				NewField(fieldUserName, c.UserName),
+				NewField(fieldUserID, *c.ID),
+				NewField(fieldUserIconID, *c.Icon),
+				NewField(fieldUserFlags, *c.Flags),
+			),
+		)
 	}
 
 	c.Server.Stats.LoginCount += 1
@@ -580,21 +582,6 @@ func (s *Server) handleNewConnection(conn net.Conn) error {
 	}
 }
 
-func hashAndSalt(pwd []byte) string {
-	// Use GenerateFromPassword to hash & salt pwd.
-	// MinCost is just an integer constant provided by the bcrypt
-	// package along with DefaultCost & MaxCost.
-	// The cost can be any value you want provided it isn't lower
-	// than the MinCost (4)
-	hash, err := bcrypt.GenerateFromPassword(pwd, bcrypt.MinCost)
-	if err != nil {
-		log.Println(err)
-	}
-	// GenerateFromPassword returns a byte slice so we need to
-	// convert the bytes to a string and return it
-	return string(hash)
-}
-
 // NewTransactionRef generates a random ID for the file transfer.  The Hotline client includes this ID
 // in the file transfer request payload, and the file transfer server will use it to map the request
 // to a transfer
@@ -629,13 +616,14 @@ const dlFldrActionNextFile = 3
 func (s *Server) TransferFile(conn net.Conn) error {
 	defer func() { _ = conn.Close() }()
 
-	buf := make([]byte, 1024)
-	if _, err := conn.Read(buf); err != nil {
+	txBuf := make([]byte, 16)
+	_, err := conn.Read(txBuf)
+	if err != nil {
 		return err
 	}
 
 	var t transfer
-	_, err := t.Write(buf[:16])
+	_, err = t.Write(txBuf)
 	if err != nil {
 		return err
 	}
@@ -687,11 +675,16 @@ func (s *Server) TransferFile(conn net.Conn) error {
 			}
 		}
 	case FileUpload:
-		if _, err := conn.Read(buf); err != nil {
+		const buffSize = 1460
+
+		uploadBuf := make([]byte, buffSize)
+
+		_, err := conn.Read(uploadBuf)
+		if err != nil {
 			return err
 		}
 
-		ffo := ReadFlattenedFileObject(buf)
+		ffo := ReadFlattenedFileObject(uploadBuf)
 		payloadLen := len(ffo.BinaryMarshal())
 		fileSize := int(binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize))
 
@@ -711,9 +704,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
 
 		defer func() { _ = newFile.Close() }()
 
-		const buffSize = 1024
-
-		if _, err := newFile.Write(buf[payloadLen:]); err != nil {
+		if _, err := newFile.Write(uploadBuf[payloadLen:]); err != nil {
 			return err
 		}
 		receivedBytes := buffSize - payloadLen
@@ -799,7 +790,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
 			}
 
 			// Read the client's Next Action request
-			//TODO: Remove hardcoded behavior and switch behaviors based on the next action send
+			// TODO: Remove hardcoded behavior and switch behaviors based on the next action send
 			if _, err := conn.Read(readBuffer); err != nil {
 				return err
 			}
@@ -851,7 +842,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
 				bytesRead, err := file.Read(sendBuffer)
 				if err == io.EOF {
 					// Read the client's Next Action request
-					//TODO: Remove hardcoded behavior and switch behaviors based on the next action send
+					// TODO: Remove hardcoded behavior and switch behaviors based on the next action send
 					if _, err := conn.Read(readBuffer); err != nil {
 						s.Logger.Errorf("error reading next action: %v", err)
 						return err