snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-05 20:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't always hardcode Content-Type in proxy

Browse Source
This commit is contained in:
Louis Dureuil
2025-07-29 17:52:24 +02:00
parent 484dbf8c06
commit 385acbbcd2
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/meilisearch/src/routes/indexes/proxy.rs
View File

@ -21,14 +21,14 @@ use crate::routes::indexes::proxy::error::{ProxyDocumentChangeError, ReqwestErro
use crate::routes::SummarizedTaskView; use crate::routes::SummarizedTaskView;
pub enum Body<T: serde::Serialize> { pub enum Body<T: serde::Serialize> {
File(File), NdJsonPayload(File),
Inline(T), Inline(T),
None, None,
} }
impl Body<()> { impl Body<()> {
pub fn with_file(file: File) -> Self { pub fn with_file(file: File) -> Self {
Self::File(file) Self::NdJsonPayload(file)
} }
pub fn none() -> Self { pub fn none() -> Self {
@ -65,8 +65,15 @@ pub async fn proxy<T: serde::Serialize>(
.expect("inconsistent `network.sharding` and `network.self`") .expect("inconsistent `network.sharding` and `network.self`")
.to_owned(); .to_owned();
let content_type = match &body {
// for file bodies, force x-ndjson
Body::NdJsonPayload(_) => Some(b"application/x-ndjson".as_slice()),
// otherwise get content type from request
_ => req.headers().get(CONTENT_TYPE).map(|h| h.as_bytes()),
};
let body = match body { let body = match body {
Body::File(file) => Some(Bytes::from_owner(unsafe { Body::NdJsonPayload(file) => Some(Bytes::from_owner(unsafe {
memmap2::Mmap::map(&file).map_err(|err| { memmap2::Mmap::map(&file).map_err(|err| {
MeilisearchHttpError::from_milli(err.into(), Some(index_uid.to_owned())) MeilisearchHttpError::from_milli(err.into(), Some(index_uid.to_owned()))
})? })?
@ -110,11 +117,15 @@ pub async fn proxy<T: serde::Serialize>(
let deadline = let deadline =
std::time::Instant::now() + std::time::Duration::from_secs(100); std::time::Instant::now() + std::time::Duration::from_secs(100);
let content_type = content_type.map(|b| b.to_owned());
backoff::future::retry(backoff::ExponentialBackoff::default(), move || { backoff::future::retry(backoff::ExponentialBackoff::default(), move || {
let url = url.clone(); let url = url.clone();
let client = client.clone(); let client = client.clone();
let url_encoded_this = url_encoded_this.clone(); let url_encoded_this = url_encoded_this.clone();
let url_encoded_task_uid = url_encoded_task_uid.clone(); let url_encoded_task_uid = url_encoded_task_uid.clone();
let content_type = content_type.clone();
let body = body.clone(); let body = body.clone();
let api_key = api_key.clone(); let api_key = api_key.clone();
let method = method.clone(); let method = method.clone();
@ -123,6 +134,7 @@ pub async fn proxy<T: serde::Serialize>(
try_proxy( try_proxy(
method, method,
&url, &url,
content_type.as_deref(),
api_key.as_deref(), api_key.as_deref(),
&client, &client,
deadline, deadline,
@ -201,6 +213,7 @@ fn from_old_http_method(method: &actix_http::Method) -> reqwest::Method {
async fn try_proxy( async fn try_proxy(
method: reqwest::Method, method: reqwest::Method,
url: &str, url: &str,
content_type: Option<&[u8]>,
api_key: Option<&str>, api_key: Option<&str>,
client: &reqwest::Client, client: &reqwest::Client,
deadline: std::time::Instant, deadline: std::time::Instant,
@ -215,7 +228,11 @@ async fn try_proxy(
let request = if let Some(api_key) = api_key { request.bearer_auth(api_key) } else { request }; let request = if let Some(api_key) = api_key { request.bearer_auth(api_key) } else { request };
let request = request.header(PROXY_ORIGIN_TASK_UID_HEADER, url_encoded_task_uid); let request = request.header(PROXY_ORIGIN_TASK_UID_HEADER, url_encoded_task_uid);
let request = request.header(PROXY_ORIGIN_REMOTE_HEADER, url_encoded_this); let request = request.header(PROXY_ORIGIN_REMOTE_HEADER, url_encoded_this);
let request = request.header(CONTENT_TYPE.as_str(), "application/x-ndjson"); let request = if let Some(content_type) = content_type {
request.header(CONTENT_TYPE.as_str(), content_type)
} else {
request
};
let response = request.send().await; let response = request.send().await;
let response = match response { let response = match response {