3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-06-25 14:07:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

session id to session.

Browse source
This commit is contained in:
Miroslav Šedivý 2020-11-14 16:03:12 +01:00
parent fdf5839547
commit e5eaf5c60c
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ type MessageHandlerCtx struct {
locked bool
}
func (h *MessageHandlerCtx) Connected(id string, socket types.WebSocket) (bool, string) {
func (h *MessageHandlerCtx) Connected(session types.Session, socket types.WebSocket) (bool, string) {
address := socket.Address()
if address != "" {
ok, banned := h.banned[address]
@ -54,12 +54,9 @@ func (h *MessageHandlerCtx) Connected(id string, socket types.WebSocket) (bool,
h.logger.Debug().Msg("no remote address")
}
if h.locked {
session, ok := h.sessions.Get(id)
if !ok || !session.Admin() {
h.logger.Debug().Msg("server locked")
return false, "locked"
}
if h.locked && !session.Admin(){
h.logger.Debug().Msg("server locked")
return false, "locked"
}
return true, ""
@ -74,17 +71,12 @@ func (h *MessageHandlerCtx) Disconnected(id string) error {
return h.sessions.Destroy(id)
}
func (h *MessageHandlerCtx) Message(id string, raw []byte) error {
func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error {
header := message.Message{}
if err := json.Unmarshal(raw, &header); err != nil {
return err
}
session, ok := h.sessions.Get(id)
if !ok {
return errors.Errorf("unknown session id %s", id)
}
switch header.Event {
// Signal Events
case event.SIGNAL_ANSWER: