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

fix control give for users.

Browse Source
This commit is contained in:
Miroslav Šedivý 2024-07-21 14:53:55 +02:00
parent c0e5804b3b
commit 667a54e9d9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/internal/api/room/handler.go
View File

@ -95,7 +95,7 @@ func (h *RoomHandler) Route(r types.Router) {
r.Post("/release", h.controlRelease) r.Post("/release", h.controlRelease)
r.With(auth.AdminsOnly).Post("/take", h.controlTake) r.With(auth.AdminsOnly).Post("/take", h.controlTake)
r.With(auth.AdminsOnly).Post("/give/{sessionId}", h.controlGive) r.With(auth.HostsOrAdminsOnly).Post("/give/{sessionId}", h.controlGive)
r.With(auth.AdminsOnly).Post("/reset", h.controlReset) r.With(auth.AdminsOnly).Post("/reset", h.controlReset)
}) })

1
server/internal/http/legacy/wstobackend.go
View File

@ -100,7 +100,6 @@ func (s *session) wsToBackend(msg []byte, sendMsg func([]byte) error) error {
return err return err
} }
// TODO: Not implemented for user - only for admins.
return s.apiReq(http.MethodPost, "/api/room/control/give/"+request.ID, nil, nil) return s.apiReq(http.MethodPost, "/api/room/control/give/"+request.ID, nil, nil)
case oldEvent.CONTROL_CLIPBOARD: case oldEvent.CONTROL_CLIPBOARD:

9
server/pkg/auth/auth.go
View File

@ -40,6 +40,15 @@ func HostsOnly(w http.ResponseWriter, r *http.Request) (context.Context, error)
return nil, nil return nil, nil
} }
func HostsOrAdminsOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) {
session, ok := GetSession(r)
if !ok || (!session.IsHost() && !session.Profile().IsAdmin) {
return nil, utils.HttpForbidden("session is not host or admin")
}
return nil, nil
}
func CanWatchOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) { func CanWatchOnly(w http.ResponseWriter, r *http.Request) (context.Context, error) {
session, ok := GetSession(r) session, ok := GetSession(r)
if !ok || !session.Profile().CanWatch { if !ok || !session.Profile().CanWatch {