add federation endpoints for authenticated media

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-08-27 02:56:17 +00:00
parent 47f9c69eff
commit 84a8e36120
5 changed files with 101 additions and 14 deletions

View file

@ -230,6 +230,8 @@ pub fn build(router: Router<State>, server: &Server) -> Router<State> {
.ruma_route(server::get_openid_userinfo_route)
.ruma_route(server::get_hierarchy_route)
.ruma_route(server::well_known_server)
.ruma_route(server::get_content_route)
.ruma_route(server::get_content_thumbnail_route)
.route("/_conduwuit/local_user_count", get(client::conduwuit_local_user_count))
} else {
router

83
src/api/server/media.rs Normal file
View file

@ -0,0 +1,83 @@
use axum::extract::State;
use axum_client_ip::InsecureClientIp;
use conduit::{utils::content_disposition::make_content_disposition, Err, Result};
use conduit_service::media::{Dim, FileMeta};
use ruma::{
api::federation::authenticated_media::{
get_content, get_content_thumbnail, Content, ContentMetadata, FileOrLocation,
},
Mxc,
};
use crate::Ruma;
/// # `GET /_matrix/federation/v1/media/download/{mediaId}`
///
/// Load media from our server.
#[tracing::instrument(skip_all, fields(%client), name = "media_get")]
pub(crate) async fn get_content_route(
State(services): State<crate::State>, InsecureClientIp(client): InsecureClientIp,
body: Ruma<get_content::v1::Request>,
) -> Result<get_content::v1::Response> {
let mxc = Mxc {
server_name: services.globals.server_name(),
media_id: &body.media_id,
};
let Some(FileMeta {
content,
content_type,
content_disposition,
}) = services.media.get(&mxc).await?
else {
return Err!(Request(NotFound("Media not found.")));
};
let content_disposition = make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None);
let content = Content {
file: content.expect("entire file contents"),
content_type: content_type.map(Into::into),
content_disposition: Some(content_disposition),
};
Ok(get_content::v1::Response {
content: FileOrLocation::File(content),
metadata: ContentMetadata::new(),
})
}
/// # `GET /_matrix/federation/v1/media/thumbnail/{mediaId}`
///
/// Load media thumbnail from our server.
#[tracing::instrument(skip_all, fields(%client), name = "media_thumbnail_get")]
pub(crate) async fn get_content_thumbnail_route(
State(services): State<crate::State>, InsecureClientIp(client): InsecureClientIp,
body: Ruma<get_content_thumbnail::v1::Request>,
) -> Result<get_content_thumbnail::v1::Response> {
let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;
let mxc = Mxc {
server_name: services.globals.server_name(),
media_id: &body.media_id,
};
let Some(FileMeta {
content,
content_type,
content_disposition,
}) = services.media.get_thumbnail(&mxc, &dim).await?
else {
return Err!(Request(NotFound("Media not found.")));
};
let content_disposition = make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None);
let content = Content {
file: content.expect("entire file contents"),
content_type: content_type.map(Into::into),
content_disposition: Some(content_disposition),
};
Ok(get_content_thumbnail::v1::Response {
content: FileOrLocation::File(content),
metadata: ContentMetadata::new(),
})
}

View file

@ -7,6 +7,7 @@ pub(super) mod invite;
pub(super) mod key;
pub(super) mod make_join;
pub(super) mod make_leave;
pub(super) mod media;
pub(super) mod openid;
pub(super) mod publicrooms;
pub(super) mod query;
@ -28,6 +29,7 @@ pub(super) use invite::*;
pub(super) use key::*;
pub(super) use make_join::*;
pub(super) use make_leave::*;
pub(super) use media::*;
pub(super) use openid::*;
pub(super) use publicrooms::*;
pub(super) use query::*;