From 6920814da9867a74fa1b87fb4776c2587fe3bd54 Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Sun, 20 Apr 2025 02:31:58 +0100
Subject: [PATCH 1/3] Support fi.mau.room_id, and fully qualified room_id in
 /createRoom

---
 Cargo.lock                    | 22 +++++++++++-----------
 Cargo.toml                    |  2 +-
 src/api/client/room/create.rs | 25 +++++++++++--------------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00aeca81..cf3ac6db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3652,7 +3652,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.10.1"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "assign",
  "js_int",
@@ -3672,7 +3672,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.10.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3684,7 +3684,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.18.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "as_variant",
  "assign",
@@ -3707,7 +3707,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.13.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "as_variant",
  "base64 0.22.1",
@@ -3739,7 +3739,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.28.1"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "as_variant",
  "indexmap 2.8.0",
@@ -3764,7 +3764,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "bytes",
  "headers",
@@ -3786,7 +3786,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.5"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "js_int",
  "thiserror 2.0.12",
@@ -3795,7 +3795,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3805,7 +3805,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.13.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "cfg-if",
  "proc-macro-crate",
@@ -3820,7 +3820,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3832,7 +3832,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.15.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=fa3c868e5a1c049dc9472310dc4955289a96bb35#fa3c868e5a1c049dc9472310dc4955289a96bb35"
 dependencies = [
  "base64 0.22.1",
  "ed25519-dalek",
diff --git a/Cargo.toml b/Cargo.toml
index e9ae0007..1ad11256 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -350,7 +350,7 @@ version = "0.1.2"
 [workspace.dependencies.ruma]
 git = "https://forgejo.ellis.link/continuwuation/ruwuma"
 #branch = "conduwuit-changes"
-rev = "920148dca1076454ca0ca5d43b5ce1aa708381d4"
+rev = "fa3c868e5a1c049dc9472310dc4955289a96bb35"
 features = [
     "compat",
     "rand",
diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs
index 4ce53f15..bba5939e 100644
--- a/src/api/client/room/create.rs
+++ b/src/api/client/room/create.rs
@@ -606,23 +606,20 @@ fn custom_room_id_check(services: &Services, custom_room_id: &str) -> Result<Own
 		return Err(Error::BadRequest(ErrorKind::Unknown, "Custom room ID is forbidden."));
 	}
 
+	let server_name = services.globals.server_name();
+	let mut room_id = custom_room_id.to_owned();
 	if custom_room_id.contains(':') {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Custom room ID contained `:` which is not allowed. Please note that this expects a \
-			 localpart, not the full room ID.",
-		));
-	} else if custom_room_id.contains(char::is_whitespace) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Custom room ID contained spaces which is not valid.",
-		));
+		if !custom_room_id.starts_with('!') {
+			return Err(Error::BadRequest(
+				ErrorKind::InvalidParam,
+				"Custom room ID contains an unexpected `:` which is not allowed.",
+			));
+		}
+	} else {
+		room_id = format!("!{custom_room_id}:{server_name}");
 	}
 
-	let server_name = services.globals.server_name();
-	let full_room_id = format!("!{custom_room_id}:{server_name}");
-
-	OwnedRoomId::parse(full_room_id)
+	OwnedRoomId::parse(room_id)
 		.map_err(Into::into)
 		.inspect(|full_room_id| debug_info!(?full_room_id, "Full custom room ID"))
 		.inspect_err(|e| warn!(?e, ?custom_room_id, "Failed to create room with custom room ID",))

From d3022b41121afeabd22a5af478f80fb1eb5b2a4e Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Sun, 20 Apr 2025 02:46:16 +0100
Subject: [PATCH 2/3] Prevent creating custom room IDs belonging to other
 servers

---
 src/api/client/room/create.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs
index bba5939e..2bc6033c 100644
--- a/src/api/client/room/create.rs
+++ b/src/api/client/room/create.rs
@@ -621,6 +621,11 @@ fn custom_room_id_check(services: &Services, custom_room_id: &str) -> Result<Own
 
 	OwnedRoomId::parse(room_id)
 		.map_err(Into::into)
-		.inspect(|full_room_id| debug_info!(?full_room_id, "Full custom room ID"))
+		.inspect(|full_room_id| {
+			debug_info!(?full_room_id, "Full custom room ID");
+			if full_room_id.server_name().expect("failed to extract server name from room ID") != server_name {
+				error!("Custom room ID does not match server name");
+			}
+		})
 		.inspect_err(|e| warn!(?e, ?custom_room_id, "Failed to create room with custom room ID",))
 }

From 41581c9ae831428428501b9f8adc7df826100f68 Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Sun, 20 Apr 2025 15:41:19 +0100
Subject: [PATCH 3/3] Fix invalid room ID check & prevent room IDs being
 prefixed with !

---
 src/api/client/room/create.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs
index 2bc6033c..f5f61784 100644
--- a/src/api/client/room/create.rs
+++ b/src/api/client/room/create.rs
@@ -107,7 +107,6 @@ pub(crate) async fn create_room_route(
 
 		return Err!(Request(Forbidden("Publishing rooms to the room directory is not allowed")));
 	}
-
 	let _short_id = services
 		.rooms
 		.short
@@ -615,17 +614,26 @@ fn custom_room_id_check(services: &Services, custom_room_id: &str) -> Result<Own
 				"Custom room ID contains an unexpected `:` which is not allowed.",
 			));
 		}
+	} else if custom_room_id.starts_with('!'){
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam, 
+			"Room ID is prefixed with !, but is not fully qualified. You likely did not want this."));
 	} else {
 		room_id = format!("!{custom_room_id}:{server_name}");
 	}
-
 	OwnedRoomId::parse(room_id)
 		.map_err(Into::into)
+		.and_then(
+			|full_room_id| {
+				if full_room_id.server_name().expect("failed to extract server name from room ID") != server_name {
+					Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID must be on this server."))
+				} else {
+					Ok(full_room_id)
+				}
+			}
+		)
 		.inspect(|full_room_id| {
 			debug_info!(?full_room_id, "Full custom room ID");
-			if full_room_id.server_name().expect("failed to extract server name from room ID") != server_name {
-				error!("Custom room ID does not match server name");
-			}
 		})
 		.inspect_err(|e| warn!(?e, ?custom_room_id, "Failed to create room with custom room ID",))
 }