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

+ CanHost.

Browse Source
This commit is contained in:
Miroslav Šedivý 2020-12-06 18:50:41 +01:00
parent 92aa717a8d
commit 5edd9dc97a
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/api/room/control.go
View File

@ -41,6 +41,11 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) {
} }
session := auth.GetSession(r) session := auth.GetSession(r)
if !session.CanHost() {
utils.HttpBadRequest(w, "Member is not allowed to host.")
return
}
h.sessions.SetHost(session) h.sessions.SetHost(session)
h.sessions.Broadcast( h.sessions.Broadcast(
@ -56,7 +61,12 @@ func (h *RoomHandler) controlRequest(w http.ResponseWriter, r *http.Request) {
func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) {
session := auth.GetSession(r) session := auth.GetSession(r)
if !session.IsHost() { if !session.IsHost() {
utils.HttpUnprocessableEntity(w, "User is not the host.") utils.HttpUnprocessableEntity(w, "Member is not the host.")
return
}
if !session.CanHost() {
utils.HttpBadRequest(w, "Member is not allowed to host.")
return return
} }
@ -74,6 +84,10 @@ func (h *RoomHandler) controlRelease(w http.ResponseWriter, r *http.Request) {
func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) { func (h *RoomHandler) controlTake(w http.ResponseWriter, r *http.Request) {
session := auth.GetSession(r) session := auth.GetSession(r)
if !session.CanHost() {
utils.HttpBadRequest(w, "Member is not allowed to host.")
return
}
h.sessions.SetHost(session) h.sessions.SetHost(session)
@ -95,7 +109,12 @@ func (h *RoomHandler) controlGive(w http.ResponseWriter, r *http.Request) {
target, ok := h.sessions.Get(data.ID) target, ok := h.sessions.Get(data.ID)
if !ok { if !ok {
utils.HttpBadRequest(w, "Target user was not found.") utils.HttpBadRequest(w, "Target member was not found.")
return
}
if !target.CanHost() {
utils.HttpBadRequest(w, "Target member is not allowed to host.")
return return
} }

2
internal/session/manager.go
View File

@ -68,7 +68,7 @@ func (manager *SessionManagerCtx) Connect() error {
_ = manager.add(id, profile) _ = manager.add(id, profile)
} }
// TODO: Move to Database, or make `admin` as reserved user. // TODO: Move to Database, or make `admin` as reserved ID.
// create default admin account at startup // create default admin account at startup
_ = manager.add("admin", types.MemberProfile{ _ = manager.add("admin", types.MemberProfile{

10
internal/websocket/handler/control.go
View File

@ -7,6 +7,11 @@ import (
) )
func (h *MessageHandlerCtx) controlRelease(session types.Session) error { func (h *MessageHandlerCtx) controlRelease(session types.Session) error {
if !session.CanHost() {
h.logger.Debug().Str("id", session.ID()).Msg("is not allowed to host")
return nil
}
if !session.IsHost() { if !session.IsHost() {
h.logger.Debug().Str("id", session.ID()).Msg("is not the host") h.logger.Debug().Str("id", session.ID()).Msg("is not the host")
return nil return nil
@ -25,6 +30,11 @@ func (h *MessageHandlerCtx) controlRelease(session types.Session) error {
} }
func (h *MessageHandlerCtx) controlRequest(session types.Session) error { func (h *MessageHandlerCtx) controlRequest(session types.Session) error {
if !session.CanHost() {
h.logger.Debug().Str("id", session.ID()).Msg("is not allowed to host")
return nil
}
if session.IsHost() { if session.IsHost() {
h.logger.Debug().Str("id", session.ID()).Msg("is already the host") h.logger.Debug().Str("id", session.ID()).Msg("is already the host")
return nil return nil