snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 03:55:07 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

malformed payload error

Browse Source
This commit is contained in:
mpostma 2021-09-30 10:35:24 +02:00 committed by Tamo
parent 137272b8de
commit ddd40d87a7
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilisearch-error/src/lib.rs
View File

@ -85,6 +85,7 @@ pub enum Code {
DumpProcessFailed,
MissingContentType,
MalformedPayload,
}
impl Code {
@ -157,6 +158,7 @@ impl Code {
ErrCode::internal("dump_process_failed", StatusCode::INTERNAL_SERVER_ERROR)
}
MissingContentType => ErrCode::invalid("missing_content_type", StatusCode::UNSUPPORTED_MEDIA_TYPE),
MalformedPayload => ErrCode::invalid("malformed_payload", StatusCode::BAD_REQUEST)
}
}

10
meilisearch-lib/src/document_formats.rs
View File

@ -2,6 +2,7 @@ use std::fmt;
use std::io::{self, Read, Result as IoResult, Seek, Write};
use csv::{Reader as CsvReader, StringRecordsIntoIter};
use meilisearch_error::{Code, ErrorCode};
use milli::documents::DocumentBatchBuilder;
use serde_json::{Deserializer, Map, Value};
@ -35,6 +36,15 @@ pub enum DocumentFormatError {
),
}
impl ErrorCode for DocumentFormatError {
fn error_code(&self) -> Code {
match self {
DocumentFormatError::Internal(_) => Code::Internal,
DocumentFormatError::MalformedPayload(_, _) => Code::MalformedPayload,
}
}
}
internal_error!(DocumentFormatError: milli::documents::Error, io::Error);
macro_rules! malformed {

7
meilisearch-lib/src/index_controller/updates/error.rs
View File

@ -22,9 +22,7 @@ pub enum UpdateLoopError {
)]
FatalUpdateStoreError,
#[error("{0}")]
InvalidPayload(#[from] DocumentFormatError),
#[error("{0}")]
MalformedPayload(Box<dyn Error + Send + Sync + 'static>),
DocumentFormatError(#[from] DocumentFormatError),
// TODO: The reference to actix has to go.
#[error("{0}")]
PayloadError(#[from] actix_web::error::PayloadError),
@ -60,8 +58,7 @@ impl ErrorCode for UpdateLoopError {
Self::Internal(_) => Code::Internal,
//Self::IndexActor(e) => e.error_code(),
Self::FatalUpdateStoreError => Code::Internal,
Self::InvalidPayload(_) => Code::BadRequest,
Self::MalformedPayload(_) => Code::BadRequest,
Self::DocumentFormatError(error) => error.error_code(),
Self::PayloadError(error) => match error {
actix_web::error::PayloadError::Overflow => Code::PayloadTooLarge,
_ => Code::Internal,