3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-05-28 08:27:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove room lock.

Browse source
This commit is contained in:
Miroslav Šedivý 2020-11-25 22:16:56 +01:00
parent d1fccf5ab6
commit ecfce6c886
5 changed files with 6 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

44
internal/websocket/handler/admin.go
View file

@ -6,50 +6,6 @@ import (
"demodesk/neko/internal/types/message"
)
func (h *MessageHandlerCtx) adminLock(session types.Session) error {
if !session.Admin() {
h.logger.Debug().Msg("user not admin")
return nil
}
if h.locked {
h.logger.Debug().Msg("server already locked...")
return nil
}
h.locked = true
h.sessions.Broadcast(
message.Admin{
Event: event.ADMIN_LOCK,
ID: session.ID(),
}, nil)
return nil
}
func (h *MessageHandlerCtx) adminUnlock(session types.Session) error {
if !session.Admin() {
h.logger.Debug().Msg("user not admin")
return nil
}
if !h.locked {
h.logger.Debug().Msg("server not locked...")
return nil
}
h.locked = false
h.sessions.Broadcast(
message.Admin{
Event: event.ADMIN_UNLOCK,
ID: session.ID(),
}, nil)
return nil
}
func (h *MessageHandlerCtx) adminControl(session types.Session) error {
if !session.Admin() {
h.logger.Debug().Msg("user not admin")

25
internal/websocket/handler/handler.go
View file

@ -27,7 +27,6 @@ func New(
desktop: desktop,
capture: capture,
webrtc: webrtc,
locked: false,
}
}
@ -37,26 +36,6 @@ type MessageHandlerCtx struct {
webrtc types.WebRTCManager
desktop types.DesktopManager
capture types.CaptureManager
locked bool
}
func (h *MessageHandlerCtx) Connected(session types.Session, websocket_peer types.WebSocketPeer) (bool, string) {
if h.locked && !session.Admin(){
h.logger.Debug().Msg("server locked")
return false, "locked"
}
return true, ""
}
// TODO: Remove, unused.
func (h *MessageHandlerCtx) Disconnected(id string) error {
// TODO: Refactor.
if h.locked && len(h.sessions.Admins()) == 0 {
h.locked = false
}
return h.sessions.Delete(id)
}
func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error {
@ -116,10 +95,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error {
err = h.boradcastDestroy(session)
// Admin Events
case event.ADMIN_LOCK:
err = h.adminLock(session)
case event.ADMIN_UNLOCK:
err = h.adminUnlock(session)
case event.ADMIN_CONTROL:
err = h.adminControl(session)
case event.ADMIN_RELEASE: