git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-07 23:26:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dont answer the admin room ID over /_matrix/federation/v1/query/directory

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-10-05 14:36:09 -04:00 • committed by Jason Volk
parent a05b4c355a
commit 127fb1a37b
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/api/server/query.rs
View file

@ -1,7 +1,8 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use axum::extract::State; use axum::extract::State;
use conduit::{err, Error, Result}; use axum_client_ip::InsecureClientIp;
use conduit::{err, info, Err, Error, Result};
use futures::StreamExt; use futures::StreamExt;
use get_profile_information::v1::ProfileField; use get_profile_information::v1::ProfileField;
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
@ -18,8 +19,10 @@ use crate::Ruma;
/// # `GET /_matrix/federation/v1/query/directory` /// # `GET /_matrix/federation/v1/query/directory`
/// ///
/// Resolve a room alias to a room id. /// Resolve a room alias to a room id.
#[tracing::instrument(skip_all, fields(%client), name = "query_room_info")]
pub(crate) async fn get_room_information_route( pub(crate) async fn get_room_information_route(
State(services): State<crate::State>, body: Ruma<get_room_information::v1::Request>, State(services): State<crate::State>, InsecureClientIp(client): InsecureClientIp,
body: Ruma<get_room_information::v1::Request>,
) -> Result<get_room_information::v1::Response> { ) -> Result<get_room_information::v1::Response> {
let room_id = services let room_id = services
.rooms .rooms
@ -28,6 +31,17 @@ pub(crate) async fn get_room_information_route(
.await .await
.map_err(|_| err!(Request(NotFound("Room alias not found."))))?; .map_err(|_| err!(Request(NotFound("Room alias not found."))))?;
if services
.admin
.get_admin_room()
.await
.is_ok_and(|admin_room| admin_room == room_id)
{
let origin = body.origin.as_ref().expect("server is authenticated");
info!("Remote server {origin} attempted to access the room ID of the admin room");
return Err!(Request(NotFound("Room alias not found.")));
}
let mut servers: Vec<OwnedServerName> = services let mut servers: Vec<OwnedServerName> = services
.rooms .rooms
.state_cache .state_cache