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

refactor WS authentication.

Browse Source
This commit is contained in:
Miroslav Šedivý
2020-11-01 20:23:09 +01:00
parent 16d762b6ae
commit 311ed987d8
5 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/websocket/manager.go
View File

@ -127,14 +127,14 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e
return err
}
id, ip, admin, err := ws.sessions.Authenticate(r)
session, err := ws.sessions.Authenticate(r)
if err != nil {
ws.logger.Warn().Err(err).Msg("authentication failed")
// TODO: Refactor
if err = connection.WriteJSON(message.Disconnect{
Event: event.SYSTEM_DISCONNECT,
Message: "invalid_password",
Message: "authentication failed",
}); err != nil {
ws.logger.Error().Err(err).Msg("failed to send disconnect")
}
@ -142,14 +142,20 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e
return connection.Close()
}
// TODO: Refactor.
ip := r.RemoteAddr
// if allow poxy {
// ip = utils.ReadUserIP(r)
// }
socket := &WebSocketCtx{
id: id,
id: session.ID(),
ws: ws,
address: ip,
connection: connection,
}
ok, reason := ws.handler.Connected(id, socket)
ok, reason := ws.handler.Connected(session.ID(), socket)
if !ok {
// TODO: Refactor
if err = connection.WriteJSON(message.Disconnect{
@ -162,23 +168,23 @@ func (ws *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Request) e
return connection.Close()
}
ws.sessions.New(id, admin, socket)
session.SetSocket(socket)
ws.logger.
Debug().
Str("session", id).
Str("session", session.ID()).
Str("address", connection.RemoteAddr().String()).
Msg("new connection created")
defer func() {
ws.logger.
Debug().
Str("session", id).
Str("session", session.ID()).
Str("address", connection.RemoteAddr().String()).
Msg("session ended")
}()
ws.handle(connection, id)
ws.handle(connection, session.ID())
return nil
}