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

refactor OPTIONS handling

Browse Source
This commit is contained in:
Lennart
2024-11-06 16:43:52 +01:00
parent f56fd81d0e
commit b98058a7ff
3 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/caldav/src/calendar/methods/report/calendar_multiget.rs
View File

@@ -50,7 +50,6 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
match store.get_object(principal, cal_id, object_id).await { match store.get_object(principal, cal_id, object_id).await {
Ok(object) => result.push(object), Ok(object) => result.push(object),
Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()), Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
// TODO: Maybe add error handling on a per-object basis
Err(err) => return Err(err.into()), Err(err) => return Err(err.into()),
}; };
} }

40
crates/caldav/src/lib.rs
View File

@@ -1,10 +1,11 @@
use actix_web::dev::Service; use actix_web::dev::ServiceResponse;
use actix_web::http::header::{HeaderName, HeaderValue}; use actix_web::http::header::{HeaderName, HeaderValue};
use actix_web::http::{Method, StatusCode}; use actix_web::http::{Method, StatusCode};
use actix_web::middleware::{ErrorHandlerResponse, ErrorHandlers};
use actix_web::web::{self, Data}; use actix_web::web::{self, Data};
use actix_web::HttpResponse;
use calendar::resource::CalendarResourceService; use calendar::resource::CalendarResourceService;
use calendar_object::resource::CalendarObjectResourceService; use calendar_object::resource::CalendarObjectResourceService;
use futures_util::FutureExt;
use principal::{PrincipalResource, PrincipalResourceService}; use principal::{PrincipalResource, PrincipalResourceService};
use rustical_dav::resource::ResourceService; use rustical_dav::resource::ResourceService;
use rustical_dav::resources::RootResourceService; use rustical_dav::resources::RootResourceService;
@@ -31,28 +32,25 @@ pub fn configure_dav<AP: AuthenticationProvider, C: CalendarStore + ?Sized>(
cfg.service( cfg.service(
web::scope("") web::scope("")
.wrap(AuthenticationMiddleware::new(auth_provider)) .wrap(AuthenticationMiddleware::new(auth_provider))
.wrap_fn(|req, srv| { .wrap(
// Middleware to set the DAV header ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
// Could be more elegant if actix_web::guard::RegisteredMethods was public :( Ok(ErrorHandlerResponse::Response(
let method = req.method().clone(); if res.request().method() == Method::OPTIONS {
srv.call(req).map(move |res| { let response = HttpResponse::Ok()
if method == Method::OPTIONS { .insert_header((
return res.map(|mut response| {
if response.status() == StatusCode::METHOD_NOT_ALLOWED {
response.headers_mut().insert(
HeaderName::from_static("dav"), HeaderName::from_static("dav"),
HeaderValue::from_static( HeaderValue::from_static(
"1, 2, 3, calendar-access, extended-mkcol", "1, 2, 3, access-control, calendar-access, extended-mkcol",
), ),
); ))
*response.response_mut().status_mut() = StatusCode::OK; .finish();
} ServiceResponse::new(res.into_parts().0, response).map_into_right_body()
response } else {
}); res.map_into_left_body()
} },
res ))
}) }),
}) )
.app_data(Data::from(store.clone())) .app_data(Data::from(store.clone()))
.service(RootResourceService::<PrincipalResource>::actix_resource()) .service(RootResourceService::<PrincipalResource>::actix_resource())
.service( .service(

38
crates/carddav/src/lib.rs
View File

@@ -1,15 +1,16 @@
use actix_web::{ use actix_web::{
dev::Service, dev::ServiceResponse,
http::{ http::{
header::{HeaderName, HeaderValue}, header::{HeaderName, HeaderValue},
Method, StatusCode, Method, StatusCode,
}, },
middleware::{ErrorHandlerResponse, ErrorHandlers},
web::{self, Data}, web::{self, Data},
HttpResponse,
}; };
use address_object::resource::AddressObjectResourceService; use address_object::resource::AddressObjectResourceService;
use addressbook::resource::AddressbookResourceService; use addressbook::resource::AddressbookResourceService;
pub use error::Error; pub use error::Error;
use futures_util::FutureExt;
use principal::{PrincipalResource, PrincipalResourceService}; use principal::{PrincipalResource, PrincipalResourceService};
use rustical_dav::resource::ResourceService; use rustical_dav::resource::ResourceService;
use rustical_dav::resources::RootResourceService; use rustical_dav::resources::RootResourceService;
@@ -36,28 +37,25 @@ pub fn configure_dav<AP: AuthenticationProvider, A: AddressbookStore + ?Sized>(
cfg.service( cfg.service(
web::scope("") web::scope("")
.wrap(AuthenticationMiddleware::new(auth_provider)) .wrap(AuthenticationMiddleware::new(auth_provider))
.wrap_fn(|req, srv| { .wrap(
// Middleware to set the DAV header ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
// Could be more elegant if actix_web::guard::RegisteredMethods was public :( Ok(ErrorHandlerResponse::Response(
let method = req.method().clone(); if res.request().method() == Method::OPTIONS {
srv.call(req).map(move |res| { let response = HttpResponse::Ok()
if method == Method::OPTIONS { .insert_header((
return res.map(|mut response| {
if response.status() == StatusCode::METHOD_NOT_ALLOWED {
response.headers_mut().insert(
HeaderName::from_static("dav"), HeaderName::from_static("dav"),
HeaderValue::from_static( HeaderValue::from_static(
"1, 2, 3, access-control, addressbook, extended-mkcol", "1, 2, 3, access-control, addressbook, extended-mkcol",
), ),
); ))
*response.response_mut().status_mut() = StatusCode::OK; .finish();
} ServiceResponse::new(res.into_parts().0, response).map_into_right_body()
response } else {
}); res.map_into_left_body()
} },
res ))
}) }),
}) )
.app_data(Data::from(store.clone())) .app_data(Data::from(store.clone()))
.service(RootResourceService::<PrincipalResource>::actix_resource()) .service(RootResourceService::<PrincipalResource>::actix_resource())
.service( .service(