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

Massive refactoring how DAV resources and routes work

Browse Source
This commit is contained in:
Lennart
2024-10-03 23:02:13 +02:00
parent 9c8c05eaca
commit a47d056df0
15 changed files with 218 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/caldav/Cargo.toml
View File

@@ -24,3 +24,4 @@ async-trait = "0.1"
thiserror = "1.0"
strum = { version = "0.26", features = ["strum_macros", "derive"] }
derive_more = { version = "1.0", features = ["from", "into"] }
url = "2.5.2"

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

@@ -8,7 +8,7 @@ use actix_web::{
};
use rustical_dav::{
methods::propfind::{PropElement, PropfindType},
resource::HandlePropfind,
resource::Resource,
xml::{multistatus::PropstatWrapper, MultistatusElement},
};
use rustical_store::{model::object::CalendarObject, CalendarStore};
@@ -88,7 +88,7 @@ pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
let path = format!("{}/{}", req.path(), object.get_uid());
responses.push(
CalendarObjectResource::from(object)
.propfind(prefix, &path, props.clone())
.propfind(&path, props.clone(), req.resource_map())
.await?,
);
}

11
crates/caldav/src/calendar/methods/report/calendar_query.rs
View File

@@ -1,7 +1,7 @@
use actix_web::HttpRequest;
use rustical_dav::{
methods::propfind::{PropElement, PropfindType},
resource::HandlePropfind,
resource::Resource,
xml::{multistatus::PropstatWrapper, MultistatusElement},
};
use rustical_store::{model::object::CalendarObject, CalendarStore};
@@ -176,7 +176,6 @@ pub async fn get_objects_calendar_query<C: CalendarStore + ?Sized>(
pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
cal_query: CalendarQueryRequest,
req: HttpRequest,
prefix: &str,
principal: &str,
cid: &str,
cal_store: &RwLock<C>,
@@ -197,10 +196,14 @@ pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
let mut responses = Vec::new();
for object in objects {
let path = format!("{}/{}", req.path(), object.get_uid());
let path = CalendarObjectResource::get_url(
req.resource_map(),
vec![principal, cid, object.get_uid()],
)
.unwrap();
responses.push(
CalendarObjectResource::from(object)
.propfind(prefix, &path, props.clone())
.propfind(&path, props.clone(), req.resource_map())
.await?,
);
}

12
crates/caldav/src/calendar/methods/report/mod.rs
View File

@@ -51,22 +51,14 @@ pub async fn route_report_calendar<C: CalendarStore + ?Sized>(
Ok(match request.clone() {
ReportRequest::CalendarQuery(cal_query) => {
handle_calendar_query(cal_query, req, &prefix, &principal, &cid, &cal_store).await?
handle_calendar_query(cal_query, req, &principal, &cid, &cal_store).await?
}
ReportRequest::CalendarMultiget(cal_multiget) => {
handle_calendar_multiget(cal_multiget, req, &prefix, &principal, &cid, &cal_store)
.await?
}
ReportRequest::SyncCollection(sync_collection) => {
handle_sync_collection(
sync_collection,
req,
&prefix.0,
&principal,
&cid,
&cal_store,
)
.await?
handle_sync_collection(sync_collection, req, &principal, &cid, &cal_store).await?
}
})
}

15
crates/caldav/src/calendar/methods/report/sync_collection.rs
View File

@@ -1,7 +1,7 @@
use actix_web::{http::StatusCode, HttpRequest};
use rustical_dav::{
methods::propfind::{PropElement, PropfindType},
resource::HandlePropfind,
resource::Resource,
xml::{
multistatus::{PropstatWrapper, ResponseElement},
MultistatusElement,
@@ -45,7 +45,6 @@ pub struct SyncCollectionRequest {
pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
sync_collection: SyncCollectionRequest,
req: HttpRequest,
prefix: &str,
principal: &str,
cid: &str,
cal_store: &RwLock<C>,
@@ -71,16 +70,22 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
let mut responses = Vec::new();
for object in new_objects {
let path = format!("{}/{}", req.path(), object.get_uid());
let path = CalendarObjectResource::get_url(
req.resource_map(),
vec![principal, cid, &object.get_uid()],
)
.unwrap();
responses.push(
CalendarObjectResource::from(object)
.propfind(prefix, &path, props.clone())
.propfind(&path, props.clone(), req.resource_map())
.await?,
);
}
for object_uid in deleted_objects {
let path = format!("{}/{}", req.path(), object_uid);
let path =
CalendarObjectResource::get_url(req.resource_map(), vec![principal, cid, &object_uid])
.unwrap();
responses.push(ResponseElement {
href: path,
status: Some(format!("HTTP/1.1 {}", StatusCode::NOT_FOUND)),

54
crates/caldav/src/calendar/resource.rs
View File

@@ -1,5 +1,11 @@
use super::prop::{
Resourcetype, SupportedCalendarComponent, SupportedCalendarComponentSet, SupportedCalendarData,
SupportedReportSet, UserPrivilegeSet,
};
use crate::calendar_object::resource::CalendarObjectResource;
use crate::principal::PrincipalResource;
use crate::Error;
use actix_web::dev::ResourceMap;
use actix_web::{web::Data, HttpRequest};
use async_trait::async_trait;
use derive_more::derive::{From, Into};
@@ -12,11 +18,6 @@ use std::sync::Arc;
use strum::{EnumString, VariantNames};
use tokio::sync::RwLock;
use super::prop::{
Resourcetype, SupportedCalendarComponent, SupportedCalendarComponentSet, SupportedCalendarData,
SupportedReportSet, UserPrivilegeSet,
};
pub struct CalendarResourceService<C: CalendarStore + ?Sized> {
pub cal_store: Arc<RwLock<C>>,
pub path: String,
@@ -94,16 +95,21 @@ impl Resource for CalendarResource {
type Prop = CalendarProp;
type Error = Error;
fn get_prop(&self, prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> {
fn get_prop(
&self,
rmap: &ResourceMap,
prop: Self::PropName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
CalendarPropName::Resourcetype => CalendarProp::Resourcetype(Resourcetype::default()),
CalendarPropName::CurrentUserPrincipal => CalendarProp::CurrentUserPrincipal(
HrefElement::new(format!("{}/user/{}/", prefix, self.0.principal)),
),
CalendarPropName::Owner => CalendarProp::Owner(HrefElement::new(format!(
"{}/user/{}/",
prefix, self.0.principal
))),
CalendarPropName::CurrentUserPrincipal => {
CalendarProp::CurrentUserPrincipal(HrefElement::new(
PrincipalResource::get_url(rmap, vec![&self.0.principal]).unwrap(),
))
}
CalendarPropName::Owner => CalendarProp::Owner(HrefElement::new(
PrincipalResource::get_url(rmap, vec![&self.0.principal]).unwrap(),
)),
CalendarPropName::Displayname => CalendarProp::Displayname(self.0.displayname.clone()),
CalendarPropName::CalendarColor => CalendarProp::CalendarColor(self.0.color.clone()),
CalendarPropName::CalendarDescription => {
@@ -219,6 +225,11 @@ impl Resource for CalendarResource {
CalendarPropName::Getctag => Err(rustical_dav::Error::PropReadOnly),
}
}
#[inline]
fn resource_name() -> &'static str {
"caldav_calendar"
}
}
#[async_trait(?Send)]
@@ -242,8 +253,10 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
Ok(calendar.into())
}
async fn get_members(&self) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
// As of now the calendar resource has no members since events are shown with REPORT
async fn get_members(
&self,
rmap: &ResourceMap,
) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
Ok(self
.cal_store
.read()
@@ -251,7 +264,16 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
.get_objects(&self.principal, &self.calendar_id)
.await?
.into_iter()
.map(|event| (format!("{}/{}", self.path, &event.get_uid()), event.into()))
.map(|object| {
(
CalendarObjectResource::get_url(
rmap,
vec![&self.principal, &self.calendar_id, object.get_uid()],
)
.unwrap(),
object.into(),
)
})
.collect())
}

13
crates/caldav/src/calendar_object/resource.rs
View File

@@ -1,5 +1,5 @@
use crate::Error;
use actix_web::{web::Data, HttpRequest};
use actix_web::{dev::ResourceMap, web::Data, HttpRequest};
use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
@@ -51,7 +51,11 @@ impl Resource for CalendarObjectResource {
type Prop = CalendarObjectProp;
type Error = Error;
fn get_prop(&self, _prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> {
fn get_prop(
&self,
_rmap: &ResourceMap,
prop: Self::PropName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
CalendarObjectPropName::Getetag => CalendarObjectProp::Getetag(self.0.get_etag()),
CalendarObjectPropName::CalendarData => {
@@ -62,6 +66,11 @@ impl Resource for CalendarObjectResource {
}
})
}
#[inline]
fn resource_name() -> &'static str {
"caldav_calendar_object"
}
}
#[async_trait(?Send)]

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

@@ -5,9 +5,8 @@ use calendar::resource::CalendarResourceService;
use calendar_object::resource::CalendarObjectResourceService;
use principal::PrincipalResourceService;
use root::RootResourceService;
use rustical_dav::methods::{
propfind::ServicePrefix, route_delete, route_propfind, route_proppatch,
};
use rustical_dav::methods::{propfind::ServicePrefix, route_delete};
use rustical_dav::resource::ResourceService;
use rustical_store::auth::{AuthenticationMiddleware, AuthenticationProvider};
use rustical_store::CalendarStore;
use std::str::FromStr;
@@ -36,8 +35,6 @@ pub fn configure_dav<AP: AuthenticationProvider, C: CalendarStore + ?Sized>(
auth_provider: Arc<AP>,
store: Arc<RwLock<C>>,
) {
let propfind_method = || web::method(Method::from_str("PROPFIND").unwrap());
let proppatch_method = || web::method(Method::from_str("PROPPATCH").unwrap());
let report_method = || web::method(Method::from_str("REPORT").unwrap());
let mkcalendar_method = || web::method(Method::from_str("MKCALENDAR").unwrap());
@@ -55,40 +52,18 @@ pub fn configure_dav<AP: AuthenticationProvider, C: CalendarStore + ?Sized>(
.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(RootResourceService::actix_resource())
.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(PrincipalResourceService::<C>::actix_resource())
.service(
web::scope("/{calendar}")
.service(
web::resource("")
CalendarResourceService::<C>::actix_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>>),
@@ -98,28 +73,20 @@ pub fn configure_dav<AP: AuthenticationProvider, C: CalendarStore + ?Sized>(
)),
)
.service(
web::resource("/{event}")
.route(
propfind_method().to(route_propfind::<
web::scope("/{object}").service(
CalendarObjectResourceService::<C>::actix_resource()
.route(web::method(Method::DELETE).to(route_delete::<
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>),
),
>))
.route(
web::method(Method::GET)
.to(calendar_object::methods::get_event::<C>),
)
.route(
web::method(Method::PUT)
.to(calendar_object::methods::put_event::<C>),
),
),
),
),
),

29
crates/caldav/src/principal/mod.rs
View File

@@ -1,4 +1,5 @@
use crate::Error;
use actix_web::dev::ResourceMap;
use actix_web::web::Data;
use actix_web::HttpRequest;
use async_trait::async_trait;
@@ -14,7 +15,6 @@ use crate::calendar::resource::CalendarResource;
pub struct PrincipalResourceService<C: CalendarStore + ?Sized> {
principal: String,
path: String,
cal_store: Arc<RwLock<C>>,
}
@@ -67,8 +67,13 @@ impl Resource for PrincipalResource {
type Prop = PrincipalProp;
type Error = Error;
fn get_prop(&self, prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> {
let principal_href = HrefElement::new(format!("{}/user/{}/", prefix, self.principal));
fn get_prop(
&self,
rmap: &ResourceMap,
prop: Self::PropName,
) -> Result<Self::Prop, Self::Error> {
let principal_href = HrefElement::new(Self::get_url(rmap, vec![&self.principal]).unwrap());
Ok(match prop {
PrincipalPropName::Resourcetype => PrincipalProp::Resourcetype(Resourcetype::default()),
PrincipalPropName::CurrentUserPrincipal => {
@@ -81,6 +86,11 @@ impl Resource for PrincipalResource {
}
})
}
#[inline]
fn resource_name() -> &'static str {
"caldav_principal"
}
}
#[async_trait(?Send)]
@@ -102,7 +112,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResourceService<C>
Ok(Self {
cal_store,
path: req.path().to_owned(),
principal,
})
}
@@ -116,7 +125,10 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResourceService<C>
})
}
async fn get_members(&self) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
async fn get_members(
&self,
rmap: &ResourceMap,
) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
let calendars = self
.cal_store
.read()
@@ -125,7 +137,12 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResourceService<C>
.await?;
Ok(calendars
.into_iter()
.map(|cal| (format!("{}/{}", &self.path, &cal.id), cal.into()))
.map(|cal| {
(
CalendarResource::get_url(rmap, vec![&self.principal, &cal.id]).unwrap(),
cal.into(),
)
})
.collect())
}

15
crates/caldav/src/root/mod.rs
View File

@@ -1,4 +1,6 @@
use crate::principal::PrincipalResource;
use crate::Error;
use actix_web::dev::ResourceMap;
use actix_web::HttpRequest;
use async_trait::async_trait;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
@@ -47,14 +49,23 @@ impl Resource for RootResource {
type Prop = RootProp;
type Error = Error;
fn get_prop(&self, prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> {
fn get_prop(
&self,
rmap: &ResourceMap,
prop: Self::PropName,
) -> Result<Self::Prop, Self::Error> {
Ok(match prop {
RootPropName::Resourcetype => RootProp::Resourcetype(Resourcetype::default()),
RootPropName::CurrentUserPrincipal => RootProp::CurrentUserPrincipal(HrefElement::new(
format!("{}/user/{}/", prefix, self.principal),
PrincipalResource::get_url(rmap, vec![&self.principal]).unwrap(),
)),
})
}
#[inline]
fn resource_name() -> &'static str {
"caldav_root"
}
}
#[async_trait(?Send)]