iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

websockets set max payload log size. (#42)

Browse Source
This commit is contained in:
Miroslav Šedivý 2023-03-31 12:02:19 +02:00 committed by GitHub
parent 2ff47ac920
commit 43a649d2c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/websocket/manager.go
View File

@ -23,6 +23,9 @@ const pingPeriod = 10 * time.Second
// period for sending inactive cursor messages // period for sending inactive cursor messages
const inactiveCursorsPeriod = 750 * time.Millisecond const inactiveCursorsPeriod = 750 * time.Millisecond
// maximum payload length for logging
const maxPayloadLogLength = 10_000
// events that are not logged in debug mode // events that are not logged in debug mode
var nologEvents = []string{ var nologEvents = []string{
// don't log twice // don't log twice
@ -313,10 +316,15 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, peer type
// log events if not ignored // log events if not ignored
if ok, _ := utils.ArrayIn(data.Event, nologEvents); !ok { if ok, _ := utils.ArrayIn(data.Event, nologEvents); !ok {
payload := data.Payload
if len(payload) > maxPayloadLogLength {
payload = []byte("<truncated>")
}
logger.Debug(). logger.Debug().
Str("address", connection.RemoteAddr().String()). Str("address", connection.RemoteAddr().String()).
Str("event", data.Event). Str("event", data.Event).
Str("payload", string(data.Payload)). Str("payload", string(payload)).
Msg("received message from client") Msg("received message from client")
} }

18
internal/websocket/peer.go
View File

@ -12,6 +12,7 @@ import (
"github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types"
"github.com/demodesk/neko/pkg/types/event" "github.com/demodesk/neko/pkg/types/event"
"github.com/demodesk/neko/pkg/types/message" "github.com/demodesk/neko/pkg/types/message"
"github.com/demodesk/neko/pkg/utils"
) )
type WebSocketPeerCtx struct { type WebSocketPeerCtx struct {
@ -60,11 +61,18 @@ func (peer *WebSocketPeerCtx) Send(event string, payload any) {
return return
} }
peer.logger.Debug(). // log events if not ignored
Str("address", peer.connection.RemoteAddr().String()). if ok, _ := utils.ArrayIn(event, nologEvents); !ok {
Str("event", event). if len(raw) > maxPayloadLogLength {
Str("payload", string(raw)). raw = []byte("<truncated>")
Msg("sending message to client") }
peer.logger.Debug().
Str("address", peer.connection.RemoteAddr().String()).
Str("event", event).
Str("payload", string(raw)).
Msg("sending message to client")
}
} }
func (peer *WebSocketPeerCtx) Ping() error { func (peer *WebSocketPeerCtx) Ping() error {