oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

Merge branch 'release-0.10.6' into 'master'

Browse source 
fix(media): only fetch remote media when requested by authenticated endpoints

See merge request famedly/conduit!765
This commit is contained in:
Matthias Ahouansou 2025-07-07 10:58:21 +00:00
commit bcd0ef3eb1
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -492,7 +492,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]] [[package]]
name = "conduit" name = "conduit"
version = "0.10.5" version = "0.10.6"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",

2
Cargo.toml
View file

@ -16,7 +16,7 @@ license = "Apache-2.0"
name = "conduit" name = "conduit"
readme = "README.md" readme = "README.md"
repository = "https://gitlab.com/famedly/conduit" repository = "https://gitlab.com/famedly/conduit"
version = "0.10.5" version = "0.10.6"
# See also `rust-toolchain.toml` # See also `rust-toolchain.toml`
rust-version = "1.85.0" rust-version = "1.85.0"

4
src/api/client_server/media.rs
View file

@ -215,7 +215,7 @@ pub async fn get_content(
content_type, content_type,
content_disposition: Some(content_disposition), content_disposition: Some(content_disposition),
}) })
} else if server_name != services().globals.server_name() && allow_remote { } else if server_name != services().globals.server_name() && allow_remote && authenticated {
let remote_content_response = get_remote_content(server_name, media_id.clone()).await?; let remote_content_response = get_remote_content(server_name, media_id.clone()).await?;
Ok(get_content::v1::Response { Ok(get_content::v1::Response {
@ -297,7 +297,7 @@ async fn get_content_as_filename(
.with_filename(Some(filename.clone())), .with_filename(Some(filename.clone())),
), ),
}) })
} else if server_name != services().globals.server_name() && allow_remote { } else if server_name != services().globals.server_name() && allow_remote && authenticated {
let remote_content_response = get_remote_content(server_name, media_id.clone()).await?; let remote_content_response = get_remote_content(server_name, media_id.clone()).await?;
Ok(get_content_as_filename::v1::Response { Ok(get_content_as_filename::v1::Response {