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

remove unused ban endpoint.

Browse Source
This commit is contained in:
Miroslav Šedivý
2020-11-16 22:21:21 +01:00
parent d87a10b23a
commit 570efbf3a6
8 changed files with 0 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
internal/websocket/handler/admin.go
View File

@ -1,8 +1,6 @@
package handler
import (
"strings"
"demodesk/neko/internal/types"
"demodesk/neko/internal/types/event"
"demodesk/neko/internal/types/message"
@ -148,48 +146,3 @@ func (h *MessageHandlerCtx) adminKick(session types.Session, payload *message.Ad
ID: session.ID(),
}, []string{payload.ID})
}
func (h *MessageHandlerCtx) adminBan(session types.Session, payload *message.Admin) error {
if !session.Admin() {
h.logger.Debug().Msg("user not admin")
return nil
}
target, ok := h.sessions.Get(payload.ID)
if !ok {
h.logger.Debug().Str("id", payload.ID).Msg("can't find target session")
return nil
}
if target.Admin() {
h.logger.Debug().Msg("target is an admin, baling")
return nil
}
remote := target.Address()
if remote == "" {
h.logger.Debug().Msg("no remote address, baling")
return nil
}
address := strings.SplitN(remote, ":", -1)
if len(address[0]) < 1 {
h.logger.Debug().Str("address", remote).Msg("no remote address, baling")
return nil
}
h.logger.Debug().Str("address", remote).Msg("adding address to banned")
h.banned[address[0]] = true
if err := target.Disconnect("banned"); err != nil {
return err
}
return h.sessions.Broadcast(
message.AdminTarget{
Event: event.ADMIN_BAN,
Target: target.ID(),
ID: session.ID(),
}, []string{payload.ID})
}

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

@ -27,7 +27,6 @@ func New(
desktop: desktop,
capture: capture,
webrtc: webrtc,
banned: make(map[string]bool),
locked: false,
}
}
@ -38,22 +37,10 @@ type MessageHandlerCtx struct {
webrtc types.WebRTCManager
desktop types.DesktopManager
capture types.CaptureManager
banned map[string]bool
locked bool
}
func (h *MessageHandlerCtx) Connected(session types.Session, socket types.WebSocket) (bool, string) {
address := socket.Address()
if address != "" {
ok, banned := h.banned[address]
if ok && banned {
h.logger.Debug().Str("address", address).Msg("banned")
return false, "banned"
}
} else {
h.logger.Debug().Msg("no remote address")
}
if h.locked && !session.Admin(){
h.logger.Debug().Msg("server locked")
return false, "locked"
@ -141,11 +128,6 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error {
err = utils.Unmarshal(payload, raw, func() error {
return h.adminGive(session, payload)
})
case event.ADMIN_BAN:
payload := &message.Admin{}
err = utils.Unmarshal(payload, raw, func() error {
return h.adminBan(session, payload)
})
case event.ADMIN_KICK:
payload := &message.Admin{}
err = utils.Unmarshal(payload, raw, func() error {