mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-28 13:51:32 +00:00
55f84dd38a
* Adding an image_details table to store image dimensions. - Adds an image_details table, which stores the height, width, and content_type for local and remote images. - For LocalImages, this information already comes back with the upload. - For RemoteImages, it calls the pictrs details endpoint. - Fixed some issues with proxying non-image urls. - Fixes #3328 - Also fixes #4703 * Running sql format. * Running fmt. * Don't fetch metadata in background for local API requests. * Dont export remote_image table to typescript. * Cleaning up validate. * Dont proxy url. * Fixing tests, fixing issue with federated thumbnails. * Fix tests. * Updating corepack, fixing issue. * Refactoring image inserts to use transactions. * Use select exists again. * Fixing imports. * Fix test. * Removing pointless backgrounded metadata generation version. * Removing public pictrs details route. * Fixing clippy. * Fixing proxy image fetching. Fixes #4703 - This extracts only the proxy image fixes from #4704, leaving off thumbnails. * Fix test. * Addressing PR comments. * Address PR comments 2. --------- Co-authored-by: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>
268 lines
7.6 KiB
Rust
268 lines
7.6 KiB
Rust
use actix_web::{
|
|
body::BodyStream,
|
|
http::{
|
|
header::{HeaderName, ACCEPT_ENCODING, HOST},
|
|
StatusCode,
|
|
},
|
|
web,
|
|
web::Query,
|
|
HttpRequest,
|
|
HttpResponse,
|
|
};
|
|
use futures::stream::{Stream, StreamExt};
|
|
use lemmy_api_common::{context::LemmyContext, request::PictrsResponse};
|
|
use lemmy_db_schema::source::{
|
|
images::{LocalImage, LocalImageForm, RemoteImage},
|
|
local_site::LocalSite,
|
|
};
|
|
use lemmy_db_views::structs::LocalUserView;
|
|
use lemmy_utils::{error::LemmyResult, rate_limit::RateLimitCell, REQWEST_TIMEOUT};
|
|
use reqwest::Body;
|
|
use reqwest_middleware::{ClientWithMiddleware, RequestBuilder};
|
|
use serde::Deserialize;
|
|
use std::time::Duration;
|
|
use url::Url;
|
|
use urlencoding::decode;
|
|
|
|
pub fn config(
|
|
cfg: &mut web::ServiceConfig,
|
|
client: ClientWithMiddleware,
|
|
rate_limit: &RateLimitCell,
|
|
) {
|
|
cfg
|
|
.app_data(web::Data::new(client))
|
|
.service(
|
|
web::resource("/pictrs/image")
|
|
.wrap(rate_limit.image())
|
|
.route(web::post().to(upload)),
|
|
)
|
|
// This has optional query params: /image/{filename}?format=jpg&thumbnail=256
|
|
.service(web::resource("/pictrs/image/{filename}").route(web::get().to(full_res)))
|
|
.service(web::resource("/pictrs/image/delete/{token}/{filename}").route(web::get().to(delete)));
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
struct PictrsGetParams {
|
|
format: Option<String>,
|
|
thumbnail: Option<i32>,
|
|
}
|
|
|
|
fn adapt_request(
|
|
request: &HttpRequest,
|
|
client: &ClientWithMiddleware,
|
|
url: String,
|
|
) -> RequestBuilder {
|
|
// remove accept-encoding header so that pictrs doesn't compress the response
|
|
const INVALID_HEADERS: &[HeaderName] = &[ACCEPT_ENCODING, HOST];
|
|
|
|
let client_request = client
|
|
.request(request.method().clone(), url)
|
|
.timeout(REQWEST_TIMEOUT);
|
|
|
|
request
|
|
.headers()
|
|
.iter()
|
|
.fold(client_request, |client_req, (key, value)| {
|
|
if INVALID_HEADERS.contains(key) {
|
|
client_req
|
|
} else {
|
|
client_req.header(key, value)
|
|
}
|
|
})
|
|
}
|
|
|
|
async fn upload(
|
|
req: HttpRequest,
|
|
body: web::Payload,
|
|
// require login
|
|
local_user_view: LocalUserView,
|
|
client: web::Data<ClientWithMiddleware>,
|
|
context: web::Data<LemmyContext>,
|
|
) -> LemmyResult<HttpResponse> {
|
|
// TODO: check rate limit here
|
|
let pictrs_config = context.settings().pictrs_config()?;
|
|
let image_url = format!("{}image", pictrs_config.url);
|
|
|
|
let mut client_req = adapt_request(&req, &client, image_url);
|
|
|
|
if let Some(addr) = req.head().peer_addr {
|
|
client_req = client_req.header("X-Forwarded-For", addr.to_string())
|
|
};
|
|
let res = client_req
|
|
.timeout(Duration::from_secs(pictrs_config.upload_timeout))
|
|
.body(Body::wrap_stream(make_send(body)))
|
|
.send()
|
|
.await?;
|
|
|
|
let status = res.status();
|
|
let images = res.json::<PictrsResponse>().await?;
|
|
if let Some(images) = &images.files {
|
|
for image in images {
|
|
let form = LocalImageForm {
|
|
local_user_id: Some(local_user_view.local_user.id),
|
|
pictrs_alias: image.file.to_string(),
|
|
pictrs_delete_token: image.delete_token.to_string(),
|
|
};
|
|
LocalImage::create(&mut context.pool(), &form).await?;
|
|
}
|
|
}
|
|
|
|
Ok(HttpResponse::build(status).json(images))
|
|
}
|
|
|
|
async fn full_res(
|
|
filename: web::Path<String>,
|
|
web::Query(params): web::Query<PictrsGetParams>,
|
|
req: HttpRequest,
|
|
client: web::Data<ClientWithMiddleware>,
|
|
context: web::Data<LemmyContext>,
|
|
local_user_view: Option<LocalUserView>,
|
|
) -> LemmyResult<HttpResponse> {
|
|
// block access to images if instance is private and unauthorized, public
|
|
let local_site = LocalSite::read(&mut context.pool()).await?;
|
|
if local_site.private_instance && local_user_view.is_none() {
|
|
return Ok(HttpResponse::Unauthorized().finish());
|
|
}
|
|
let name = &filename.into_inner();
|
|
|
|
// If there are no query params, the URL is original
|
|
let pictrs_config = context.settings().pictrs_config()?;
|
|
let url = if params.format.is_none() && params.thumbnail.is_none() {
|
|
format!("{}image/original/{}", pictrs_config.url, name,)
|
|
} else {
|
|
// Take file type from name, or jpg if nothing is given
|
|
let format = params
|
|
.format
|
|
.unwrap_or_else(|| name.split('.').last().unwrap_or("jpg").to_string());
|
|
|
|
let mut url = format!("{}image/process.{}?src={}", pictrs_config.url, format, name,);
|
|
|
|
if let Some(size) = params.thumbnail {
|
|
url = format!("{url}&thumbnail={size}",);
|
|
}
|
|
url
|
|
};
|
|
|
|
image(url, req, &client).await
|
|
}
|
|
|
|
async fn image(
|
|
url: String,
|
|
req: HttpRequest,
|
|
client: &ClientWithMiddleware,
|
|
) -> LemmyResult<HttpResponse> {
|
|
let mut client_req = adapt_request(&req, client, url);
|
|
|
|
if let Some(addr) = req.head().peer_addr {
|
|
client_req = client_req.header("X-Forwarded-For", addr.to_string());
|
|
}
|
|
|
|
if let Some(addr) = req.head().peer_addr {
|
|
client_req = client_req.header("X-Forwarded-For", addr.to_string());
|
|
}
|
|
|
|
let res = client_req.send().await?;
|
|
|
|
if res.status() == StatusCode::NOT_FOUND {
|
|
return Ok(HttpResponse::NotFound().finish());
|
|
}
|
|
|
|
let mut client_res = HttpResponse::build(res.status());
|
|
|
|
for (name, value) in res.headers().iter().filter(|(h, _)| *h != "connection") {
|
|
client_res.insert_header((name.clone(), value.clone()));
|
|
}
|
|
|
|
Ok(client_res.body(BodyStream::new(res.bytes_stream())))
|
|
}
|
|
|
|
async fn delete(
|
|
components: web::Path<(String, String)>,
|
|
req: HttpRequest,
|
|
client: web::Data<ClientWithMiddleware>,
|
|
context: web::Data<LemmyContext>,
|
|
// require login
|
|
_local_user_view: LocalUserView,
|
|
) -> LemmyResult<HttpResponse> {
|
|
let (token, file) = components.into_inner();
|
|
|
|
let pictrs_config = context.settings().pictrs_config()?;
|
|
let url = format!("{}image/delete/{}/{}", pictrs_config.url, &token, &file);
|
|
|
|
let mut client_req = adapt_request(&req, &client, url);
|
|
|
|
if let Some(addr) = req.head().peer_addr {
|
|
client_req = client_req.header("X-Forwarded-For", addr.to_string());
|
|
}
|
|
|
|
let res = client_req.send().await?;
|
|
|
|
LocalImage::delete_by_alias(&mut context.pool(), &file).await?;
|
|
|
|
Ok(HttpResponse::build(res.status()).body(BodyStream::new(res.bytes_stream())))
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct ImageProxyParams {
|
|
url: String,
|
|
}
|
|
|
|
pub async fn image_proxy(
|
|
Query(params): Query<ImageProxyParams>,
|
|
req: HttpRequest,
|
|
client: web::Data<ClientWithMiddleware>,
|
|
context: web::Data<LemmyContext>,
|
|
) -> LemmyResult<HttpResponse> {
|
|
let url = Url::parse(&decode(¶ms.url)?)?;
|
|
|
|
// Check that url corresponds to a federated image so that this can't be abused as a proxy
|
|
// for arbitrary purposes.
|
|
RemoteImage::validate(&mut context.pool(), url.clone().into()).await?;
|
|
|
|
let pictrs_config = context.settings().pictrs_config()?;
|
|
let url = format!("{}image/original?proxy={}", pictrs_config.url, ¶ms.url);
|
|
|
|
image(url, req, &client).await
|
|
}
|
|
|
|
fn make_send<S>(mut stream: S) -> impl Stream<Item = S::Item> + Send + Unpin + 'static
|
|
where
|
|
S: Stream + Unpin + 'static,
|
|
S::Item: Send,
|
|
{
|
|
// NOTE: the 8 here is arbitrary
|
|
let (tx, rx) = tokio::sync::mpsc::channel(8);
|
|
|
|
// NOTE: spawning stream into a new task can potentially hit this bug:
|
|
// - https://github.com/actix/actix-web/issues/1679
|
|
//
|
|
// Since 4.0.0-beta.2 this issue is incredibly less frequent. I have not personally reproduced it.
|
|
// That said, it is still technically possible to encounter.
|
|
actix_web::rt::spawn(async move {
|
|
while let Some(res) = stream.next().await {
|
|
if tx.send(res).await.is_err() {
|
|
break;
|
|
}
|
|
}
|
|
});
|
|
|
|
SendStream { rx }
|
|
}
|
|
|
|
struct SendStream<T> {
|
|
rx: tokio::sync::mpsc::Receiver<T>,
|
|
}
|
|
|
|
impl<T> Stream for SendStream<T>
|
|
where
|
|
T: Send,
|
|
{
|
|
type Item = T;
|
|
|
|
fn poll_next(
|
|
mut self: std::pin::Pin<&mut Self>,
|
|
cx: &mut std::task::Context<'_>,
|
|
) -> std::task::Poll<Option<Self::Item>> {
|
|
std::pin::Pin::new(&mut self.rx).poll_recv(cx)
|
|
}
|
|
}
|