mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-09-03 11:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Enable urlencoding for pictrs proxy parameter (fixes #5749) (#5776)

Browse source
This commit is contained in:
Nutomic 2025-06-11 20:54:21 +00:00 committed by GitHub
parent 896e8f1896
commit 15cfb90b7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -3921,6 +3921,7 @@ dependencies = [
"lemmy_db_views_post",
"lemmy_db_views_site",
"lemmy_utils",
"percent-encoding",
"pretty_assertions",
"prometheus",
"reqwest 0.12.19",

1
crates/routes/Cargo.toml
View file

@ -52,6 +52,7 @@ prometheus = { version = "0.14.0", features = ["process"] }
rss = "2.0.12"
actix-web-prom = "0.10.0"
actix-cors = "0.7.1"
percent-encoding = "2.3.1"
[dev-dependencies]
pretty_assertions.workspace = true

8
crates/routes/src/images/download.rs
View file

@ -11,6 +11,7 @@ use lemmy_api_utils::context::LemmyContext;
use lemmy_db_schema::source::images::RemoteImage;
use lemmy_db_views_local_image::api::{ImageGetParams, ImageProxyParams};
use lemmy_utils::error::LemmyResult;
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
use url::Url;
pub async fn get_image(
@ -44,6 +45,7 @@ pub async fn image_proxy(
context: Data<LemmyContext>,
) -> LemmyResult<Either<HttpResponse<()>, HttpResponse<BoxBody>>> {
let url = Url::parse(&params.url)?;
let encoded_url = utf8_percent_encode(&params.url, NON_ALPHANUMERIC).to_string();
// Check that url corresponds to a federated image so that this can't be abused as a proxy
// for arbitrary purposes.
@ -51,12 +53,12 @@ pub async fn image_proxy(
let pictrs_config = context.settings().pictrs()?;
let processed_url = if params.file_type.is_none() && params.max_size.is_none() {
format!("{}image/original?proxy={}", pictrs_config.url, params.url)
format!("{}image/original?proxy={}", pictrs_config.url, encoded_url)
} else {
let file_type = file_type(params.file_type, url.as_str());
let file_type = file_type(params.file_type, url.path());
let mut url = format!(
"{}image/process.{}?proxy={}",
pictrs_config.url, file_type, url
pictrs_config.url, file_type, encoded_url
);
if let Some(size) = params.max_size {