Implement handling of special case Dropbox and Upload folders

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index 20ef49b9a082bdbc73f91e1462392e96c1651858..7b409d5921fae8a1fcdc55fc12d33f2ebc7625ed 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -8,7 +8,6 @@ import (
        "go.uber.org/zap"
        "io"
        "io/ioutil"
        "go.uber.org/zap"
        "io"
        "io/ioutil"

-       "log"

        "math/big"
        "math/rand"
        "net"
        "math/big"
        "math/rand"
        "net"


@@ -21,7 +20,6 @@ import (
        "sync"
        "time"
 
        "sync"
        "time"
 

-       "golang.org/x/crypto/bcrypt"

        "gopkg.in/yaml.v2"
 )
 
        "gopkg.in/yaml.v2"
 )
 


@@ -50,8 +48,8 @@ type Server struct {
        APIListener  net.Listener
        FileListener net.Listener
 
        APIListener  net.Listener
        FileListener net.Listener
 

-       newsReader io.Reader
-       newsWriter io.WriteCloser
+       // newsReader io.Reader
+       // newsWriter io.WriteCloser

 
        outbox chan Transaction
 
 
        outbox chan Transaction
 


@@ -111,7 +109,7 @@ func (s *Server) sendTransaction(t Transaction) error {
        client := s.Clients[uint16(clientID)]
        s.mux.Unlock()
        if client == nil {
        client := s.Clients[uint16(clientID)]
        s.mux.Unlock()
        if client == nil {

-               return errors.New("invalid client")
+               return fmt.Errorf("invalid client id %v", *t.clientID)

        }
        userName := string(client.UserName)
        login := client.Account.Login
        }
        userName := string(client.UserName)
        login := client.Account.Login


@@ -169,7 +167,7 @@ func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln ne
 }
 
 const (
 }
 
 const (

-       agreementFile    = "Agreement.txt"
+       agreementFile = "Agreement.txt"

 )
 
 // NewServer constructs a new Server from a config dir
 )
 
 // NewServer constructs a new Server from a config dir


@@ -278,8 +276,8 @@ func (s *Server) keepaliveHandler() {
                s.mux.Lock()
 
                for _, c := range s.Clients {
                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)))
                                c.Idle = true
 
                                flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*c.Flags)))


@@ -327,15 +325,13 @@ func (s *Server) NewClientConn(conn net.Conn) *ClientConn {
                Connection: conn,
                Server:     s,
                Version:    &[]byte{},
                Connection: conn,
                Server:     s,
                Version:    &[]byte{},

-               IdleTime:   new(int),
-               AutoReply:  &[]byte{},
+               AutoReply:  []byte{},

                Transfers:  make(map[int][]*FileTransfer),
                Transfers:  make(map[int][]*FileTransfer),

+               Agreed:     false,

        }
        *s.NextGuestID++
        ID := *s.NextGuestID
 
        }
        *s.NextGuestID++
        ID := *s.NextGuestID
 

-       *clientConn.IdleTime = 0
-

        binary.BigEndian.PutUint16(*clientConn.ID, ID)
        s.Clients[ID] = clientConn
 
        binary.BigEndian.PutUint16(*clientConn.ID, ID)
        s.Clients[ID] = clientConn
 


@@ -369,7 +365,7 @@ func (s *Server) DeleteUser(login string) error {
 
        delete(s.Accounts, login)
 
 
        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 {
 }
 
 func (s *Server) connectedUsers() []Field {


@@ -377,7 +373,10 @@ func (s *Server) connectedUsers() []Field {
        defer s.mux.Unlock()
 
        var connectedUsers []Field
        defer s.mux.Unlock()
 
        var connectedUsers []Field

-       for _, c := range s.Clients {
+       for _, c := range sortedClients(s.Clients) {
+               if !c.Agreed {
+                       continue
+               }

                user := User{
                        ID:    *c.ID,
                        Icon:  *c.Icon,
                user := User{
                        ID:    *c.ID,
                        Icon:  *c.Icon,


@@ -413,7 +412,7 @@ func (s *Server) loadAccounts(userDir string) error {
        }
 
        for _, file := range matches {
        }
 
        for _, file := range matches {

-               fh, err := os.Open(file)
+               fh, err := FS.Open(file)

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


@@ -431,7 +430,7 @@ func (s *Server) loadAccounts(userDir string) error {
 }
 
 func (s *Server) loadConfig(path string) error {
 }
 
 func (s *Server) loadConfig(path string) error {

-       fh, err := os.Open(path)
+       fh, err := FS.Open(path)

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


@@ -536,9 +535,21 @@ func (s *Server) handleNewConnection(conn net.Conn) error {
        // Show agreement to client
        c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
 
        // Show agreement to client
        c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
 

-       if _, err := c.notifyNewUserHasJoined(); err != nil {
-               return err
+       // assume simplified hotline v1.2.3 login flow that does not require agreement
+       if *c.Version == nil {
+               c.Agreed = true
+
+               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
 
        const readBuffSize = 1024000 // 1KB - TODO: what should this be?
        c.Server.Stats.LoginCount += 1
 
        const readBuffSize = 1024000 // 1KB - TODO: what should this be?


@@ -571,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
 // 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


@@ -620,13 +616,14 @@ const dlFldrActionNextFile = 3
 func (s *Server) TransferFile(conn net.Conn) error {
        defer func() { _ = conn.Close() }()
 
 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
                return err
        }
 
        var t transfer

-       _, err := t.Write(buf[:16])
+       _, err = t.Write(txBuf)

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


@@ -636,11 +633,15 @@ func (s *Server) TransferFile(conn net.Conn) error {
 
        switch fileTransfer.Type {
        case FileDownload:
 
        switch fileTransfer.Type {
        case FileDownload:

-               fullFilePath := fmt.Sprintf("%v/%v", s.Config.FileRoot+string(fileTransfer.FilePath), string(fileTransfer.FileName))
+               fullFilePath, err := readPath(s.Config.FileRoot, fileTransfer.FilePath, fileTransfer.FileName)
+               if err != nil {
+                       return err
+               }

 
                ffo, err := NewFlattenedFileObject(
 
                ffo, err := NewFlattenedFileObject(

-                       s.Config.FileRoot+string(fileTransfer.FilePath),
-                       string(fileTransfer.FileName),
+                       s.Config.FileRoot,
+                       fileTransfer.FilePath,
+                       fileTransfer.FileName,

                )
                if err != nil {
                        return err
                )
                if err != nil {
                        return err


@@ -653,7 +654,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
                        return err
                }
 
                        return err
                }
 

-               file, err := os.Open(fullFilePath)
+               file, err := FS.Open(fullFilePath)

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


@@ -674,11 +675,16 @@ func (s *Server) TransferFile(conn net.Conn) error {
                        }
                }
        case FileUpload:
                        }
                }
        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
                }
 
                        return err
                }
 

-               ffo := ReadFlattenedFileObject(buf)
+               ffo := ReadFlattenedFileObject(uploadBuf)

                payloadLen := len(ffo.BinaryMarshal())
                fileSize := int(binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize))
 
                payloadLen := len(ffo.BinaryMarshal())
                fileSize := int(binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize))
 


@@ -698,9 +704,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
 
                defer func() { _ = newFile.Close() }()
 
 
                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
                        return err
                }
                receivedBytes := buffSize - payloadLen


@@ -756,9 +760,10 @@ func (s *Server) TransferFile(conn net.Conn) error {
                //
                // This notifies the server to send the next item header
 
                //
                // This notifies the server to send the next item header
 

-               var fh FilePath
-               _ = fh.UnmarshalBinary(fileTransfer.FilePath)
-               fullFilePath := fmt.Sprintf("%v/%v", s.Config.FileRoot+fh.String(), string(fileTransfer.FileName))
+               fullFilePath, err := readPath(s.Config.FileRoot, fileTransfer.FilePath, fileTransfer.FileName)
+               if err != nil {
+                       return err
+               }

 
                basePathLen := len(fullFilePath)
 
 
                basePathLen := len(fullFilePath)
 


@@ -785,7 +790,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
                        }
 
                        // Read the client's Next Action request
                        }
 
                        // 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
                        }
                        if _, err := conn.Read(readBuffer); err != nil {
                                return err
                        }


@@ -798,7 +803,11 @@ func (s *Server) TransferFile(conn net.Conn) error {
 
                        splitPath := strings.Split(path, "/")
 
 
                        splitPath := strings.Split(path, "/")
 

-                       ffo, err := NewFlattenedFileObject(strings.Join(splitPath[:len(splitPath)-1], "/"), info.Name())
+                       ffo, err := NewFlattenedFileObject(
+                               strings.Join(splitPath[:len(splitPath)-1], "/"),
+                               nil,
+                               []byte(info.Name()),
+                       )

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


@@ -821,7 +830,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
                                return err
                        }
 
                                return err
                        }
 

-                       file, err := os.Open(path)
+                       file, err := FS.Open(path)

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


@@ -833,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
                                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
                                        if _, err := conn.Read(readBuffer); err != nil {
                                                s.Logger.Errorf("error reading next action: %v", err)
                                                return err


@@ -851,20 +860,23 @@ func (s *Server) TransferFile(conn net.Conn) error {
                })
 
        case FolderUpload:
                })
 
        case FolderUpload:

-               dstPath := s.Config.FileRoot + ReadFilePath(fileTransfer.FilePath) + "/" + string(fileTransfer.FileName)
+               dstPath, err := readPath(s.Config.FileRoot, fileTransfer.FilePath, fileTransfer.FileName)
+               if err != nil {
+                       return err
+               }

                s.Logger.Infow(
                        "Folder upload started",
                        "transactionRef", fileTransfer.ReferenceNumber,
                        "RemoteAddr", conn.RemoteAddr().String(),
                        "dstPath", dstPath,
                s.Logger.Infow(
                        "Folder upload started",
                        "transactionRef", fileTransfer.ReferenceNumber,
                        "RemoteAddr", conn.RemoteAddr().String(),
                        "dstPath", dstPath,

-                       "TransferSize", fileTransfer.TransferSize,
+                       "TransferSize", fmt.Sprintf("%x", fileTransfer.TransferSize),

                        "FolderItemCount", fileTransfer.FolderItemCount,
                )
 
                // Check if the target folder exists.  If not, create it.
                        "FolderItemCount", fileTransfer.FolderItemCount,
                )
 
                // Check if the target folder exists.  If not, create it.

-               if _, err := os.Stat(dstPath); os.IsNotExist(err) {
-                       s.Logger.Infow("Target path does not exist; Creating...", "dstPath", dstPath)
-                       if err := os.Mkdir(dstPath, 0777); err != nil {
+               if _, err := FS.Stat(dstPath); os.IsNotExist(err) {
+                       s.Logger.Infow("Creating target path", "dstPath", dstPath)
+                       if err := FS.Mkdir(dstPath, 0777); err != nil {

                                s.Logger.Error(err)
                        }
                }
                                s.Logger.Error(err)
                        }
                }


@@ -981,7 +993,6 @@ func transferFile(conn net.Conn, dst string) error {
        }
 }
 
        }
 }
 

-

 // 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) {
 // 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) {