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

Move authentication middleware into the caldav scope

Browse Source
This commit is contained in:
Lennart
2024-10-03 19:55:05 +02:00
parent 5a8644032f
commit dd3d05907c
4 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ use root::RootResourceService;
use rustical_dav::methods::{
propfind::ServicePrefix, route_delete, route_propfind, route_proppatch,
};
use rustical_store::auth::{AuthenticationMiddleware, AuthenticationProvider};
use rustical_store::CalendarStore;
use std::str::FromStr;
use std::sync::Arc;
@@ -29,9 +30,10 @@ pub fn configure_well_known(cfg: &mut web::ServiceConfig, caldav_root: String) {
cfg.service(web::redirect("/caldav", caldav_root).permanent());
}
pub fn configure_dav<C: CalendarStore + ?Sized>(
pub fn configure_dav<AP: AuthenticationProvider, C: CalendarStore + ?Sized>(
cfg: &mut web::ServiceConfig,
prefix: String,
auth_provider: Arc<AP>,
store: Arc<RwLock<C>>,
) {
let propfind_method = || web::method(Method::from_str("PROPFIND").unwrap());
@@ -39,82 +41,89 @@ pub fn configure_dav<C: CalendarStore + ?Sized>(
let report_method = || web::method(Method::from_str("REPORT").unwrap());
let mkcalendar_method = || web::method(Method::from_str("MKCALENDAR").unwrap());
cfg.app_data(Data::new(CalDavContext {
store: store.clone(),
}))
.app_data(Data::new(ServicePrefix(prefix)))
.app_data(Data::from(store.clone()))
.service(
web::resource("{path:.*}")
// Without the guard this service would handle all requests
.guard(guard::Method(Method::OPTIONS))
.to(options_handler),
)
.service(
web::resource("")
.route(propfind_method().to(route_propfind::<RootResourceService>))
.route(proppatch_method().to(route_proppatch::<RootResourceService>)),
)
.service(
web::scope("/user").service(
web::scope("/{principal}")
.service(
web::resource("")
.route(propfind_method().to(route_propfind::<PrincipalResourceService<C>>))
.route(
proppatch_method().to(route_proppatch::<PrincipalResourceService<C>>),
),
)
.service(
web::scope("/{calendar}")
cfg.service(
web::scope("")
.wrap(AuthenticationMiddleware::new(auth_provider))
.app_data(Data::new(CalDavContext {
store: store.clone(),
}))
.app_data(Data::new(ServicePrefix(prefix)))
.app_data(Data::from(store.clone()))
.service(
web::resource("{path:.*}")
// Without the guard this service would handle all requests
.guard(guard::Method(Method::OPTIONS))
.to(options_handler),
)
.service(
web::resource("")
.route(propfind_method().to(route_propfind::<RootResourceService>))
.route(proppatch_method().to(route_proppatch::<RootResourceService>)),
)
.service(
web::scope("/user").service(
web::scope("/{principal}")
.service(
web::resource("")
.route(
report_method()
.to(calendar::methods::report::route_report_calendar::<C>),
)
.route(
propfind_method()
.to(route_propfind::<CalendarResourceService<C>>),
.to(route_propfind::<PrincipalResourceService<C>>),
)
.route(
proppatch_method()
.to(route_proppatch::<CalendarResourceService<C>>),
)
.route(
web::method(Method::DELETE)
.to(route_delete::<CalendarResourceService<C>>),
)
.route(
mkcalendar_method()
.to(calendar::methods::mkcalendar::route_mkcalendar::<C>),
.to(route_proppatch::<PrincipalResourceService<C>>),
),
)
.service(
web::resource("/{event}")
.route(
propfind_method()
.to(route_propfind::<CalendarObjectResourceService<C>>),
web::scope("/{calendar}")
.service(
web::resource("")
.route(report_method().to(
calendar::methods::report::route_report_calendar::<C>,
))
.route(
propfind_method()
.to(route_propfind::<CalendarResourceService<C>>),
)
.route(
proppatch_method()
.to(route_proppatch::<CalendarResourceService<C>>),
)
.route(
web::method(Method::DELETE)
.to(route_delete::<CalendarResourceService<C>>),
)
.route(mkcalendar_method().to(
calendar::methods::mkcalendar::route_mkcalendar::<C>,
)),
)
.route(
proppatch_method()
.to(route_proppatch::<CalendarObjectResourceService<C>>),
)
.route(
web::method(Method::DELETE)
.to(route_delete::<CalendarObjectResourceService<C>>),
)
.route(
web::method(Method::GET)
.to(calendar_object::methods::get_event::<C>),
)
.route(
web::method(Method::PUT)
.to(calendar_object::methods::put_event::<C>),
.service(
web::resource("/{event}")
.route(
propfind_method().to(route_propfind::<
CalendarObjectResourceService<C>,
>),
)
.route(proppatch_method().to(route_proppatch::<
CalendarObjectResourceService<C>,
>))
.route(
web::method(Method::DELETE).to(route_delete::<
CalendarObjectResourceService<C>,
>),
)
.route(
web::method(Method::GET)
.to(calendar_object::methods::get_event::<C>),
)
.route(
web::method(Method::PUT)
.to(calendar_object::methods::put_event::<C>),
),
),
),
),
),
),
);
}