X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d61414673846dc2bdafd0f1cc941caefb3cd5066..5d87f76eeb76e4e67e5dabb2c835a640a7ab7652:/hotline/server.go

diff --git a/hotline/server.go b/hotline/server.go
index 4b36cf6..a77e792 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/go-playground/validator/v10"
 	"go.uber.org/zap"
+	"golang.org/x/text/encoding/charmap"
 	"gopkg.in/yaml.v3"
 	"io"
 	"io/fs"
@@ -15,6 +16,7 @@ import (
 	"math/rand"
 	"net"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -27,11 +29,16 @@ var contextKeyReq = contextKey("req")
 
 type requestCtx struct {
 	remoteAddr string
-	login      string
-	name       string
 }
 
+// Converts bytes from Mac Roman encoding to UTF-8
+var txtDecoder = charmap.Macintosh.NewDecoder()
+
+// Converts bytes from UTF-8 to Mac Roman encoding
+var txtEncoder = charmap.Macintosh.NewEncoder()
+
 type Server struct {
+	NetInterface  string
 	Port          int
 	Accounts      map[string]*Account
 	Agreement     []byte
@@ -84,15 +91,15 @@ type PrivateChat struct {
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
 	s.Logger.Infow("Hotline server started",
 		"version", VERSION,
-		"API port", fmt.Sprintf(":%v", s.Port),
-		"Transfer port", fmt.Sprintf(":%v", s.Port+1),
+		"API port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port),
+		"Transfer port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1),
 	)
 
 	var wg sync.WaitGroup
 
 	wg.Add(1)
 	go func() {
-		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port))
+		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", s.NetInterface, s.Port))
 		if err != nil {
 			s.Logger.Fatal(err)
 		}
@@ -102,10 +109,9 @@ func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFu
 
 	wg.Add(1)
 	go func() {
-		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port+1))
+		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1))
 		if err != nil {
 			s.Logger.Fatal(err)
-
 		}
 
 		s.Logger.Fatal(s.ServeFileTransfers(ctx, ln))
@@ -209,8 +215,9 @@ const (
 )
 
 // NewServer constructs a new Server from a config dir
-func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, fs FileStore) (*Server, error) {
+func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredLogger, fs FileStore) (*Server, error) {
 	server := Server{
+		NetInterface:  netInterface,
 		Port:          netPort,
 		Accounts:      make(map[string]*Account),
 		Config:        new(Config),
@@ -258,7 +265,10 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, fs File
 		return nil, err
 	}
 
-	server.Config.FileRoot = filepath.Join(configDir, "Files")
+	// If the FileRoot is an absolute path, use it, otherwise treat as a relative path to the config dir.
+	if !filepath.IsAbs(server.Config.FileRoot) {
+		server.Config.FileRoot = filepath.Join(configDir, server.Config.FileRoot)
+	}
 
 	*server.NextGuestID = 1
 
@@ -314,7 +324,7 @@ func (s *Server) keepaliveHandler() {
 				c.Idle = true
 
 				flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(c.Flags)))
-				flagBitmap.SetBit(flagBitmap, userFlagAway, 1)
+				flagBitmap.SetBit(flagBitmap, UserFlagAway, 1)
 				binary.BigEndian.PutUint16(c.Flags, uint16(flagBitmap.Int64()))
 
 				c.sendAll(
@@ -375,15 +385,14 @@ func (s *Server) NewClientConn(conn io.ReadWriteCloser, remoteAddr string) *Clie
 		Server:     s,
 		Version:    []byte{},
 		AutoReply:  []byte{},
-		transfers:  map[int]map[[4]byte]*FileTransfer{},
 		RemoteAddr: remoteAddr,
-	}
-	clientConn.transfers = map[int]map[[4]byte]*FileTransfer{
-		FileDownload:   {},
-		FileUpload:     {},
-		FolderDownload: {},
-		FolderUpload:   {},
-		bannerDownload: {},
+		transfers: map[int]map[[4]byte]*FileTransfer{
+			FileDownload:   {},
+			FileUpload:     {},
+			FolderDownload: {},
+			FolderUpload:   {},
+			bannerDownload: {},
+		},
 	}
 
 	*s.NextGuestID++
@@ -410,9 +419,26 @@ func (s *Server) NewUser(login, name, password string, access accessBitmap) erro
 	if err != nil {
 		return err
 	}
+
+	// Create account file, returning an error if one already exists.
+	file, err := os.OpenFile(
+		filepath.Join(s.ConfigDir, "Users", path.Join("/", login)+".yaml"),
+		os.O_CREATE|os.O_EXCL|os.O_WRONLY,
+		0644,
+	)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	_, err = file.Write(out)
+	if err != nil {
+		return fmt.Errorf("error writing account file: %w", err)
+	}
+
 	s.Accounts[login] = &account
 
-	return s.FS.WriteFile(filepath.Join(s.ConfigDir, "Users", login+".yaml"), out, 0666)
+	return nil
 }
 
 func (s *Server) UpdateUser(login, newLogin, name, password string, access accessBitmap) error {
@@ -451,9 +477,14 @@ func (s *Server) DeleteUser(login string) error {
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
+	err := s.FS.Remove(filepath.Join(s.ConfigDir, "Users", path.Join("/", login)+".yaml"))
+	if err != nil {
+		return err
+	}
+
 	delete(s.Accounts, login)
 
-	return s.FS.Remove(filepath.Join(s.ConfigDir, "Users", login+".yaml"))
+	return nil
 }
 
 func (s *Server) connectedUsers() []Field {
@@ -513,8 +544,8 @@ func (s *Server) loadAccounts(userDir string) error {
 
 		account := Account{}
 		decoder := yaml.NewDecoder(fh)
-		if err := decoder.Decode(&account); err != nil {
-			return err
+		if err = decoder.Decode(&account); err != nil {
+			return fmt.Errorf("error loading account %s: %w", file, err)
 		}
 
 		s.Accounts[account.Login] = &account
@@ -740,7 +771,7 @@ func (s *Server) NewPrivateChat(cc *ClientConn) []byte {
 
 	randID := make([]byte, 4)
 	rand.Read(randID)
-	data := binary.BigEndian.Uint32(randID[:])
+	data := binary.BigEndian.Uint32(randID)
 
 	s.PrivateChats[data] = &PrivateChat{
 		ClientConn: make(map[uint16]*ClientConn),