Add handle id validation (#233)

foxford · Apr 22, 2021 · 2607305 · 2607305
1 parent 46eeecb
commit 2607305
Show file tree

Hide file tree

Showing 17 changed files with 1,152 additions and 370 deletions.
diff --git a/docs/src/api/errors.md b/docs/src/api/errors.md
@@ -26,6 +26,7 @@ One must rely on the `type` field of the error for error identification, not the
 The following types are a part of the service's API and are guaranteed to maintain compatibility.
 
 - `access_denied` – The action was forbidden by [authorization](authz.md#Authorization).
+- `agent_not_connected` – The agent has not connected to the RTC.
 - `agent_not_entered_the_room` – The agent must preliminary make [room.enter](room/enter.md#room.enter) request.
 - `authorization_failed` – Authorization request failed due to a network error or another reason.
 - `backend_recording_missing` – The backend responded that it doesn't have the recording for the RTC.
@@ -36,6 +37,7 @@ The following types are a part of the service's API and are guaranteed to mainta
 - `config_key_missing` – The service couldn't perform an operation due to misconfiguration.
 - `database_connection_acquisition_failed` – The service couldn't obtain a DB connection from the pool.
 - `database_query_failed` – The database returned an error while executing a query.
+- `invalid_handle_id` – Specified `handle_id` has corrupted or expired information.
 - `invalid_jsep_format` – Failed to determine whether the SDP is recvonly.
 - `invalid_sdp_type` – Failed to parse SDP type or an SDP answer is received.
 - `invalid_subscription_object` – An object for dynamic subscription is not of format `["rooms", UUID, "events"]`.

diff --git a/src/app/endpoint/agent.rs b/src/app/endpoint/agent.rs
@@ -31,8 +31,16 @@ impl RequestHandler for ListHandler {
         payload: Self::Payload,
         reqp: &IncomingRequestProperties,
     ) -> Result {
-        let room =
-            helpers::find_room_by_id(context, payload.room_id, helpers::RoomTimeRequirement::Open)?;
+        let room = {
+            let conn = context.get_conn()?;
+
+            helpers::find_room_by_id(
+                context,
+                payload.room_id,
+                helpers::RoomTimeRequirement::Open,
+                &conn,
+            )?
+        };
 
         // Authorize agents listing in the room.
         let room_id = room.id().to_string();

diff --git a/src/app/endpoint/agent_reader_config.rs b/src/app/endpoint/agent_reader_config.rs
@@ -91,8 +91,14 @@ impl RequestHandler for UpdateHandler {
                 .error(AppErrorKind::InvalidPayload)?;
         }
 
-        let room =
-            helpers::find_room_by_id(context, payload.room_id, helpers::RoomTimeRequirement::Open)?;
+        let conn = context.get_conn()?;
+
+        let room = helpers::find_room_by_id(
+            context,
+            payload.room_id,
+            helpers::RoomTimeRequirement::Open,
+            &conn,
+        )?;
 
         if room.rtc_sharing_policy() != db::rtc::SharingPolicy::Owned {
             return Err(anyhow!(
@@ -101,7 +107,6 @@ impl RequestHandler for UpdateHandler {
             .error(AppErrorKind::InvalidPayload)?;
         }
 
-        let conn = context.get_conn()?;
         helpers::check_room_presence(&room, reqp.as_agent_id(), &conn)?;
 
         let rtc_reader_configs_with_rtcs = conn.transaction::<_, AppError, _>(|| {
@@ -206,8 +211,14 @@ impl RequestHandler for ReadHandler {
         payload: Self::Payload,
         reqp: &IncomingRequestProperties,
     ) -> Result {
-        let room =
-            helpers::find_room_by_id(context, payload.room_id, helpers::RoomTimeRequirement::Open)?;
+        let conn = context.get_conn()?;
+
+        let room = helpers::find_room_by_id(
+            context,
+            payload.room_id,
+            helpers::RoomTimeRequirement::Open,
+            &conn,
+        )?;
 
         if room.rtc_sharing_policy() != db::rtc::SharingPolicy::Owned {
             return Err(anyhow!(
@@ -216,7 +227,6 @@ impl RequestHandler for ReadHandler {
             .error(AppErrorKind::InvalidPayload)?;
         }
 
-        let conn = context.get_conn()?;
         helpers::check_room_presence(&room, reqp.as_agent_id(), &conn)?;
 
         let rtc_reader_configs_with_rtcs =

diff --git a/src/app/endpoint/agent_writer_config.rs b/src/app/endpoint/agent_writer_config.rs
@@ -106,20 +106,26 @@ impl RequestHandler for UpdateHandler {
                 .error(AppErrorKind::InvalidPayload)?;
         }
 
-        let room =
-            helpers::find_room_by_id(context, payload.room_id, helpers::RoomTimeRequirement::Open)?;
+        let room = {
+            let conn = context.get_conn()?;
 
-        if room.rtc_sharing_policy() != db::rtc::SharingPolicy::Owned {
-            return Err(anyhow!(
-                "Agent writer config is available only for rooms with owned RTC sharing policy"
-            ))
-            .error(AppErrorKind::InvalidPayload)?;
-        }
+            let room = helpers::find_room_by_id(
+                context,
+                payload.room_id,
+                helpers::RoomTimeRequirement::Open,
+                &conn,
+            )?;
+
+            if room.rtc_sharing_policy() != db::rtc::SharingPolicy::Owned {
+                return Err(anyhow!(
+                    "Agent writer config is available only for rooms with owned RTC sharing policy"
+                ))
+                .error(AppErrorKind::InvalidPayload)?;
+            }
 
-        {
-            let conn = context.get_conn()?;
             helpers::check_room_presence(&room, reqp.as_agent_id(), &conn)?;
-        }
+            room
+        };
 
         // Authorize agent writer config updating on the tenant.
         let room_id = room.id().to_string();
@@ -248,8 +254,14 @@ impl RequestHandler for ReadHandler {
         payload: Self::Payload,
         reqp: &IncomingRequestProperties,
     ) -> Result {
-        let room =
-            helpers::find_room_by_id(context, payload.room_id, helpers::RoomTimeRequirement::Open)?;
+        let conn = context.get_conn()?;
+
+        let room = helpers::find_room_by_id(
+            context,
+            payload.room_id,
+            helpers::RoomTimeRequirement::Open,
+            &conn,
+        )?;
 
         if room.rtc_sharing_policy() != db::rtc::SharingPolicy::Owned {
             return Err(anyhow!(
@@ -258,7 +270,6 @@ impl RequestHandler for ReadHandler {
             .error(AppErrorKind::InvalidPayload)?;
         }
 
-        let conn = context.get_conn()?;
         helpers::check_room_presence(&room, reqp.as_agent_id(), &conn)?;
 
         let rtc_writer_configs_with_rtcs =

diff --git a/src/app/endpoint/helpers.rs b/src/app/endpoint/helpers.rs
@@ -64,33 +64,34 @@ pub(crate) fn find_room_by_id<C: Context>(
     context: &mut C,
     id: Uuid,
     opening_requirement: RoomTimeRequirement,
+    conn: &PgConnection,
 ) -> Result<db::room::Object, AppError> {
     context.add_logger_tags(o!("room_id" => id.to_string()));
     let query = db::room::FindQuery::new(id);
-    find_room(context, query, opening_requirement)
+    find_room(context, query, opening_requirement, conn)
 }
 
 pub(crate) fn find_room_by_rtc_id<C: Context>(
     context: &mut C,
     rtc_id: Uuid,
     opening_requirement: RoomTimeRequirement,
+    conn: &PgConnection,
 ) -> Result<db::room::Object, AppError> {
     context.add_logger_tags(o!("rtc_id" => rtc_id.to_string()));
     let query = db::room::FindByRtcIdQuery::new(rtc_id);
-    find_room(context, query, opening_requirement)
+    find_room(context, query, opening_requirement, conn)
 }
 
 fn find_room<C, Q>(
     context: &mut C,
     query: Q,
     opening_requirement: RoomTimeRequirement,
+    conn: &PgConnection,
 ) -> Result<Room, AppError>
 where
     C: Context,
     Q: db::room::FindQueryable,
 {
-    let conn = context.get_conn()?;
-
     let room = query
         .execute(&conn)?
         .ok_or_else(|| anyhow!("Room not found"))
@@ -157,14 +158,6 @@ where
     }
 }
 
-pub(crate) fn add_room_logger_tags<C: Context>(context: &mut C, room: &db::room::Object) {
-    context.add_logger_tags(o!("room_id" => room.id().to_string()));
-
-    if let Some(scope) = room.tags().get("scope") {
-        context.add_logger_tags(o!("scope" => scope.to_string()));
-    }
-}
-
 pub(crate) fn check_room_presence(
     room: &db::room::Object,
     agent_id: &AgentId,
@@ -181,3 +174,11 @@ pub(crate) fn check_room_presence(
         Ok(())
     }
 }
+
+pub(crate) fn add_room_logger_tags<C: Context>(context: &mut C, room: &db::room::Object) {
+    context.add_logger_tags(o!("room_id" => room.id().to_string()));
+
+    if let Some(scope) = room.tags().get("scope") {
+        context.add_logger_tags(o!("scope" => scope.to_string()));
+    }
+}
diff --git a/src/app/endpoint/message.rs b/src/app/endpoint/message.rs
@@ -47,13 +47,15 @@ impl RequestHandler for UnicastHandler {
         reqp: &IncomingRequestProperties,
     ) -> Result {
         {
+            let conn = context.get_conn()?;
+
             let room = helpers::find_room_by_id(
                 context,
                 payload.room_id,
                 helpers::RoomTimeRequirement::Open,
+                &conn,
             )?;
 
-            let conn = context.get_conn()?;
             helpers::check_room_presence(&room, reqp.as_agent_id(), &conn)?;
             helpers::check_room_presence(&room, &payload.agent_id, &conn)?;
         }
@@ -111,13 +113,15 @@ impl RequestHandler for BroadcastHandler {
         reqp: &IncomingRequestProperties,
     ) -> Result {
         let room = {
+            let conn = context.get_conn()?;
+
             let room = helpers::find_room_by_id(
                 context,
                 payload.room_id,
                 helpers::RoomTimeRequirement::Open,
+                &conn,
             )?;
 
-            let conn = context.get_conn()?;
             helpers::check_room_presence(&room, &reqp.as_agent_id(), &conn)?;
             room
         };

diff --git a/src/app/endpoint/room.rs b/src/app/endpoint/room.rs
@@ -142,8 +142,16 @@ impl RequestHandler for ReadHandler {
         payload: Self::Payload,
         reqp: &IncomingRequestProperties,
     ) -> Result {
-        let room =
-            helpers::find_room_by_id(context, payload.id, helpers::RoomTimeRequirement::Any)?;
+        let room = {
+            let conn = context.get_conn()?;
+
+            helpers::find_room_by_id(
+                context,
+                payload.id,
+                helpers::RoomTimeRequirement::Any,
+                &conn,
+            )?
+        };
 
         // Authorize room reading on the tenant.
         let room_id = room.id().to_string();
@@ -189,11 +197,16 @@ impl RequestHandler for UpdateHandler {
         payload: Self::Payload,
         reqp: &IncomingRequestProperties,
     ) -> Result {
-        let room = helpers::find_room_by_id(
-            context,
-            payload.id,
-            helpers::RoomTimeRequirement::NotClosedOrUnboundedOpen,
-        )?;
+        let room = {
+            let conn = context.get_conn()?;
+
+            helpers::find_room_by_id(
+                context,
+                payload.id,
+                helpers::RoomTimeRequirement::NotClosedOrUnboundedOpen,
+                &conn,
+            )?
+        };
 
         // Authorize room updating on the tenant.
         let room_id = room.id().to_string();
@@ -314,8 +327,16 @@ impl RequestHandler for EnterHandler {
         payload: Self::Payload,
         reqp: &IncomingRequestProperties,
     ) -> Result {
-        let room =
-            helpers::find_room_by_id(context, payload.id, helpers::RoomTimeRequirement::NotClosed)?;
+        let room = {
+            let conn = context.get_conn()?;
+
+            helpers::find_room_by_id(
+                context,
+                payload.id,
+                helpers::RoomTimeRequirement::NotClosed,
+                &conn,
+            )?
+        };
 
         // Authorize subscribing to the room's events.
         let room_id = room.id().to_string();
@@ -381,11 +402,15 @@ impl RequestHandler for LeaveHandler {
         reqp: &IncomingRequestProperties,
     ) -> Result {
         let (room, presence) = {
-            let room =
-                helpers::find_room_by_id(context, payload.id, helpers::RoomTimeRequirement::Any)?;
-
             let conn = context.get_conn()?;
 
+            let room = helpers::find_room_by_id(
+                context,
+                payload.id,
+                helpers::RoomTimeRequirement::Any,
+                &conn,
+            )?;
+
             // Check room presence.
             let presence = db::agent::ListQuery::new()
                 .room_id(room.id())