Refactor filestore to simplify testing

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index d5da45808e546bfb0b440fe866978c327b6d9098..33888e08f745a92d1f41802603ba2aadb619c3ce 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -1,6 +1,7 @@
 package hotline
 
 import (
 package hotline
 
 import (

+       "bytes"

        "context"
        "encoding/binary"
        "errors"
        "context"
        "encoding/binary"
        "errors"


@@ -31,6 +32,8 @@ const (
        trackerUpdateFrequency = 300 // time in seconds between tracker re-registration
 )
 
        trackerUpdateFrequency = 300 // time in seconds between tracker re-registration
 )
 

+var nostalgiaVersion = []byte{0, 0, 2, 0x2c} // version ID used by the Nostalgia client
+

 type Server struct {
        Port          int
        Accounts      map[string]*Account
 type Server struct {
        Port          int
        Accounts      map[string]*Account


@@ -47,8 +50,7 @@ type Server struct {
        TrackerPassID [4]byte
        Stats         *Stats
 
        TrackerPassID [4]byte
        Stats         *Stats
 

-       APIListener  net.Listener
-       FileListener net.Listener
+       FS FileStore

 
        // newsReader io.Reader
        // newsWriter io.WriteCloser
 
        // newsReader io.Reader
        // newsWriter io.WriteCloser


@@ -65,27 +67,41 @@ type PrivateChat struct {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {

-       s.Logger.Infow("Hotline server started", "version", VERSION)
+       s.Logger.Infow("Hotline server started",
+               "version", VERSION,
+               "API port", fmt.Sprintf(":%v", s.Port),
+               "Transfer port", fmt.Sprintf(":%v", s.Port+1),
+       )
+

        var wg sync.WaitGroup
 
        wg.Add(1)
        var wg sync.WaitGroup
 
        wg.Add(1)

-       go func() { s.Logger.Fatal(s.Serve(ctx, cancelRoot, s.APIListener)) }()
+       go func() {
+               ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port))
+               if err != nil {
+                       s.Logger.Fatal(err)
+               }
+
+               s.Logger.Fatal(s.Serve(ctx, cancelRoot, ln))
+       }()

 
        wg.Add(1)
 
        wg.Add(1)

-       go func() { s.Logger.Fatal(s.ServeFileTransfers(s.FileListener)) }()
+       go func() {
+               ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port+1))
+               if err != nil {
+                       s.Logger.Fatal(err)
+
+               }
+
+               s.Logger.Fatal(s.ServeFileTransfers(ln))
+       }()

 
        wg.Wait()
 
        return nil
 }
 
 
        wg.Wait()
 
        return nil
 }
 

-func (s *Server) APIPort() int {
-       return s.APIListener.Addr().(*net.TCPAddr).Port
-}
-

 func (s *Server) ServeFileTransfers(ln net.Listener) error {
 func (s *Server) ServeFileTransfers(ln net.Listener) error {

-       s.Logger.Infow("Hotline file transfer server started", "Addr", fmt.Sprintf(":%v", s.Port+1))
-

        for {
                conn, err := ln.Accept()
                if err != nil {
        for {
                conn, err := ln.Accept()
                if err != nil {


@@ -138,7 +154,6 @@ func (s *Server) sendTransaction(t Transaction) error {
 }
 
 func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln net.Listener) error {
 }
 
 func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln net.Listener) error {

-       s.Logger.Infow("Hotline server started", "Addr", fmt.Sprintf(":%v", s.Port))

 
        for {
                conn, err := ln.Accept()
 
        for {
                conn, err := ln.Accept()


@@ -173,7 +188,7 @@ const (
 )
 
 // NewServer constructs a new Server from a config dir
 )
 
 // NewServer constructs a new Server from a config dir

-func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredLogger) (*Server, error) {
+func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredLogger, FS FileStore) (*Server, error) {

        server := Server{
                Port:          netPort,
                Accounts:      make(map[string]*Account),
        server := Server{
                Port:          netPort,
                Accounts:      make(map[string]*Account),


@@ -187,31 +202,18 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
                outbox:        make(chan Transaction),
                Stats:         &Stats{StartTime: time.Now()},
                ThreadedNews:  &ThreadedNews{},
                outbox:        make(chan Transaction),
                Stats:         &Stats{StartTime: time.Now()},
                ThreadedNews:  &ThreadedNews{},

+               FS:            FS,

        }
 
        }
 

-       ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
-       if err != nil {
-               return nil, err
-       }
-       server.APIListener = ln
-
-       if netPort != 0 {
-               netPort += 1
-       }
-
-       ln2, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
-       server.FileListener = ln2
-       if err != nil {
-               return nil, err
-       }
+       var err error

 
        // generate a new random passID for tracker registration
        if _, err := rand.Read(server.TrackerPassID[:]); err != nil {
                return nil, err
        }
 
 
        // generate a new random passID for tracker registration
        if _, err := rand.Read(server.TrackerPassID[:]); err != nil {
                return nil, err
        }
 

-       server.Logger.Debugw("Loading Agreement", "path", configDir+agreementFile)
-       if server.Agreement, err = os.ReadFile(configDir + agreementFile); err != nil {
+       server.Agreement, err = os.ReadFile(configDir + agreementFile)
+       if err != nil {

                return nil, err
        }
 
                return nil, err
        }
 


@@ -362,15 +364,13 @@ func (s *Server) NewUser(login, name, password string, access []byte) error {
        }
        s.Accounts[login] = &account
 
        }
        s.Accounts[login] = &account
 

-       return FS.WriteFile(s.ConfigDir+"Users/"+login+".yaml", out, 0666)
+       return s.FS.WriteFile(s.ConfigDir+"Users/"+login+".yaml", out, 0666)

 }
 
 func (s *Server) UpdateUser(login, newLogin, name, password string, access []byte) error {
        s.mux.Lock()
        defer s.mux.Unlock()
 
 }
 
 func (s *Server) UpdateUser(login, newLogin, name, password string, access []byte) error {
        s.mux.Lock()
        defer s.mux.Unlock()
 

-       fmt.Printf("login: %v, newLogin: %v: ", login, newLogin)
-

        // update renames the user login
        if login != newLogin {
                err := os.Rename(s.ConfigDir+"Users/"+login+".yaml", s.ConfigDir+"Users/"+newLogin+".yaml")
        // update renames the user login
        if login != newLogin {
                err := os.Rename(s.ConfigDir+"Users/"+login+".yaml", s.ConfigDir+"Users/"+newLogin+".yaml")


@@ -404,7 +404,7 @@ func (s *Server) DeleteUser(login string) error {
 
        delete(s.Accounts, login)
 
 
        delete(s.Accounts, login)
 

-       return FS.Remove(s.ConfigDir + "Users/" + login + ".yaml")
+       return s.FS.Remove(s.ConfigDir + "Users/" + login + ".yaml")

 }
 
 func (s *Server) connectedUsers() []Field {
 }
 
 func (s *Server) connectedUsers() []Field {


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

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

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


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

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

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


@@ -578,8 +578,8 @@ func (s *Server) handleNewConnection(conn net.Conn, remoteAddr string) 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))
 

-       // assume simplified hotline v1.2.3 login flow that does not require agreement
-       if *c.Version == nil {
+       // Used simplified hotline v1.2.3 login flow for clients that do not send login info in tranAgreed
+       if *c.Version == nil || bytes.Equal(*c.Version, nostalgiaVersion) {

                c.Agreed = true
 
                c.notifyOthers(
                c.Agreed = true
 
                c.notifyOthers(


@@ -717,7 +717,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
                        }
                }
 
                        }
                }
 

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

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


@@ -909,7 +909,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
                                return err
                        }
 
                                return err
                        }
 

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

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


@@ -966,8 +966,8 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
                )
 
                // Check if the target folder exists.  If not, create it.
                )
 
                // Check if the target folder exists.  If not, create it.

-               if _, err := FS.Stat(dstPath); os.IsNotExist(err) {
-                       if err := FS.Mkdir(dstPath, 0777); err != nil {
+               if _, err := s.FS.Stat(dstPath); os.IsNotExist(err) {
+                       if err := s.FS.Mkdir(dstPath, 0777); err != nil {

                                return err
                        }
                }
                                return err
                        }
                }


@@ -1080,7 +1080,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
                                        filePath := dstPath + "/" + fu.FormattedPath()
                                        s.Logger.Infow("Starting file transfer", "path", filePath, "fileNum", i+1, "totalFiles", "zz", "fileSize", binary.BigEndian.Uint32(fileSize))
 
                                        filePath := dstPath + "/" + fu.FormattedPath()
                                        s.Logger.Infow("Starting file transfer", "path", filePath, "fileNum", i+1, "totalFiles", "zz", "fileSize", binary.BigEndian.Uint32(fileSize))
 

-                                       newFile, err := FS.Create(filePath + ".incomplete")
+                                       newFile, err := s.FS.Create(filePath + ".incomplete")

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