From 441ab78c4ed197355dc26a92ec2957ac01275431 Mon Sep 17 00:00:00 2001
From: timedout <git@nexy7574.co.uk>
Date: Fri, 2 Oct 2026 21:19:49 +0100
Subject: [PATCH] feat: Notary server

---
 src/api/router.rs     |  1 +
 src/api/server/key.rs | 71 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/src/api/router.rs b/src/api/router.rs
index 5fbe21134..01f577d55 100644
--- a/src/api/router.rs
+++ b/src/api/router.rs
@@ -207,6 +207,7 @@ pub fn build(router: Router<State>, state: State) -> Router<State> {
 		router = router
 			.ruma_route(&server::get_server_version_route)
 			.route("/_matrix/key/v2/server", get(server::get_server_keys_route))
+			.ruma_route(&server::get_remote_server_keys_route)
 			.ruma_route(&server::get_public_rooms_route)
 			.ruma_route(&server::get_public_rooms_filtered_route)
 			.ruma_route(&server::send_transaction_message_route)
diff --git a/src/api/server/key.rs b/src/api/server/key.rs
index b547ea15c..fdecb2571 100644
--- a/src/api/server/key.rs
+++ b/src/api/server/key.rs
@@ -1,19 +1,27 @@
 use std::{collections::BTreeMap, mem::take, time::Duration};
 
 use axum::{Json, extract::State, response::IntoResponse};
-use conduwuit::{Result, utils::timepoint_from_now};
+use conduwuit::{
+	Err, Result,
+	utils::{stream::BroadbandExt, timepoint_from_now, to_canonical_object},
+};
 use futures::StreamExt;
 use ruma::{
 	MilliSecondsSinceUnixEpoch,
 	api::{
 		OutgoingResponseExt,
-		federation::discovery::{OldVerifyKey, ServerSigningKeys, get_server_keys},
+		federation::discovery::{
+			OldVerifyKey, ServerSigningKeys, get_remote_server_keys_batch, get_server_keys,
+		},
 	},
 	assign,
 	serde::Raw,
 };
+use serde_json::value::to_raw_value;
 use service::{server_keys, server_keys::in_one_week};
 
+use crate::router::Ruma;
+
 /// # `GET /_matrix/key/v2/server`
 ///
 /// Gets the public signing keys of this server.
@@ -87,3 +95,62 @@ fn valid_until_ts() -> MilliSecondsSinceUnixEpoch {
 	let timepoint = timepoint_from_now(dur).expect("SystemTime should not overflow");
 	MilliSecondsSinceUnixEpoch::from_system_time(timepoint).expect("UInt should not overflow")
 }
+
+pub(crate) async fn get_remote_server_keys_route(
+	State(services): State<crate::State>,
+	body: Ruma<get_remote_server_keys_batch::v2::Request>,
+) -> Result<get_remote_server_keys_batch::v2::Response> {
+	let total_queried_keys = body
+		.server_keys
+		.iter()
+		.fold(0_usize, |acc, _| acc.saturating_add(1));
+
+	if total_queried_keys > 16384 {
+		return Err!(Request(Forbidden("Too many keys requested")));
+	} else if total_queried_keys == 0 {
+		return Ok(get_remote_server_keys_batch::v2::Response::new(Vec::new()));
+	}
+
+	let mut response = Vec::with_capacity(total_queried_keys);
+
+	for (server_name, queries) in &body.server_keys {
+		if queries.is_empty() {
+			response.extend(
+				services
+					.server_keys
+					.signing_keys_for(server_name)
+					.broad_filter_map(|ssk| async move {
+						let mut canonical = to_canonical_object(&ssk).ok()?;
+						services.server_keys.sign_json(&mut canonical).ok()?;
+						to_raw_value(&canonical)
+							.map(Raw::<ServerSigningKeys>::from_json)
+							.ok()
+					})
+					.collect::<Vec<_>>()
+					.await,
+			);
+			continue;
+		}
+
+		for (key_id, criteria) in queries {
+			let minimum_valid_until_ts = criteria
+				.minimum_valid_until_ts
+				.unwrap_or_else(MilliSecondsSinceUnixEpoch::now);
+			let Some(ssk) = services
+				.server_keys
+				.get_signing_key(server_name, key_id)
+				.await
+			else {
+				continue;
+			};
+			if ssk.valid_until_ts < minimum_valid_until_ts || ssk.valid_until_ts > in_one_week() {
+				continue;
+			}
+			let mut canonical = to_canonical_object(&ssk)?;
+			services.server_keys.sign_json(&mut canonical)?;
+			response.push(to_raw_value(&canonical).map(Raw::<ServerSigningKeys>::from_json)?);
+		}
+	}
+
+	Ok(get_remote_server_keys_batch::v2::Response::new(response))
+}