nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 04:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace more anyhow errors with explicit error types

Browse Source
This commit is contained in:
Lennart
2024-06-01 14:24:31 +02:00
parent 943b964da0
commit 7dcc29302a
9 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/dav/src/error.rs
View File

@@ -7,8 +7,8 @@ use thiserror::Error;
pub enum Error {
#[error("Not found")]
NotFound,
#[error("Bad request")]
BadRequest,
#[error("Bad request: {0}")]
BadRequest(String),
#[error("Unauthorized")]
Unauthorized,
#[error("Internal server error :(")]
@@ -25,7 +25,7 @@ impl actix_web::error::ResponseError for Error {
Self::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
Self::Other(_) => StatusCode::INTERNAL_SERVER_ERROR,
Self::NotFound => StatusCode::NOT_FOUND,
Self::BadRequest => StatusCode::BAD_REQUEST,
Self::BadRequest(_) => StatusCode::BAD_REQUEST,
Self::Unauthorized => StatusCode::UNAUTHORIZED,
Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
}

1
crates/dav/src/propfind.rs
View File

@@ -7,7 +7,6 @@ use crate::Error;
use actix_web::http::header::ContentType;
use actix_web::web::{Data, Path};
use actix_web::{HttpRequest, HttpResponse};
use anyhow::Result;
use rustical_auth::{AuthInfoExtractor, CheckAuthentication};
use serde::Deserialize;
use serde::Serialize;

10
crates/dav/src/resource.rs
View File

@@ -1,6 +1,6 @@
use crate::xml::tag_list::TagList;
use crate::Error;
use actix_web::{http::StatusCode, HttpRequest, ResponseError};
use anyhow::anyhow;
use async_trait::async_trait;
use itertools::Itertools;
use rustical_auth::AuthInfo;
@@ -97,7 +97,9 @@ impl<R: Resource> HandlePropfind for R {
if props.contains(&"propname") {
if props.len() != 1 {
// propname MUST be the only queried prop per spec
return Err(anyhow!("propname MUST be the only queried prop").into());
return Err(
Error::BadRequest("allprop MUST be the only queried prop".to_owned()).into(),
);
}
// TODO: implement propname
props = R::list_dead_props().into();
@@ -105,7 +107,9 @@ impl<R: Resource> HandlePropfind for R {
if props.contains(&"allprop") {
if props.len() != 1 {
// allprop MUST be the only queried prop per spec
return Err(anyhow!("allprop MUST be the only queried prop").into());
return Err(
Error::BadRequest("allprop MUST be the only queried prop".to_owned()).into(),
);
}
props = R::list_dead_props().into();
}