From 42a7d522724691d1796d3aa9f04da45efb589b02 Mon Sep 17 00:00:00 2001
From: David Zhao <dz@livekit.io>
Date: Sat, 8 Jul 2023 22:30:49 -0700
Subject: [PATCH] Return 404 with DeleteRoom/RemoveParticipant when deleting
 non-existent resources (#1860)

Fixes #1587
---
 pkg/service/roomservice.go      | 10 ++++++++++
 pkg/service/roomservice_test.go |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkg/service/roomservice.go b/pkg/service/roomservice.go
index 31b368cf0..e3859d4b3 100644
--- a/pkg/service/roomservice.go
+++ b/pkg/service/roomservice.go
@@ -127,6 +127,11 @@ func (s *RoomService) DeleteRoom(ctx context.Context, req *livekit.DeleteRoomReq
 	if err := EnsureCreatePermission(ctx); err != nil {
 		return nil, twirpAuthError(err)
 	}
+
+	if _, _, err := s.roomStore.LoadRoom(ctx, livekit.RoomName(req.Room), false); err == ErrRoomNotFound {
+		return nil, twirp.NotFoundError("room not found")
+	}
+
 	err := s.router.WriteRoomRTC(ctx, livekit.RoomName(req.Room), &livekit.RTCNodeMessage{
 		Message: &livekit.RTCNodeMessage_DeleteRoom{
 			DeleteRoom: req,
@@ -187,6 +192,11 @@ func (s *RoomService) GetParticipant(ctx context.Context, req *livekit.RoomParti
 
 func (s *RoomService) RemoveParticipant(ctx context.Context, req *livekit.RoomParticipantIdentity) (*livekit.RemoveParticipantResponse, error) {
 	AppendLogFields(ctx, "room", req.Room, "participant", req.Identity)
+
+	if _, err := s.roomStore.LoadParticipant(ctx, livekit.RoomName(req.Room), livekit.ParticipantIdentity(req.Identity)); err == ErrParticipantNotFound {
+		return nil, twirp.NotFoundError("participant not found")
+	}
+
 	err := s.writeParticipantMessage(ctx, livekit.RoomName(req.Room), livekit.ParticipantIdentity(req.Identity), &livekit.RTCNodeMessage{
 		Message: &livekit.RTCNodeMessage_RemoveParticipant{
 			RemoveParticipant: req,
diff --git a/pkg/service/roomservice_test.go b/pkg/service/roomservice_test.go
index 744e18442..a8706bd64 100644
--- a/pkg/service/roomservice_test.go
+++ b/pkg/service/roomservice_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestDeleteRoom(t *testing.T) {
-	t.Run("normal deletion", func(t *testing.T) {
+	t.Run("delete non-existent", func(t *testing.T) {
 		svc := newTestRoomService(config.RoomConfig{})
 		grant := &auth.ClaimGrants{
 			Video: &auth.VideoGrant{
@@ -29,7 +29,12 @@ func TestDeleteRoom(t *testing.T) {
 		_, err := svc.DeleteRoom(ctx, &livekit.DeleteRoomRequest{
 			Room: "testroom",
 		})
-		require.NoError(t, err)
+		require.Error(t, err)
+		if terr, ok := err.(twirp.Error); ok {
+			require.Equal(t, twirp.NotFound, terr.Code())
+		} else {
+			require.Fail(t, "should be twirp error")
+		}
 	})
 
 	t.Run("missing permissions", func(t *testing.T) {