grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Image proxy fixes (#4871)

Browse source 
* Fix remote image urls

* Remove unnecessary URL decode

* Removing the proxy changes.

---------

Co-authored-by: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>
Co-authored-by: Dessalines <tyhou13@gmx.com>
This commit is contained in:
Sander Saarend 2024-09-11 17:11:25 +03:00 committed by GitHub
parent fc13009611
commit fbb3960c36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2999,7 +2999,6 @@ dependencies = [
"tokio", "tokio",
"tracing", "tracing",
"url", "url",
"urlencoding",
] ]
[[package]] [[package]]

1
crates/routes/Cargo.toml
View file

@ -32,5 +32,4 @@ serde = { workspace = true }
url = { workspace = true } url = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
urlencoding = { workspace = true }
rss = "2.0.8" rss = "2.0.8"

3
crates/routes/src/images.rs
View file

@ -22,7 +22,6 @@ use reqwest_middleware::{ClientWithMiddleware, RequestBuilder};
use serde::Deserialize; use serde::Deserialize;
use std::time::Duration; use std::time::Duration;
use url::Url; use url::Url;
use urlencoding::decode;
pub fn config( pub fn config(
cfg: &mut web::ServiceConfig, cfg: &mut web::ServiceConfig,
@ -255,7 +254,7 @@ pub async fn image_proxy(
client: web::Data<ClientWithMiddleware>, client: web::Data<ClientWithMiddleware>,
context: web::Data<LemmyContext>, context: web::Data<LemmyContext>,
) -> LemmyResult<HttpResponse> { ) -> LemmyResult<HttpResponse> {
let url = Url::parse(&decode(&params.url)?)?; let url = Url::parse(&params.url)?;
// Check that url corresponds to a federated image so that this can't be abused as a proxy // Check that url corresponds to a federated image so that this can't be abused as a proxy
// for arbitrary purposes. // for arbitrary purposes.