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

Fix bug with missing trailing slash in propfind response

Browse Source
This commit is contained in:
Lennart
2025-06-09 22:36:11 +02:00
parent 6d6f8f20df
commit 7628cdafbd
22 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ fn objects_response(
object,
principal: principal.to_owned(),
}
.propfind_typed(&path, prop, puri, user)?,
.propfind(&path, prop, puri, user)?,
);
}

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

@@ -39,7 +39,7 @@ pub async fn handle_sync_collection<C: CalendarStore>(
object,
principal: principal.to_owned(),
}
.propfind_typed(&path, &sync_collection.prop, puri, user)?,
.propfind(&path, &sync_collection.prop, puri, user)?,
);
}

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

@@ -100,6 +100,8 @@ impl Resource for CalendarResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = true;
fn get_resourcetype(&self) -> Resourcetype {
if self.cal.subscription_url.is_none() {
Resourcetype(&[

1
crates/caldav/src/calendar/service.rs
View File

@@ -50,7 +50,6 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
type PrincipalUri = CalDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
const IS_COLLECTION: bool = true;
async fn get_resource(
&self,

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

@@ -27,6 +27,8 @@ impl Resource for CalendarObjectResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = false;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[])
}

1
crates/caldav/src/calendar_object/service.rs
View File

@@ -50,7 +50,6 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
type PrincipalUri = CalDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
const IS_COLLECTION: bool = false;
async fn get_resource(
&self,

2
crates/caldav/src/calendar_set/mod.rs
View File

@@ -28,6 +28,8 @@ impl Resource for CalendarSetResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = true;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[ResourcetypeInner(
Some(rustical_dav::namespace::NS_DAV),

1
crates/caldav/src/calendar_set/service.rs
View File

@@ -45,7 +45,6 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarSetReso
type PrincipalUri = CalDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, extended-mkcol, calendar-access";
const IS_COLLECTION: bool = true;
async fn get_resource(
&self,

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

@@ -27,6 +27,8 @@ impl Resource for PrincipalResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = true;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[
ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),

1
crates/caldav/src/principal/service.rs
View File

@@ -46,7 +46,6 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: Ca
type PrincipalUri = CalDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
const IS_COLLECTION: bool = true;
async fn get_resource(
&self,

2
crates/carddav/src/address_object/resource.rs
View File

@@ -32,6 +32,8 @@ impl Resource for AddressObjectResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = false;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[])
}

1
crates/carddav/src/address_object/service.rs
View File

@@ -41,7 +41,6 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
type PrincipalUri = CardDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, addressbook";
const IS_COLLECTION: bool = false;
async fn get_resource(
&self,

2
crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs
View File

@@ -80,7 +80,7 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
object,
principal: principal.to_owned(),
}
.propfind_typed(&path, prop, puri, user)?,
.propfind(&path, prop, puri, user)?,
);
}

2
crates/carddav/src/addressbook/methods/report/sync_collection.rs
View File

@@ -39,7 +39,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
object,
principal: principal.to_owned(),
}
.propfind_typed(&path, &sync_collection.prop, puri, user)?,
.propfind(&path, &sync_collection.prop, puri, user)?,
);
}

2
crates/carddav/src/addressbook/resource.rs
View File

@@ -38,6 +38,8 @@ impl Resource for AddressbookResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = true;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[
ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),

1
crates/carddav/src/addressbook/service.rs
View File

@@ -52,7 +52,6 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
type PrincipalUri = CardDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, addressbook";
const IS_COLLECTION: bool = true;
async fn get_resource(
&self,

2
crates/carddav/src/principal/mod.rs
View File

@@ -26,6 +26,8 @@ impl Resource for PrincipalResource {
type Error = Error;
type Principal = User;
const IS_COLLECTION: bool = true;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[
ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),

1
crates/carddav/src/principal/service.rs
View File

@@ -55,7 +55,6 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
type PrincipalUri = CardDavPrincipalUri;
const DAV_HEADER: &str = "1, 3, access-control, addressbook";
const IS_COLLECTION: bool = true;
async fn get_resource(
&self,

11
crates/dav/src/resource/methods/propfind.rs
View File

@@ -76,13 +76,8 @@ pub(crate) async fn route_propfind<R: ResourceService>(
let mut member_responses = Vec::new();
if depth != &Depth::Zero {
for member in resource_service.get_members(path_components).await? {
// Collections should have a trailing slash
let mut name = member.get_name();
if R::IS_COLLECTION {
name.push('/')
}
member_responses.push(member.propfind_typed(
&format!("{}/{}", path.trim_end_matches('/'), name),
member_responses.push(member.propfind(
&format!("{}/{}", path.trim_end_matches('/'), member.get_name()),
&propfind_member.prop,
puri,
principal,
@@ -90,7 +85,7 @@ pub(crate) async fn route_propfind<R: ResourceService>(
}
}
let response = resource.propfind_typed(path, &propfind_self.prop, puri, principal)?;
let response = resource.propfind(path, &propfind_self.prop, puri, principal)?;
Ok(MultistatusElement {
responses: vec![response],

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

@@ -37,6 +37,8 @@ pub trait Resource: Clone + Send + 'static {
type Error: From<crate::Error>;
type Principal: Principal;
const IS_COLLECTION: bool;
fn get_resourcetype(&self) -> Resourcetype;
fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
@@ -95,13 +97,19 @@ pub trait Resource: Clone + Send + 'static {
principal: &Self::Principal,
) -> Result<UserPrivilegeSet, Self::Error>;
fn propfind_typed(
fn propfind(
&self,
path: &str,
prop: &PropfindType<<Self::Prop as PropName>::Names>,
principal_uri: &impl PrincipalUri,
principal: &Self::Principal,
) -> Result<ResponseElement<Self::Prop>, Self::Error> {
// Collections have a trailing slash
let mut path = path.to_string();
if Self::IS_COLLECTION && !path.ends_with('/') {
path.push('/');
}
// TODO: Support include element
let (props, invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) = match prop
{

1
crates/dav/src/resource/resource_service.rs
View File

@@ -18,7 +18,6 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
type PrincipalUri: PrincipalUri;
const DAV_HEADER: &'static str;
const IS_COLLECTION: bool;
async fn get_members(
&self,

3
crates/dav/src/resources/root.rs
View File

@@ -24,6 +24,8 @@ impl<PR: Resource, P: Principal> Resource for RootResource<PR, P> {
type Error = PR::Error;
type Principal = P;
const IS_COLLECTION: bool = true;
fn get_resourcetype(&self) -> Resourcetype {
Resourcetype(&[ResourcetypeInner(
Some(crate::namespace::NS_DAV),
@@ -77,7 +79,6 @@ where
type PrincipalUri = PURI;
const DAV_HEADER: &str = "1, 3, access-control";
const IS_COLLECTION: bool = true;
async fn get_resource(&self, _: &()) -> Result<Self::Resource, Self::Error> {
Ok(RootResource::<PRS::Resource, P>::default())