From 0dbc05345b150931fc874b5f19021e2c9569068c Mon Sep 17 00:00:00 2001 From: Lennart K <18233294+lennart-k@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:43:39 +0200 Subject: [PATCH] caldav: Support MKCOL method --- .../caldav/src/calendar/methods/mkcalendar.rs | 57 +++++++++++++++---- crates/caldav/src/calendar/service.rs | 7 +++ 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/crates/caldav/src/calendar/methods/mkcalendar.rs b/crates/caldav/src/calendar/methods/mkcalendar.rs index c3cd9aa..e2f52ef 100644 --- a/crates/caldav/src/calendar/methods/mkcalendar.rs +++ b/crates/caldav/src/calendar/methods/mkcalendar.rs @@ -3,7 +3,7 @@ use crate::calendar::CalendarResourceService; use crate::calendar::prop::SupportedCalendarComponentSet; use axum::extract::{Path, State}; use axum::response::{IntoResponse, Response}; -use http::StatusCode; +use http::{Method, StatusCode}; use rustical_ical::CalendarObjectType; use rustical_store::auth::User; use rustical_store::{Calendar, CalendarStore, SubscriptionStore}; @@ -49,19 +49,31 @@ struct MkcalendarRequest { set: PropElement, } +#[derive(XmlDeserialize, XmlRootTag, Clone, Debug)] +#[xml(root = b"mkcol")] +#[xml(ns = "rustical_dav::namespace::NS_DAV")] +struct MkcolRequest { + #[xml(ns = "rustical_dav::namespace::NS_DAV")] + set: PropElement, +} + #[instrument(skip(cal_store))] pub async fn route_mkcalendar( Path((principal, cal_id)): Path<(String, String)>, user: User, State(CalendarResourceService { cal_store, .. }): State>, + method: Method, body: String, ) -> Result { if !user.is_principal(&principal) { return Err(Error::Unauthorized); } - let request = MkcalendarRequest::parse_str(&body)?; - let request = request.set.prop; + let request = match method.as_str() { + "MKCALENDAR" => MkcalendarRequest::parse_str(&body)?.set.prop, + "MKCOL" => MkcolRequest::parse_str(&body)?.set.prop, + _ => unreachable!("We never call with another method"), + }; let calendar = Calendar { id: cal_id.to_owned(), @@ -86,15 +98,9 @@ pub async fn route_mkcalendar( ]), }; - match cal_store.insert_calendar(calendar).await { - // The spec says we should return a mkcalendar-response but I don't know what goes into it. - // However, it works without one but breaks on iPadOS when using an empty one :) - Ok(()) => Ok(StatusCode::CREATED.into_response()), - Err(err) => { - dbg!(err.to_string()); - Err(err.into()) - } - } + cal_store.insert_calendar(calendar).await?; + // The spec says we don't have to return a response everything was successful + Ok(StatusCode::CREATED.into_response()) } #[cfg(test)] @@ -127,4 +133,31 @@ mod tests { "#).unwrap(); } + + #[test] + fn test_xml_mkcol() { + MkcolRequest::parse_str(r#" + + + + + + + + + jfs + rggg + #FFF8DCFF + Europe/Berlin + + + + + + BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nLAST-MODIFIED:20240422T053450Z\r\nTZURL:https://www.tzurl.org/zoneinfo/Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nX-PROLEPTIC-TZNAME:LMT\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+005328\r\nTZOFFSETTO:+0100\r\nDTSTART:18930401T000632\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZNAME:CEST\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nDTSTART:19160430T230000\r\nRDATE:19400401T020000\r\nRDATE:19430329T020000\r\nRDATE:19460414T020000\r\nRDATE:19470406T030000\r\nRDATE:19480418T020000\r\nRDATE:19490410T020000\r\nRDATE:19800406T020000\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nDTSTART:19161001T010000\r\nRDATE:19421102T030000\r\nRDATE:19431004T030000\r\nRDATE:19441002T030000\r\nRDATE:19451118T030000\r\nRDATE:19461007T030000\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZNAME:CEST\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nDTSTART:19170416T020000\r\nRRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYMONTH=4;BYDAY=3MO\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nDTSTART:19170917T030000\r\nRRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYMONTH=9;BYDAY=3MO\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZNAME:CEST\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nDTSTART:19440403T020000\r\nRRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYMONTH=4;BYDAY=1MO\r\nEND:DAYLIGHT\r\nBEGIN:DAYLIGHT\r\nTZNAME:CEMT\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0300\r\nDTSTART:19450524T000000\r\nRDATE:19470511T010000\r\nEND:DAYLIGHT\r\nBEGIN:DAYLIGHT\r\nTZNAME:CEST\r\nTZOFFSETFROM:+0300\r\nTZOFFSETTO:+0200\r\nDTSTART:19450924T030000\r\nRDATE:19470629T030000\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0100\r\nDTSTART:19460101T000000\r\nRDATE:19800101T000000\r\nEND:STANDARD\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nDTSTART:19471005T030000\r\nRRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYMONTH=10;BYDAY=1SU\r\nEND:STANDARD\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nDTSTART:19800928T030000\r\nRRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYMONTH=9;BYDAY=-1SU\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZNAME:CEST\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nDTSTART:19810329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZNAME:CET\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nDTSTART:19961027T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nEND:VCALENDAR\r\n + + + + "#).unwrap(); + } } diff --git a/crates/caldav/src/calendar/service.rs b/crates/caldav/src/calendar/service.rs index 62244e6..e82a46b 100644 --- a/crates/caldav/src/calendar/service.rs +++ b/crates/caldav/src/calendar/service.rs @@ -125,4 +125,11 @@ impl AxumMethods for CalendarResourceSer Box::pin(Service::call(&mut service, req)) }) } + + fn mkcol() -> Option BoxFuture<'static, Result>> { + Some(|state, req| { + let mut service = Handler::with_state(route_mkcalendar::, state); + Box::pin(Service::call(&mut service, req)) + }) + } }