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

Make prefix a parameter to decrease chaos

Browse Source
This commit is contained in:
Lennart
2024-05-25 22:19:38 +02:00
parent d0f652a951
commit 38f5338ceb
7 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/caldav/src/resources/calendar.rs
View File

@@ -14,7 +14,6 @@ use tokio::sync::RwLock;
pub struct CalendarResource<C: CalendarStore + ?Sized> {
pub cal_store: Arc<RwLock<C>>,
pub path: String,
pub prefix: String,
pub principal: String,
pub calendar_id: String,
}
@@ -160,7 +159,6 @@ pub enum CalendarPropResponse {
pub struct CalendarFile {
pub calendar: Calendar,
pub principal: String,
pub prefix: String,
pub path: String,
}
@@ -168,17 +166,17 @@ impl Resource for CalendarFile {
type PropType = CalendarProp;
type PropResponse = CalendarPropResponse;
fn get_prop(&self, prop: Self::PropType) -> Result<Self::PropResponse> {
fn get_prop(&self, prefix: &str, prop: Self::PropType) -> Result<Self::PropResponse> {
match prop {
CalendarProp::Resourcetype => {
Ok(CalendarPropResponse::Resourcetype(Resourcetype::default()))
}
CalendarProp::CurrentUserPrincipal => Ok(CalendarPropResponse::CurrentUserPrincipal(
HrefElement::new(format!("{}/{}/", self.prefix, self.principal)),
HrefElement::new(format!("{}/{}/", prefix, self.principal)),
)),
CalendarProp::Owner => Ok(CalendarPropResponse::Owner(HrefElement::new(format!(
"{}/{}/",
self.prefix, self.principal
prefix, self.principal
)))),
CalendarProp::Displayname => Ok(CalendarPropResponse::Displayname(TextNode(
self.calendar.name.clone(),
@@ -232,7 +230,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
.map_err(|_e| Error::NotFound)?;
Ok(CalendarFile {
calendar,
prefix: self.prefix.to_owned(),
principal: self.principal.to_owned(),
path: self.path.to_owned(),
})
@@ -247,7 +244,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
req: HttpRequest,
auth_info: AuthInfo,
path_components: Self::PathComponents,
prefix: String,
) -> Result<Self, rustical_dav::error::Error> {
let cal_store = req
.app_data::<Data<RwLock<C>>>()
@@ -256,7 +252,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
.into_inner();
Ok(Self {
prefix,
path: req.path().to_owned(),
principal: auth_info.user_id,
calendar_id: path_components.1,

3
crates/caldav/src/resources/event.rs
View File

@@ -47,7 +47,7 @@ impl Resource for EventFile {
"asd"
}
fn get_prop(&self, prop: Self::PropType) -> Result<Self::PropResponse> {
fn get_prop(&self, _prefix: &str, prop: Self::PropType) -> Result<Self::PropResponse> {
match prop {
EventProp::Getetag => Ok(PrincipalPropResponse::Getetag(TextNode(Some(
self.event.get_etag(),
@@ -76,7 +76,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for EventResource<C> {
req: HttpRequest,
_auth_info: AuthInfo,
path_components: Self::PathComponents,
_prefix: String,
) -> Result<Self, Error> {
let (_principal, cid, uid) = path_components;

16
crates/caldav/src/resources/principal.rs
View File

@@ -15,14 +15,12 @@ use tokio::sync::RwLock;
use super::calendar::CalendarFile;
pub struct PrincipalResource<C: CalendarStore + ?Sized> {
prefix: String,
principal: String,
path: String,
cal_store: Arc<RwLock<C>>,
}
pub struct PrincipalFile {
prefix: String,
principal: String,
path: String,
}
@@ -63,23 +61,23 @@ impl Resource for PrincipalFile {
type PropType = PrincipalProp;
type PropResponse = PrincipalPropResponse;
fn get_prop(&self, prop: Self::PropType) -> Result<Self::PropResponse> {
fn get_prop(&self, prefix: &str, prop: Self::PropType) -> Result<Self::PropResponse> {
match prop {
PrincipalProp::Resourcetype => {
Ok(PrincipalPropResponse::Resourcetype(Resourcetype::default()))
}
PrincipalProp::CurrentUserPrincipal => Ok(PrincipalPropResponse::CurrentUserPrincipal(
HrefElement::new(format!("{}/{}/", self.prefix, self.principal)),
HrefElement::new(format!("{}/{}/", prefix, self.principal)),
)),
PrincipalProp::PrincipalUrl => Ok(PrincipalPropResponse::PrincipalUrl(
HrefElement::new(format!("{}/{}/", self.prefix, self.principal)),
HrefElement::new(format!("{}/{}/", prefix, self.principal)),
)),
PrincipalProp::CalendarHomeSet => Ok(PrincipalPropResponse::CalendarHomeSet(
HrefElement::new(format!("{}/{}/", self.prefix, self.principal)),
HrefElement::new(format!("{}/{}/", prefix, self.principal)),
)),
PrincipalProp::CalendarUserAddressSet => {
Ok(PrincipalPropResponse::CalendarUserAddressSet(
HrefElement::new(format!("{}/{}/", self.prefix, self.principal)),
HrefElement::new(format!("{}/{}/", prefix, self.principal)),
))
}
}
@@ -100,7 +98,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
req: HttpRequest,
auth_info: AuthInfo,
_path_components: Self::PathComponents,
prefix: String,
) -> Result<Self, rustical_dav::error::Error> {
let cal_store = req
.app_data::<Data<RwLock<C>>>()
@@ -112,14 +109,12 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
cal_store,
path: req.path().to_owned(),
principal: auth_info.user_id,
prefix,
})
}
async fn get_file(&self) -> Result<Self::File> {
Ok(PrincipalFile {
principal: self.principal.to_owned(),
prefix: self.prefix.to_owned(),
path: self.path.to_owned(),
})
}
@@ -136,7 +131,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
.map(|cal| CalendarFile {
calendar: cal,
principal: self.principal.to_owned(),
prefix: self.prefix.to_owned(),
path: self.path.to_owned(),
})
.collect())

9
crates/caldav/src/resources/root.rs
View File

@@ -9,7 +9,6 @@ use serde::Serialize;
use strum::{EnumString, IntoStaticStr, VariantNames};
pub struct RootResource {
prefix: String,
principal: String,
path: String,
}
@@ -35,7 +34,6 @@ pub enum RootPropResponse {
}
pub struct RootFile {
pub prefix: String,
pub principal: String,
pub path: String,
}
@@ -44,11 +42,11 @@ impl Resource for RootFile {
type PropType = RootProp;
type PropResponse = RootPropResponse;
fn get_prop(&self, prop: Self::PropType) -> Result<Self::PropResponse> {
fn get_prop(&self, prefix: &str, prop: Self::PropType) -> Result<Self::PropResponse> {
match prop {
RootProp::Resourcetype => Ok(RootPropResponse::Resourcetype(Resourcetype::default())),
RootProp::CurrentUserPrincipal => Ok(RootPropResponse::CurrentUserPrincipal(
HrefElement::new(format!("{}/{}/", self.prefix, self.principal)),
HrefElement::new(format!("{}/{}/", prefix, self.principal)),
)),
}
}
@@ -72,10 +70,8 @@ impl ResourceService for RootResource {
req: HttpRequest,
auth_info: AuthInfo,
_path_components: Self::PathComponents,
prefix: String,
) -> Result<Self, Error> {
Ok(Self {
prefix,
principal: auth_info.user_id,
path: req.path().to_string(),
})
@@ -85,7 +81,6 @@ impl ResourceService for RootResource {
Ok(RootFile {
path: self.path.to_owned(),
principal: self.principal.to_owned(),
prefix: self.prefix.to_owned(),
})
}
}

8
crates/caldav/src/routes/calendar.rs
View File

@@ -9,6 +9,7 @@ use roxmltree::{Node, NodeType};
use rustical_auth::{AuthInfoExtractor, CheckAuthentication};
use rustical_dav::dav_resource::HandlePropfind;
use rustical_dav::namespace::Namespace;
use rustical_dav::propfind::ServicePrefix;
use rustical_dav::xml_snippets::generate_multistatus;
use rustical_store::calendar::{Calendar, CalendarStore};
use rustical_store::event::Event;
@@ -39,6 +40,7 @@ async fn handle_report_calendar_query<C: CalendarStore + ?Sized>(
_request: HttpRequest,
events: Vec<Event>,
_cal_store: Arc<RwLock<C>>,
prefix: &str,
) -> Result<HttpResponse, Error> {
let prop_node = query_node
.children()
@@ -62,7 +64,7 @@ async fn handle_report_calendar_query<C: CalendarStore + ?Sized>(
.collect();
let mut event_responses = Vec::new();
for event_file in event_files {
event_responses.push(event_file.propfind(props.clone()).await?);
event_responses.push(event_file.propfind(prefix, props.clone()).await?);
}
// let event_results: Result<Vec<_>, _> = event_files
// .iter()
@@ -90,9 +92,11 @@ pub async fn route_report_calendar<A: CheckAuthentication, C: CalendarStore + ?S
path: Path<(String, String)>,
request: HttpRequest,
_auth: AuthInfoExtractor<A>,
prefix: Data<ServicePrefix>,
) -> Result<HttpResponse, Error> {
// TODO: Check authorization
let (_principal, cid) = path.into_inner();
let prefix = &prefix.0;
let doc = roxmltree::Document::parse(&body).map_err(|_e| Error::BadRequest)?;
let query_node = doc.root_element();
@@ -104,7 +108,7 @@ pub async fn route_report_calendar<A: CheckAuthentication, C: CalendarStore + ?S
"calendar-multiget" => {}
_ => return Err(Error::BadRequest),
};
handle_report_calendar_query(query_node, request, events, context.store.clone()).await
handle_report_calendar_query(query_node, request, events, context.store.clone(), prefix).await
}
pub async fn handle_mkcol_calendar_set<C: CalendarStore + ?Sized>(

8
crates/dav/src/dav_resource.rs
View File

@@ -17,7 +17,7 @@ pub trait Resource {
Self::PropType::VARIANTS
}
fn get_prop(&self, prop: Self::PropType) -> Result<Self::PropResponse>;
fn get_prop(&self, prefix: &str, prop: Self::PropType) -> Result<Self::PropResponse>;
fn get_path(&self) -> &str;
}
@@ -36,7 +36,6 @@ pub trait ResourceService: Sized {
req: HttpRequest,
auth_info: AuthInfo,
path_components: Self::PathComponents,
prefix: String,
) -> Result<Self, Error>;
async fn get_file(&self) -> Result<Self::File>;
@@ -73,13 +72,14 @@ enum PropstatType<T1: Serialize, T2: Serialize> {
#[async_trait(?Send)]
pub trait HandlePropfind {
async fn propfind(&self, props: Vec<&str>) -> Result<impl Serialize>;
async fn propfind(&self, prefix: &str, props: Vec<&str>) -> Result<impl Serialize>;
}
#[async_trait(?Send)]
impl<R: Resource> HandlePropfind for R {
async fn propfind(
&self,
prefix: &str,
props: Vec<&str>,
) -> Result<PropstatResponseElement<PropWrapper<Vec<R::PropResponse>>, TagList>> {
let mut props = props.into_iter().unique().collect_vec();
@@ -95,7 +95,7 @@ impl<R: Resource> HandlePropfind for R {
let mut prop_responses = Vec::new();
for prop in props {
if let Ok(valid_prop) = R::PropType::from_str(prop) {
match self.get_prop(valid_prop.clone()) {
match self.get_prop(prefix, valid_prop.clone()) {
Ok(response) => {
prop_responses.push(response);
}

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

@@ -87,15 +87,15 @@ pub async fn handle_propfind<
let prefix = prefix.0.to_owned();
let path_components = path.into_inner();
let resource_service = R::new(req, auth_info.clone(), path_components.clone(), prefix).await?;
let resource_service = R::new(req, auth_info.clone(), path_components.clone()).await?;
let resource = resource_service.get_file().await?;
let response = resource.propfind(props.clone()).await?;
let response = resource.propfind(&prefix, props.clone()).await?;
let mut member_responses = Vec::new();
if depth != Depth::Zero {
for member in resource_service.get_members(auth_info).await? {
member_responses.push(member.propfind(props.clone()).await?);
member_responses.push(member.propfind(&prefix, props.clone()).await?);
}
}