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

Make sure collections have trailing slashes (py-caldav is very pedantic about that)

Browse Source
This commit is contained in:
Lennart
2025-06-09 22:23:01 +02:00
parent fc590976bc
commit 6d6f8f20df
13 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ 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,

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

@@ -50,6 +50,7 @@ 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,

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

@@ -45,6 +45,7 @@ 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/lib.rs
View File

@@ -24,7 +24,7 @@ pub struct CalDavPrincipalUri(&'static str);
impl PrincipalUri for CalDavPrincipalUri {
fn principal_uri(&self, principal: &str) -> String {
format!("{}/principal/{}", self.0, principal)
format!("{}/principal/{}/", self.0, principal)
}
}

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

@@ -48,7 +48,7 @@ impl Resource for PrincipalResource {
.map(|principal| puri.principal_uri(principal))
.flat_map(|principal_url| {
self.home_set.iter().map(move |&home_name| {
HrefElement::new(format!("{}/{}", &principal_url, home_name))
HrefElement::new(format!("{}{}/", &principal_url, home_name))
})
})
.collect(),

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

@@ -46,6 +46,7 @@ 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,

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

@@ -41,6 +41,7 @@ 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,

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

@@ -52,6 +52,7 @@ 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/lib.rs
View File

@@ -23,7 +23,7 @@ pub struct CardDavPrincipalUri(&'static str);
impl PrincipalUri for CardDavPrincipalUri {
fn principal_uri(&self, principal: &str) -> String {
format!("{}/principal/{}", self.0, principal)
format!("{}/principal/{}/", self.0, principal)
}
}

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

@@ -55,6 +55,7 @@ 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,

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

@@ -76,8 +76,13 @@ 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('/'), member.get_name()),
&format!("{}/{}", path.trim_end_matches('/'), name),
&propfind_member.prop,
puri,
principal,

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

@@ -18,6 +18,7 @@ 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,

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

@@ -77,6 +77,7 @@ 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())