fix: don't allow unjoined users to send typing notifications

src/client_server/typing.rs

@@ -1,5 +1,5 @@
-use crate::{database::DatabaseGuard, utils, Result, Ruma};
+use crate::{database::DatabaseGuard, Error, utils, Result, Ruma};
-use ruma::api::client::typing::create_typing_event;
+use ruma::api::client::{typing::create_typing_event, error::ErrorKind};
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
 ///
@@ -12,6 +12,13 @@ pub async fn create_typing_event_route(
 
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
+    if !db.rooms.is_joined(sender_user, &body.room_id)? {
+        return Err(Error::BadRequest(
+            ErrorKind::Forbidden,
+            "You are not in this room.",
+        ));
+    }
+
     if let Typing::Yes(duration) = body.state {
         db.rooms.edus.typing_add(
             sender_user,

src/server_server.rs

@@ -770,17 +770,21 @@ pub async fn send_transaction_message_route(
                 }
             }
             Edu::Typing(typing) => {
-                if typing.typing {
+                if db.rooms.is_joined(&typing.user_id, &typing.room_id)? {
-                    db.rooms.edus.typing_add(
+                    if typing.typing {
-                        &typing.user_id,
+                        db.rooms.edus.typing_add(
-                        &typing.room_id,
+                            &typing.user_id,
-                        3000 + utils::millis_since_unix_epoch(),
+                            &typing.room_id,
-                        &db.globals,
+                            3000 + utils::millis_since_unix_epoch(),
-                    )?;
+                            &db.globals,
-                } else {
+                        )?;
-                    db.rooms
+                    } else {
-                        .edus
+                        db.rooms.edus.typing_remove(
-                        .typing_remove(&typing.user_id, &typing.room_id, &db.globals)?;
+                            &typing.user_id,
+                            &typing.room_id,
+                            &db.globals,
+                        )?;
+                    }
                 }
             }
             Edu::DeviceListUpdate(DeviceListUpdateContent { user_id, .. }) => {