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

should resolve #46

Browse source
This commit is contained in:
Craig 2020-04-05 03:49:43 +00:00
parent 19466b5625
commit 362cf6c254
8 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,7 @@ func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) erro
return err
}
id, admin, err := ws.authenticate(r)
id, ip, admin, err := ws.authenticate(r)
if err != nil {
ws.logger.Warn().Err(err).Msg("authentication failed")
@ -143,6 +143,7 @@ func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) erro
socket := &WebSocket{
id: id,
ws: ws,
address: ip,
connection: connection,
}
@ -187,26 +188,28 @@ func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) erro
return nil
}
func (ws *WebSocketHandler) authenticate(r *http.Request) (string, bool, error) {
func (ws *WebSocketHandler) authenticate(r *http.Request) (string, string, bool, error) {
ip := utils.ReadUserIP(r)
id, err := utils.NewUID(32)
if err != nil {
return "", false, err
return "", ip, false, err
}
passwords, ok := r.URL.Query()["password"]
if !ok || len(passwords[0]) < 1 {
return "", false, fmt.Errorf("no password provided")
return "", ip, false, fmt.Errorf("no password provided")
}
if passwords[0] == ws.conf.AdminPassword {
return id, true, nil
return id, ip, true, nil
}
if passwords[0] == ws.conf.Password {
return id, false, nil
return id, ip, false, nil
}
return "", false, fmt.Errorf("invalid password: %s", passwords[0])
return "", ip, false, fmt.Errorf("invalid password: %s", passwords[0])
}
func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) {