X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/180d654463687e84270ade218e65d97356c58551..e995052ef530b1eae2d0476ff519f7225bbb481d:/hotline/server.go?ds=inline

diff --git a/hotline/server.go b/hotline/server.go
index a77e792..dde469d 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -283,7 +283,7 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 			for {
 				tr := &TrackerRegistration{
 					UserCount:   server.userCount(),
-					PassID:      server.TrackerPassID[:],
+					PassID:      server.TrackerPassID,
 					Name:        server.Config.Name,
 					Description: server.Config.Description,
 				}
@@ -447,11 +447,12 @@ func (s *Server) UpdateUser(login, newLogin, name, password string, access acces
 
 	// update renames the user login
 	if login != newLogin {
-		err := os.Rename(filepath.Join(s.ConfigDir, "Users", login+".yaml"), filepath.Join(s.ConfigDir, "Users", newLogin+".yaml"))
+		err := os.Rename(filepath.Join(s.ConfigDir, "Users", path.Join("/", login)+".yaml"), filepath.Join(s.ConfigDir, "Users", path.Join("/", newLogin)+".yaml"))
 		if err != nil {
-			return err
+			return fmt.Errorf("unable to rename account: %w", err)
 		}
 		s.Accounts[newLogin] = s.Accounts[login]
+		s.Accounts[newLogin].Login = newLogin
 		delete(s.Accounts, login)
 	}
 
@@ -493,13 +494,16 @@ func (s *Server) connectedUsers() []Field {
 
 	var connectedUsers []Field
 	for _, c := range sortedClients(s.Clients) {
-		user := User{
+		b, err := io.ReadAll(&User{
 			ID:    *c.ID,
 			Icon:  c.Icon,
 			Flags: c.Flags,
 			Name:  string(c.UserName),
+		})
+		if err != nil {
+			return nil
 		}
-		connectedUsers = append(connectedUsers, NewField(FieldUsernameWithInfo, user.Payload()))
+		connectedUsers = append(connectedUsers, NewField(FieldUsernameWithInfo, b))
 	}
 	return connectedUsers
 }
@@ -860,8 +864,8 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 
 		// if file transfer options are included, that means this is a "quick preview" request from a 1.5+ client
 		if fileTransfer.options == nil {
-			// Start by sending flat file object to client
-			if _, err := rwc.Write(fw.ffo.BinaryMarshal()); err != nil {
+			_, err = io.Copy(rwc, fw.ffo)
+			if err != nil {
 				return err
 			}
 		}
@@ -1026,11 +1030,8 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 			}
 
 			fileHeader := NewFileHeader(subPath, info.IsDir())
-
-			// Send the fileWrapper header to client
-			if _, err := rwc.Write(fileHeader.Payload()); err != nil {
-				s.Logger.Errorf("error sending file header: %v", err)
-				return err
+			if _, err := io.Copy(rwc, &fileHeader); err != nil {
+				return fmt.Errorf("error sending file header: %w", err)
 			}
 
 			// Read the client's Next Action request
@@ -1082,8 +1083,8 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 			}
 
 			// Send ffo bytes to client
-			if _, err := rwc.Write(hlFile.ffo.BinaryMarshal()); err != nil {
-				s.Logger.Error(err)
+			_, err = io.Copy(rwc, hlFile.ffo)
+			if err != nil {
 				return err
 			}