3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-05-12 16:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

add lock controls for users.

Browse source
This commit is contained in:
Miroslav Šedivý 2021-11-16 22:50:11 +01:00
parent 2290c4a065
commit 61fcf7f699
20 changed files with 277 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

37
server/internal/websocket/admin.go
View file

@ -8,23 +8,30 @@ import (
"m1k1o/neko/internal/types/message"
)
func (h *MessageHandler) adminLock(id string, session types.Session) error {
func (h *MessageHandler) adminLock(id string, session types.Session, payload *message.AdminLock) error {
if !session.Admin() {
h.logger.Debug().Msg("user not admin")
return nil
}
if h.locked {
h.logger.Debug().Msg("server already locked...")
_, ok := h.locked[payload.Resource]
if ok {
h.logger.Debug().Str("resource", payload.Resource).Msg("resource already locked...")
return nil
}
h.locked = true
if payload.Resource != "login" && payload.Resource != "control" {
h.logger.Debug().Msg("unknown lock resource")
return nil
}
h.locked[payload.Resource] = id
if err := h.sessions.Broadcast(
message.Admin{
Event: event.ADMIN_LOCK,
ID: id,
message.AdminLock{
Event: event.ADMIN_LOCK,
ID: id,
Resource: payload.Resource,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_LOCK)
return err
@ -33,23 +40,25 @@ func (h *MessageHandler) adminLock(id string, session types.Session) error {
return nil
}
func (h *MessageHandler) adminUnlock(id string, session types.Session) error {
func (h *MessageHandler) adminUnlock(id string, session types.Session, payload *message.AdminLock) error {
if !session.Admin() {
h.logger.Debug().Msg("user not admin")
return nil
}
if !h.locked {
h.logger.Debug().Msg("server not locked...")
_, ok := h.locked[payload.Resource]
if !ok {
h.logger.Debug().Str("resource", payload.Resource).Msg("resource not locked...")
return nil
}
h.locked = false
delete(h.locked, payload.Resource)
if err := h.sessions.Broadcast(
message.Admin{
Event: event.ADMIN_UNLOCK,
ID: id,
message.AdminLock{
Event: event.ADMIN_UNLOCK,
ID: id,
Resource: payload.Resource,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.ADMIN_UNLOCK)
return err

15
server/internal/websocket/control.go
View file

@ -7,7 +7,6 @@ import (
)
func (h *MessageHandler) controlRelease(id string, session types.Session) error {
// check if session is host
if !h.sessions.IsHost(id) {
h.logger.Debug().Str("id", id).Msg("is not the host")
@ -34,6 +33,13 @@ func (h *MessageHandler) controlRelease(id string, session types.Session) error
func (h *MessageHandler) controlRequest(id string, session types.Session) error {
// check for host
if !h.sessions.HasHost() {
// check if control is locked or user is admin
_, ok := h.locked["control"]
if ok && !session.Admin() {
h.logger.Debug().Msg("control is locked")
return nil
}
// set host
err := h.sessions.SetHost(id)
if err != nil {
@ -91,6 +97,13 @@ func (h *MessageHandler) controlGive(id string, session types.Session, payload *
return nil
}
// check if control is locked or giver is admin
_, ok := h.locked["control"]
if ok && !session.Admin() {
h.logger.Debug().Msg("control is locked")
return nil
}
// set host
err := h.sessions.SetHost(payload.ID)
if err != nil {

17
server/internal/websocket/handler.go
View file

@ -19,7 +19,7 @@ type MessageHandler struct {
remote types.RemoteManager
broadcast types.BroadcastManager
banned map[string]bool
locked bool
locked map[string]string
}
func (h *MessageHandler) Connected(admin bool, socket *WebSocket) (bool, string, error) {
@ -34,7 +34,8 @@ func (h *MessageHandler) Connected(admin bool, socket *WebSocket) (bool, string,
}
}
if h.locked && !admin {
_, ok := h.locked["login"]
if ok && !admin {
h.logger.Debug().Msg("server locked")
return false, "locked", nil
}
@ -128,9 +129,17 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
// Admin Events
case event.ADMIN_LOCK:
return errors.Wrapf(h.adminLock(id, session), "%s failed", header.Event)
payload := &message.AdminLock{}
return errors.Wrapf(
utils.Unmarshal(payload, raw, func() error {
return h.adminLock(id, session, payload)
}), "%s failed", header.Event)
case event.ADMIN_UNLOCK:
return errors.Wrapf(h.adminUnlock(id, session), "%s failed", header.Event)
payload := &message.AdminLock{}
return errors.Wrapf(
utils.Unmarshal(payload, raw, func() error {
return h.adminUnlock(id, session, payload)
}), "%s failed", header.Event)
case event.ADMIN_CONTROL:
return errors.Wrapf(h.adminControl(id, session), "%s failed", header.Event)
case event.ADMIN_RELEASE:

23
server/internal/websocket/session.go
View file

@ -12,6 +12,18 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
return err
}
// notify all about what is locked
for resource, id := range h.locked {
if err := session.Send(message.AdminLock{
Event: event.ADMIN_LOCK,
ID: id,
Resource: resource,
}); err != nil {
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.ADMIN_LOCK)
return err
}
}
if session.Admin() {
// send screen configurations if admin
if err := h.screenConfigurations(id, session); err != nil {
@ -22,17 +34,6 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
if err := h.boradcastStatus(session); err != nil {
return err
}
// if locked, notify admin about that
if h.locked {
if err := session.Send(message.Admin{
Event: event.ADMIN_LOCK,
ID: id,
}); err != nil {
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.ADMIN_LOCK)
return err
}
}
}
return nil

2
server/internal/websocket/websocket.go
View file

@ -39,7 +39,7 @@ func New(sessions types.SessionManager, remote types.RemoteManager, broadcast ty
sessions: sessions,
webrtc: webrtc,
banned: make(map[string]bool),
locked: false,
locked: make(map[string]string),
},
conns: 0,
}