snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-06 04:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add reserved webhook

Browse Source
This commit is contained in:
Mubelotix
2025-07-30 15:23:06 +02:00
parent dc7af47371
commit 3e77c1d8c8
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/meilisearch-types/src/error.rs
View File

@ -422,7 +422,8 @@ InvalidChatCompletionPreQueryPrompt , InvalidRequest , BAD_REQU
// Webhooks // Webhooks
InvalidWebhooks , InvalidRequest , BAD_REQUEST ; InvalidWebhooks , InvalidRequest , BAD_REQUEST ;
InvalidWebhooksUrl , InvalidRequest , BAD_REQUEST ; InvalidWebhooksUrl , InvalidRequest , BAD_REQUEST ;
InvalidWebhooksHeaders , InvalidRequest , BAD_REQUEST InvalidWebhooksHeaders , InvalidRequest , BAD_REQUEST ;
ReservedWebhook , InvalidRequest , BAD_REQUEST
} }
impl ErrorCode for JoinError { impl ErrorCode for JoinError {

14
crates/meilisearch/src/routes/webhooks.rs
View File

@ -129,6 +129,8 @@ enum WebhooksError {
TooManyWebhooks, TooManyWebhooks,
#[error("Too many headers for the webhook `{0}`. Please limit the number of headers to 200.")] #[error("Too many headers for the webhook `{0}`. Please limit the number of headers to 200.")]
TooManyHeaders(String), TooManyHeaders(String),
#[error("Cannot edit webhook `{0}`. Webhooks prefixed with an underscore are special and may not be modified using the API.")]
ReservedWebhook(String),
} }
impl ErrorCode for WebhooksError { impl ErrorCode for WebhooksError {
@ -139,6 +141,7 @@ impl ErrorCode for WebhooksError {
WebhooksError::TooManyHeaders(_) => { WebhooksError::TooManyHeaders(_) => {
meilisearch_types::error::Code::InvalidWebhooksHeaders meilisearch_types::error::Code::InvalidWebhooksHeaders
} }
WebhooksError::ReservedWebhook(_) => meilisearch_types::error::Code::ReservedWebhook,
} }
} }
} }
@ -186,6 +189,10 @@ async fn patch_webhooks(
old_webhook: Option<Webhook>, old_webhook: Option<Webhook>,
new_webhook: WebhookSettings, new_webhook: WebhookSettings,
) -> Result<Webhook, WebhooksError> { ) -> Result<Webhook, WebhooksError> {
if name.starts_with('_') {
return Err(WebhooksError::ReservedWebhook(name.to_owned()));
}
let (old_url, mut headers) = let (old_url, mut headers) =
old_webhook.map(|w| (Some(w.url), w.headers)).unwrap_or((None, BTreeMap::new())); old_webhook.map(|w| (Some(w.url), w.headers)).unwrap_or((None, BTreeMap::new()));
@ -215,6 +222,10 @@ async fn patch_webhooks(
Setting::Reset => BTreeMap::new(), Setting::Reset => BTreeMap::new(),
}; };
if headers.len() > 200 {
return Err(WebhooksError::TooManyHeaders(name.to_owned()));
}
Ok(Webhook { url, headers }) Ok(Webhook { url, headers })
} }
@ -225,9 +236,6 @@ async fn patch_webhooks(
Setting::Set(new_webhook) => { Setting::Set(new_webhook) => {
let old_webhook = webhooks.remove(&name); let old_webhook = webhooks.remove(&name);
let webhook = merge_webhook(&name, old_webhook, new_webhook)?; let webhook = merge_webhook(&name, old_webhook, new_webhook)?;
if webhook.headers.len() > 200 {
return Err(WebhooksError::TooManyHeaders(name).into());
}
webhooks.insert(name.clone(), webhook); webhooks.insert(name.clone(), webhook);
} }
Setting::Reset => { Setting::Reset => {