forked from Deuxfleurs/garage
trinity-1686a
e55fa38c99
fix #96 fix #162 by returning Forbidden instead Bad Request Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: Deuxfleurs/garage#196 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>
47 lines
1.1 KiB
Rust
47 lines
1.1 KiB
Rust
use err_derive::Error;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use garage_util::error::Error as GarageError;
|
|
|
|
#[derive(Debug, Error, Serialize, Deserialize)]
|
|
pub enum Error {
|
|
#[error(display = "Internal error: {}", _0)]
|
|
Internal(#[error(source)] GarageError),
|
|
|
|
#[error(display = "Bad request: {}", _0)]
|
|
BadRequest(String),
|
|
}
|
|
|
|
impl From<netapp::error::Error> for Error {
|
|
fn from(e: netapp::error::Error) -> Self {
|
|
Error::Internal(GarageError::Netapp(e))
|
|
}
|
|
}
|
|
|
|
pub trait OkOrBadRequest {
|
|
type S;
|
|
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<Self::S, Error>;
|
|
}
|
|
|
|
impl<T, E> OkOrBadRequest for Result<T, E>
|
|
where
|
|
E: std::fmt::Display,
|
|
{
|
|
type S = T;
|
|
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
|
|
match self {
|
|
Ok(x) => Ok(x),
|
|
Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T> OkOrBadRequest for Option<T> {
|
|
type S = T;
|
|
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
|
|
match self {
|
|
Some(x) => Ok(x),
|
|
None => Err(Error::BadRequest(reason.as_ref().to_string())),
|
|
}
|
|
}
|
|
}
|