move filetransfer to locks.

server/internal/websocket/handler/admin.go

@@ -19,7 +19,12 @@ func (h *MessageHandler) adminLock(id string, session types.Session, payload *me
 		return nil
 	}
 
-	if payload.Resource != "login" && payload.Resource != "control" {
+	// allow only known resources
+	switch payload.Resource {
+	case "login":
+	case "control":
+	case "file_transfer":
+	default:
 		h.logger.Debug().Msg("unknown lock resource")
 		return nil
 	}

server/internal/websocket/handler/files.go

@@ -1,62 +0,0 @@
-package handler
-
-import (
-	"errors"
-	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/event"
-	"m1k1o/neko/internal/types/message"
-	"m1k1o/neko/internal/utils"
-)
-
-func (h *MessageHandler) setFileTransferStatus(session types.Session, payload *message.FileTransferStatus) error {
-	if !session.Admin() {
-		h.logger.Debug().Msg("user not admin")
-		return nil
-	}
-
-	h.state.SetFileTransferState(payload.Admin, payload.Unpriv)
-
-	err := h.sessions.Broadcast(message.FileTransferStatus{
-		Event:  event.FILETRANSFER_STATUS,
-		Admin:  payload.Admin,
-		Unpriv: payload.Admin && payload.Unpriv,
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	files, err := utils.ListFiles(h.state.FileTransferPath())
-	if err != nil {
-		return err
-	}
-
-	msg := message.FileList{
-		Event: event.FILETRANSFER_LIST,
-		Cwd:   h.state.FileTransferPath(),
-		Files: files,
-	}
-
-	if payload.Unpriv {
-		return h.sessions.Broadcast(msg, nil)
-	} else {
-		return h.sessions.AdminBroadcast(msg, nil)
-	}
-}
-
-func (h *MessageHandler) refresh(session types.Session) error {
-	if !(h.state.FileTransferEnabled() && session.Admin() || h.state.UnprivFileTransferEnabled()) {
-		return errors.New(session.Member().Name + " tried to refresh file list when they can't")
-	}
-
-	files, err := utils.ListFiles(h.state.FileTransferPath())
-	if err != nil {
-		return err
-	}
-
-	return session.Send(
-		message.FileList{
-			Event: event.FILETRANSFER_LIST,
-			Cwd:   h.state.FileTransferPath(),
-			Files: files,
-		})
-}

server/internal/websocket/handler/filetransfer.go

@@ -0,0 +1,42 @@
+package handler
+
+import (
+	"m1k1o/neko/internal/types"
+	"m1k1o/neko/internal/types/event"
+	"m1k1o/neko/internal/types/message"
+	"m1k1o/neko/internal/utils"
+)
+
+func (h *MessageHandler) FileTransferRefresh(session types.Session) error {
+	fileTransferPath := h.state.FileTransferPath("") // root
+
+	// allow users only if file transfer is not locked
+	if session != nil && !(session.Admin() || !h.state.IsLocked("file_transfer")) {
+		h.logger.Debug().Msg("file transfer is locked for users")
+		return nil
+	}
+
+	files, err := utils.ListFiles(fileTransferPath)
+	if err != nil {
+		return err
+	}
+
+	message := message.FileTransferList{
+		Event: event.FILETRANSFER_LIST,
+		Cwd:   fileTransferPath,
+		Files: files,
+	}
+
+	// send to just one user
+	if session != nil {
+		return session.Send(message)
+	}
+
+	// broadcast to all admins
+	if h.state.IsLocked("file_transfer") {
+		return h.sessions.AdminBroadcast(message, nil)
+	}
+
+	// broadcast to all users
+	return h.sessions.Broadcast(message, nil)
+}

server/internal/websocket/handler/handler.go

@@ -127,14 +127,8 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
 			}), "%s failed", header.Event)
 
 	// File Transfer Events
-	case event.FILETRANSFER_STATUS:
-		payload := &message.FileTransferStatus{}
-		return errors.Wrapf(
-			utils.Unmarshal(payload, raw, func() error {
-				return h.setFileTransferStatus(session, payload)
-			}), "%s failed", header.Event)
 	case event.FILETRANSFER_REFRESH:
-		return errors.Wrapf(h.refresh(session), "%s failed", header.Event)
+		return errors.Wrapf(h.FileTransferRefresh(session), "%s failed", header.Event)
 
 	// Screen Events
 	case event.SCREEN_RESOLUTION:

server/internal/websocket/handler/session.go

@@ -17,6 +17,7 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
 		Event:           event.SYSTEM_INIT,
 		ImplicitHosting: h.webrtc.ImplicitControl(),
 		Locks:           h.state.AllLocked(),
+		FileTransfer:    h.state.FileTransferEnabled(),
 	}); err != nil {
 		h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.SYSTEM_INIT)
 		return err
@@ -34,14 +35,21 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
 		}
 	}
 
+	// send file list if file transfer is enabled
+	if h.state.FileTransferEnabled() && (session.Admin() || !h.state.IsLocked("file_transfer")) {
+		if err := h.FileTransferRefresh(session); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
 func (h *MessageHandler) SessionConnected(id string, session types.Session) error {
 	// send list of members to session
 	if err := session.Send(message.MembersList{
-		Event:    event.MEMBER_LIST,
-		Memebers: h.sessions.Members(),
+		Event:   event.MEMBER_LIST,
+		Members: h.sessions.Members(),
 	}); err != nil {
 		h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST)
 		return err