From 3ac2a35c23a6580b56a3b058b51f5015c7f2de4e Mon Sep 17 00:00:00 2001
From: David Colburn <xero73@gmail.com>
Date: Thu, 23 Feb 2023 11:30:59 -0800
Subject: [PATCH] check nil video grants (#1463)

---
 pkg/service/auth.go | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkg/service/auth.go b/pkg/service/auth.go
index a5f97da9a..c83cfbb1a 100644
--- a/pkg/service/auth.go
+++ b/pkg/service/auth.go
@@ -131,31 +131,23 @@ func EnsureAdminPermission(ctx context.Context, room livekit.RoomName) error {
 
 func EnsureCreatePermission(ctx context.Context) error {
 	claims := GetGrants(ctx)
-	if claims == nil {
+	if claims == nil || claims.Video == nil || !claims.Video.RoomCreate {
 		return ErrPermissionDenied
 	}
-
-	if claims.Video.RoomCreate {
-		return nil
-	}
-	return ErrPermissionDenied
+	return nil
 }
 
 func EnsureListPermission(ctx context.Context) error {
 	claims := GetGrants(ctx)
-	if claims == nil {
+	if claims == nil || claims.Video == nil || !claims.Video.RoomList {
 		return ErrPermissionDenied
 	}
-
-	if claims.Video.RoomList {
-		return nil
-	}
-	return ErrPermissionDenied
+	return nil
 }
 
 func EnsureRecordPermission(ctx context.Context) error {
 	claims := GetGrants(ctx)
-	if claims == nil || !claims.Video.RoomRecord {
+	if claims == nil || claims.Video == nil || !claims.Video.RoomRecord {
 		return ErrPermissionDenied
 	}
 	return nil
@@ -163,7 +155,7 @@ func EnsureRecordPermission(ctx context.Context) error {
 
 func EnsureIngressAdminPermission(ctx context.Context) error {
 	claims := GetGrants(ctx)
-	if claims == nil || !claims.Video.IngressAdmin {
+	if claims == nil || claims.Video == nil || !claims.Video.IngressAdmin {
 		return ErrPermissionDenied
 	}
 	return nil