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

websockets logging.

Browse source
This commit is contained in:
Miroslav Šedivý 2021-08-29 18:23:58 +02:00
parent d00d66e0ec
commit 8f8cd47e85
10 changed files with 115 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/websocket/handler/clipboard.go
View file

@ -6,13 +6,15 @@ import (
)
func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.Profile().CanAccessClipboard {
h.logger.Debug().Str("session_id", session.ID()).Msg("cannot access clipboard")
logger.Debug().Msg("cannot access clipboard")
return nil
}
if !session.IsHost() {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host")
logger.Debug().Msg("is not the host")
return nil
}

12
internal/websocket/handler/control.go
View file

@ -7,13 +7,15 @@ import (
)
func (h *MessageHandlerCtx) controlRelease(session types.Session) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.Profile().CanHost {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host")
logger.Debug().Msg("is not allowed to host")
return nil
}
if !session.IsHost() {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host")
logger.Debug().Msg("is not the host")
return nil
}
@ -24,13 +26,15 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error {
}
func (h *MessageHandlerCtx) controlRequest(session types.Session) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.Profile().CanHost {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not allowed to host")
logger.Debug().Msg("is not allowed to host")
return nil
}
if session.IsHost() {
h.logger.Debug().Str("session_id", session.ID()).Msg("is already the host")
logger.Debug().Msg("is already the host")
return nil
}

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

@ -18,10 +18,8 @@ func New(
capture types.CaptureManager,
webrtc types.WebRTCManager,
) *MessageHandlerCtx {
logger := log.With().Str("module", "handler").Logger()
return &MessageHandlerCtx{
logger: logger,
logger: log.With().Str("module", "websocket").Str("submodule", "handler").Logger(),
sessions: sessions,
desktop: desktop,
capture: capture,
@ -38,9 +36,11 @@ type MessageHandlerCtx struct {
}
func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
header := message.Message{}
if err := json.Unmarshal(raw, &header); err != nil {
h.logger.Error().Err(err).Msg("message parsing has failed")
logger.Error().Err(err).Msg("message parsing has failed")
return false
}
@ -114,12 +114,12 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool {
return h.sendBroadcast(session, payload)
})
default:
h.logger.Warn().Str("event", header.Event).Msg("unknown message event")
logger.Warn().Str("event", header.Event).Msg("unknown message event")
return false
}
if err != nil {
h.logger.Error().Err(err).Str("event", header.Event).Msg("message handler has failed")
logger.Error().Err(err).Str("event", header.Event).Msg("message handler has failed")
}
return true

8
internal/websocket/handler/keyboard.go
View file

@ -6,8 +6,10 @@ import (
)
func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.IsHost() {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host")
logger.Debug().Msg("is not the host")
return nil
}
@ -18,8 +20,10 @@ func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.
}
func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.IsHost() {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not the host")
logger.Debug().Msg("is not the host")
return nil
}

4
internal/websocket/handler/screen.go
View file

@ -7,8 +7,10 @@ import (
)
func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.Profile().IsAdmin {
h.logger.Debug().Str("session_id", session.ID()).Msg("is not the admin")
logger.Debug().Msg("is not the admin")
return nil
}

4
internal/websocket/handler/send.go
View file

@ -7,9 +7,11 @@ import (
)
func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
receiver, ok := h.sessions.Get(payload.Receiver)
if !ok {
h.logger.Debug().Str("session_id", session.ID()).Msg("receiver session ID not found")
logger.Debug().Msg("receiver session ID not found")
return nil
}

20
internal/websocket/handler/signal.go
View file

@ -7,8 +7,10 @@ import (
)
func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *message.SignalVideo) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
if !session.Profile().CanWatch {
h.logger.Debug().Str("session_id", session.ID()).Msg("not allowed to watch")
logger.Debug().Msg("not allowed to watch")
return nil
}
@ -33,9 +35,11 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session, payload *messag
}
func (h *MessageHandlerCtx) signalRestart(session types.Session) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
peer := session.GetWebRTCPeer()
if peer == nil {
h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist")
logger.Debug().Msg("webRTC peer does not exist")
return nil
}
@ -52,9 +56,11 @@ func (h *MessageHandlerCtx) signalRestart(session types.Session) error {
}
func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
peer := session.GetWebRTCPeer()
if peer == nil {
h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist")
logger.Debug().Msg("webRTC peer does not exist")
return nil
}
@ -62,9 +68,11 @@ func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message
}
func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
peer := session.GetWebRTCPeer()
if peer == nil {
h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist")
logger.Debug().Msg("webRTC peer does not exist")
return nil
}
@ -72,9 +80,11 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess
}
func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error {
logger := h.logger.With().Str("session_id", session.ID()).Logger()
peer := session.GetWebRTCPeer()
if peer == nil {
h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist")
logger.Debug().Msg("webRTC peer does not exist")
return nil
}