version 0.9.8: revert to Rust 1.89 since 1.90 fully online yet

#125

Cargo.toml

@@ -2,9 +2,10 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.8.0"
+version = "0.9.8"
 edition = "2024"
 description = "A CalDAV server"
+documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"
 
@@ -16,7 +17,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = false
+publish = true
 
 [features]
 debug = ["opentelemetry"]
@@ -48,7 +49,7 @@ rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
 lazy_static = "1.5"
-rstest = "0.25"
+rstest = "0.26"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -61,7 +62,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.37" }
+quick-xml = { version = "0.38" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.89-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -45,4 +45,5 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000

README.md

@@ -4,14 +4,15 @@ a CalDAV/CardDAV server
 
 > [!WARNING]
   RustiCal is under **active development**!
-  While I've been successfully using RustiCal productively for a few weeks now,
+  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
   you'd still be one of the first testers so expect bugs and rough edges.
-  If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
+- Import your existing calendars in the frontend
 - **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)

about.toml

@@ -7,6 +7,7 @@ accepted = [
   "CDLA-Permissive-2.0",
   "Zlib",
   "AGPL-3.0",
+  "GPL-3.0",
   "MPL-2.0",
 ]
 workarounds = ["ring", "chrono", "rustls"]

crates/caldav/Cargo.toml

@@ -11,6 +11,7 @@ publish = false
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 rstest.workspace = true
 async-std.workspace = true
+serde_json.workspace = true
 
 [dependencies]
 axum.workspace = true

crates/caldav/src/calendar/methods/get.rs

@@ -37,52 +37,71 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         .await?;
 
     let mut timezones = HashMap::new();
+    let mut vtimezones = HashMap::new();
     let objects = cal_store.get_objects(&principal, &calendar_id).await?;
 
     let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
         .gregorian()
         .prodid("RustiCal");
-    if calendar.displayname.is_some() {
+    if let Some(displayname) = calendar.meta.displayname {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALNAME".to_owned(),
-            value: calendar.displayname,
+            value: Some(displayname),
             params: None,
         });
     }
-    if calendar.description.is_some() {
+    if let Some(description) = calendar.meta.description {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALDESC".to_owned(),
-            value: calendar.description,
+            value: Some(description),
             params: None,
         });
     }
-    if calendar.timezone_id.is_some() {
+    if let Some(timezone_id) = calendar.timezone_id {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-TIMEZONE".to_owned(),
-            value: calendar.timezone_id,
+            value: Some(timezone_id),
             params: None,
         });
     }
 
     for object in &objects {
+        vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
-            CalendarObjectComponent::Event(EventObject {
+            CalendarObjectComponent::Event(
-                event,
+                EventObject {
-                timezones: object_timezones,
+                    event,
-                ..
+                    timezones: object_timezones,
-            }) => {
+                    ..
+                },
+                overrides,
+            ) => {
                 timezones.extend(object_timezones);
                 ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
+                for _override in overrides {
+                    ical_calendar_builder =
+                        ical_calendar_builder.add_event(_override.event.clone());
+                }
             }
-            CalendarObjectComponent::Todo(TodoObject(todo)) => {
+            CalendarObjectComponent::Todo(TodoObject(todo), overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_todo(_override.0.clone());
+                }
             }
-            CalendarObjectComponent::Journal(JournalObject(journal)) => {
+            CalendarObjectComponent::Journal(JournalObject(journal), overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_journal(_override.0.clone());
+                }
             }
         }
     }
 
+    for vtimezone in vtimezones.into_values() {
+        ical_calendar_builder = ical_calendar_builder.add_tz(vtimezone.to_owned());
+    }
+
     let ical_calendar = ical_calendar_builder
         .build()
         .map_err(|parser_error| Error::IcalError(parser_error.into()))?;

crates/caldav/src/calendar/methods/import.rs

@@ -0,0 +1,110 @@
+use crate::Error;
+use crate::calendar::CalendarResourceService;
+use axum::{
+    extract::{Path, State},
+    response::{IntoResponse, Response},
+};
+use http::StatusCode;
+use ical::{
+    generator::Emitter,
+    parser::{Component, ComponentMut},
+};
+use rustical_dav::header::Overwrite;
+use rustical_ical::{CalendarObject, CalendarObjectType};
+use rustical_store::{
+    Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
+};
+use std::io::BufReader;
+use tracing::instrument;
+
+#[instrument(skip(resource_service))]
+pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
+    Path((principal, cal_id)): Path<(String, String)>,
+    user: Principal,
+    State(resource_service): State<CalendarResourceService<C, S>>,
+    overwrite: Overwrite,
+    body: String,
+) -> Result<Response, Error> {
+    if !user.is_principal(&principal) {
+        return Err(Error::Unauthorized);
+    }
+
+    let mut parser = ical::IcalParser::new(BufReader::new(body.as_bytes()));
+    let mut cal = parser
+        .next()
+        .expect("input must contain calendar")
+        .unwrap()
+        .mutable();
+    if parser.next().is_some() {
+        return Err(rustical_ical::Error::InvalidData(
+            "multiple calendars, only one allowed".to_owned(),
+        )
+        .into());
+    }
+
+    // Extract calendar metadata
+    let displayname = cal
+        .get_property("X-WR-CALNAME")
+        .and_then(|prop| prop.value.to_owned());
+    let description = cal
+        .get_property("X-WR-CALDESC")
+        .and_then(|prop| prop.value.to_owned());
+    let timezone_id = cal
+        .get_property("X-WR-TIMEZONE")
+        .and_then(|prop| prop.value.to_owned());
+    // These properties should not appear in the expanded calendar objects
+    cal.remove_property("X-WR-CALNAME");
+    cal.remove_property("X-WR-CALDESC");
+    cal.remove_property("X-WR-TIMEZONE");
+    let cal = cal.verify().unwrap();
+    // Make sure timezone is valid
+    if let Some(timezone_id) = timezone_id.as_ref() {
+        assert!(
+            vtimezones_rs::VTIMEZONES.contains_key(timezone_id),
+            "Invalid calendar timezone id"
+        );
+    }
+
+    // Extract necessary component types
+    let mut cal_components = vec![];
+    if !cal.events.is_empty() {
+        cal_components.push(CalendarObjectType::Event);
+    }
+    if !cal.journals.is_empty() {
+        cal_components.push(CalendarObjectType::Journal);
+    }
+    if !cal.todos.is_empty() {
+        cal_components.push(CalendarObjectType::Todo);
+    }
+
+    let expanded_cals = cal.expand_calendar();
+    // Janky way to convert between IcalCalendar and CalendarObject
+    let objects = expanded_cals
+        .into_iter()
+        .map(|cal| cal.generate())
+        .map(CalendarObject::from_ics)
+        .collect::<Result<Vec<_>, _>>()?;
+    let new_cal = Calendar {
+        principal,
+        id: cal_id,
+        meta: CalendarMetadata {
+            displayname,
+            order: 0,
+            description,
+            color: None,
+        },
+        timezone_id,
+        deleted_at: None,
+        synctoken: 0,
+        subscription_url: None,
+        push_topic: uuid::Uuid::new_v4().to_string(),
+        components: cal_components,
+    };
+
+    let cal_store = resource_service.cal_store;
+    cal_store
+        .import_calendar(new_cal, objects, overwrite.is_true())
+        .await?;
+
+    Ok(StatusCode::OK.into_response())
+}

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -8,7 +8,7 @@ use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
@@ -46,7 +46,7 @@ pub struct PropElement {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcalendar")]
+#[xml(root = "mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -54,7 +54,7 @@ struct MkcalendarRequest {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -112,11 +112,13 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
-        order: request.calendar_order.unwrap_or(0),
+        meta: CalendarMetadata {
-        displayname: request.displayname,
+            order: request.calendar_order.unwrap_or(0),
+            displayname: request.displayname,
+            color: request.calendar_color,
+            description: request.calendar_description,
+        },
         timezone_id,
-        color: request.calendar_color,
-        description: request.calendar_description,
         deleted_at: None,
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),

crates/caldav/src/calendar/methods/mod.rs

@@ -1,4 +1,5 @@
 pub mod get;
+pub mod import;
 pub mod mkcalendar;
 pub mod post;
 pub mod report;

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -116,19 +116,17 @@ impl CompFilterElement {
         // TODO: Implement prop-filter (and comp-filter?) at some point
 
         if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start {
+            if let Some(start) = &time_range.start
-                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
+                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
-                    if start.deref() > &last_occurence.utc() {
+                && start.deref() > &last_occurence.utc()
-                        return false;
+            {
-                    }
+                return false;
-                };
             }
-            if let Some(end) = &time_range.end {
+            if let Some(end) = &time_range.end
-                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
+                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
-                    if end.deref() < &first_occurence.utc() {
+                && end.deref() < &first_occurence.utc()
-                        return false;
+            {
-                    }
+                return false;
-                };
             }
         }
         true
@@ -156,15 +154,15 @@ impl From<&FilterElement> for CalendarQuery {
         for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
             // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
             // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
-                if let Some(time_range) = &comp_filter.time_range {
+                && let Some(time_range) = &comp_filter.time_range
-                    let start = time_range.start.as_ref().map(|start| start.date_naive());
+            {
-                    let end = time_range.end.as_ref().map(|end| end.date_naive());
+                let start = time_range.start.as_ref().map(|start| start.date_naive());
-                    return CalendarQuery {
+                let end = time_range.end.as_ref().map(|end| end.date_naive());
-                        time_start: start,
+                return CalendarQuery {
-                        time_end: end,
+                    time_start: start,
-                    };
+                    time_end: end,
-                }
+                };
             }
         }
         Default::default()

crates/caldav/src/calendar/mod.rs

@@ -4,3 +4,6 @@ pub mod resource;
 mod service;
 
 pub use service::CalendarResourceService;
+
+#[cfg(test)]
+pub mod tests;

crates/caldav/src/calendar/resource.rs

@@ -16,6 +16,7 @@ use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
+use serde::Deserialize;
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
@@ -62,7 +63,7 @@ pub enum CalendarPropWrapper {
     Common(CommonPropertiesProp),
 }
 
-#[derive(Clone, Debug, From, Into)]
+#[derive(Clone, Debug, From, Into, Deserialize)]
 pub struct CalendarResource {
     pub cal: Calendar,
     pub read_only: bool,
@@ -127,10 +128,10 @@ impl Resource for CalendarResource {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                 CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.color.clone())
+                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
                 }
                 CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
                     CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
@@ -145,7 +146,7 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                 }
                 CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -186,11 +187,11 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
                 CalendarProp::CalendarColor(color) => {
-                    self.cal.color = color;
+                    self.cal.meta.color = color;
                     Ok(())
                 }
                 CalendarProp::CalendarDescription(description) => {
-                    self.cal.description = description;
+                    self.cal.meta.description = description;
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
@@ -224,18 +225,18 @@ impl Resource for CalendarResource {
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id {
+                    if let Some(tzid) = &timezone_id
-                        if !vtimezones_rs::VTIMEZONES.contains_key(tzid) {
+                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
-                            return Err(rustical_dav::Error::BadRequest(format!(
+                    {
-                                "Invalid timezone-id: {tzid}"
+                        return Err(rustical_dav::Error::BadRequest(format!(
-                            )));
+                            "Invalid timezone-id: {tzid}"
-                        }
+                        )));
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
                 }
                 CalendarProp::CalendarOrder(order) => {
-                    self.cal.order = order.unwrap_or_default();
+                    self.cal.meta.order = order.unwrap_or_default();
                     Ok(())
                 }
                 CalendarProp::SupportedCalendarComponentSet(comp_set) => {
@@ -263,11 +264,11 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
                 CalendarPropName::CalendarColor => {
-                    self.cal.color = None;
+                    self.cal.meta.color = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarDescription => {
-                    self.cal.description = None;
+                    self.cal.meta.description = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
@@ -276,7 +277,7 @@ impl Resource for CalendarResource {
                 }
                 CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                 CalendarPropName::CalendarOrder => {
-                    self.cal.order = 0;
+                    self.cal.meta.order = 0;
                     Ok(())
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
@@ -299,10 +300,10 @@ impl Resource for CalendarResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.cal.displayname.as_deref()
+        self.cal.meta.displayname.as_deref()
     }
     fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.displayname = name;
+        self.cal.meta.displayname = name;
         Ok(())
     }
 

crates/caldav/src/calendar/service.rs

@@ -1,4 +1,5 @@
 use crate::calendar::methods::get::route_get;
+use crate::calendar::methods::import::route_import;
 use crate::calendar::methods::mkcalendar::route_mkcalendar;
 use crate::calendar::methods::post::route_post;
 use crate::calendar::methods::report::route_report_calendar;
@@ -138,6 +139,13 @@ impl<C: CalendarStore, S: SubscriptionStore> AxumMethods for CalendarResourceSer
         })
     }
 
+    fn import() -> Option<rustical_dav::resource::MethodFunction<Self>> {
+        Some(|state, req| {
+            let mut service = Handler::with_state(route_import::<C, S>, state);
+            Box::pin(Service::call(&mut service, req))
+        })
+    }
+
     fn mkcalendar() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>>
     {
         Some(|state, req| {

crates/caldav/src/calendar/test_files/propfind.outputs

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns:CS="http://calendarserver.org/ns/" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns="DAV:" xmlns:PUSH="https://bitfire.at/webdav-push">
+    <href>/caldav/principal/user/calendar/</href>
+    <propstat>
+        <prop>
+            <calendar-color xmlns="http://apple.com/ns/ical/"/>
+            <calendar-description xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <calendar-order xmlns="http://apple.com/ns/ical/"/>
+            <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <max-resource-size xmlns="DAV:"/>
+            <supported-report-set xmlns="DAV:"/>
+            <source xmlns="http://calendarserver.org/ns/"/>
+            <min-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <max-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <sync-token xmlns="DAV:"/>
+            <getctag xmlns="http://calendarserver.org/ns/"/>
+            <transports xmlns="https://bitfire.at/webdav-push"/>
+            <topic xmlns="https://bitfire.at/webdav-push"/>
+            <supported-triggers xmlns="https://bitfire.at/webdav-push"/>
+            <resourcetype xmlns="DAV:"/>
+            <displayname xmlns="DAV:"/>
+            <current-user-principal xmlns="DAV:"/>
+            <current-user-privilege-set xmlns="DAV:"/>
+            <owner xmlns="DAV:"/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+    </propstat>
+</response>
+
+
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns:CS="http://calendarserver.org/ns/" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns="DAV:" xmlns:PUSH="https://bitfire.at/webdav-push">
+    <href>/caldav/principal/user/calendar/</href>
+    <propstat>
+        <prop>
+            <CAL:calendar-timezone>BEGIN:VCALENDAR
+PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+LAST-MODIFIED:20250723T190331Z
+X-LIC-LOCATION:Europe/Berlin
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005328
+TZOFFSETTO:+0100
+DTSTART:18930401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19460414T020000
+RDATE:19470406T030000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451118T030000
+RDATE:19461007T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEMT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19450524T020000
+RDATE:19470511T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19450924T030000
+RDATE:19470629T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19460101T000000
+RDATE:19800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
+</CAL:calendar-timezone>
+            <CAL:timezone-service-set>
+                <href>https://www.iana.org/time-zones</href>
+            </CAL:timezone-service-set>
+            <CAL:calendar-timezone-id>Europe/Berlin</CAL:calendar-timezone-id>
+            <calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
+            <CAL:supported-calendar-component-set>
+                <CAL:comp name="VEVENT"/>
+                <CAL:comp name="VTODO"/>
+            </CAL:supported-calendar-component-set>
+            <CAL:supported-calendar-data>
+                <CAL:calendar-data content-type="text/calendar" version="2.0"/>
+            </CAL:supported-calendar-data>
+            <max-resource-size>10000000</max-resource-size>
+            <supported-report-set>
+                <supported-report>
+                    <report>
+                        <CAL:calendar-query/>
+                    </report>
+                </supported-report>
+                <supported-report>
+                    <report>
+                        <CAL:calendar-multiget/>
+                    </report>
+                </supported-report>
+                <supported-report>
+                    <report>
+                        <sync-collection/>
+                    </report>
+                </supported-report>
+            </supported-report-set>
+            <CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
+            <CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
+            <sync-token>github.com/lennart-k/rustical/ns/12</sync-token>
+            <CS:getctag>github.com/lennart-k/rustical/ns/12</CS:getctag>
+            <PUSH:transports>
+                <PUSH:web-push/>
+            </PUSH:transports>
+            <PUSH:topic>b28b41e9-8801-4fc5-ae29-8efb5fadeb36</PUSH:topic>
+            <PUSH:supported-triggers>
+                <PUSH:content-update>
+                    <depth>1</depth>
+                </PUSH:content-update>
+                <PUSH:property-update>
+                    <depth>1</depth>
+                </PUSH:property-update>
+            </PUSH:supported-triggers>
+            <resourcetype>
+                <collection/>
+                <CAL:calendar/>
+            </resourcetype>
+            <displayname>Calendar</displayname>
+            <current-user-principal>
+                <href>/caldav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set>
+                <privilege>
+                    <read/>
+                </privilege>
+                <privilege>
+                    <read-acl/>
+                </privilege>
+                <privilege>
+                    <read-current-user-privilege-set/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner>
+                <href>/caldav/principal/user/</href>
+            </owner>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

crates/caldav/src/calendar/test_files/propfind.principals.json

@@ -0,0 +1,11 @@
+[
+  {
+    "id": "user",
+    "displayname": null,
+    "principal_type": "individual",
+    "password": null,
+    "memberships": [
+      "group"
+    ]
+  }
+]

crates/caldav/src/calendar/test_files/propfind.requests

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<propfind xmlns="DAV:"><propname/></propfind>
+
+
+<?xml version="1.0" encoding="UTF-8"?>
+<propfind xmlns="DAV:"><allprop/></propfind>

crates/caldav/src/calendar/test_files/propfind.resources.json

@@ -0,0 +1,42 @@
+[
+  {
+    "cal": {
+      "principal": "user",
+      "id": "calendar",
+      "displayname": "Calendar",
+      "order": 0,
+      "description": null,
+      "color": null,
+      "timezone_id": "Europe/Berlin",
+      "deleted_at": null,
+      "synctoken": 12,
+      "subscription_url": null,
+      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
+      "components": [
+        "VEVENT",
+        "VTODO"
+      ]
+    },
+    "read_only": true
+  },
+  {
+    "cal": {
+      "principal": "user",
+      "id": "calendar",
+      "displayname": "Calendar",
+      "order": 0,
+      "description": null,
+      "color": null,
+      "timezone_id": "Europe/Berlin",
+      "deleted_at": null,
+      "synctoken": 12,
+      "subscription_url": null,
+      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
+      "components": [
+        "VEVENT",
+        "VTODO"
+      ]
+    },
+    "read_only": true
+  }
+]

crates/caldav/src/calendar/tests.rs

@@ -0,0 +1,47 @@
+use crate::{CalDavPrincipalUri, calendar::resource::CalendarResource};
+use rustical_dav::resource::Resource;
+use rustical_store::auth::Principal;
+use rustical_xml::XmlSerializeRoot;
+use serde_json::from_str;
+
+// #[tokio::test]
+async fn test_propfind() {
+    let requests: Vec<_> = include_str!("./test_files/propfind.requests")
+        .trim()
+        .split("\n\n")
+        .collect();
+    let principals: Vec<Principal> =
+        from_str(include_str!("./test_files/propfind.principals.json")).unwrap();
+    let resources: Vec<CalendarResource> =
+        from_str(include_str!("./test_files/propfind.resources.json")).unwrap();
+    let outputs: Vec<_> = include_str!("./test_files/propfind.outputs")
+        .trim()
+        .split("\n\n")
+        .collect();
+
+    for principal in principals {
+        for ((request, resource), &expected_output) in requests.iter().zip(&resources).zip(&outputs)
+        {
+            let propfind = CalendarResource::parse_propfind(request).unwrap();
+
+            let response = resource
+                .propfind(
+                    &format!("/caldav/principal/{}/{}", principal.id, resource.cal.id),
+                    &propfind.prop,
+                    propfind.include.as_ref(),
+                    &CalDavPrincipalUri("/caldav"),
+                    &principal,
+                )
+                .unwrap();
+            let expected_output = expected_output.trim();
+            let output = response
+                .serialize_to_string()
+                .unwrap()
+                .trim()
+                .replace("\r\n", "\n");
+            println!("{output}");
+            println!("{}, {} \n\n\n", output.len(), expected_output.len());
+            assert_eq!(output, expected_output);
+        }
+    }
+}

crates/caldav/src/calendar_object/methods.rs

@@ -11,7 +11,7 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::instrument;
+use tracing::{debug, instrument};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -78,9 +78,10 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(body) {
+    let object = match CalendarObject::from_ics(body.clone()) {
         Ok(obj) => obj,
         Err(_) => {
+            debug!("invalid calendar data:\n{body}");
             return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
         }
     };

crates/caldav/src/principal/prop.rs

@@ -16,13 +16,13 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     // PrincipalCollectionSet(HrefElement),

crates/caldav/src/principal/tests.rs

@@ -1,14 +1,19 @@
 use std::sync::Arc;
 
-use crate::principal::PrincipalResourceService;
+use crate::{
+    CalDavPrincipalUri,
+    principal::{PrincipalResource, PrincipalResourceService},
+};
 use rstest::rstest;
-use rustical_dav::resource::ResourceService;
+use rustical_dav::resource::{Resource, ResourceService};
+use rustical_store::auth::{Principal, PrincipalType::Individual};
 use rustical_store_sqlite::{
     SqliteStore,
     calendar_store::SqliteCalendarStore,
     principal_store::SqlitePrincipalStore,
     tests::{get_test_calendar_store, get_test_principal_store, get_test_subscription_store},
 };
+use rustical_xml::XmlSerializeRoot;
 
 #[rstest]
 #[tokio::test]
@@ -44,4 +49,35 @@ async fn test_principal_resource(
 }
 
 #[tokio::test]
-async fn test_propfind() {}
+async fn test_propfind() {
+    let propfind = PrincipalResource::parse_propfind(
+        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+    )
+    .unwrap();
+
+    let principal = Principal {
+        id: "user".to_string(),
+        displayname: None,
+        principal_type: Individual,
+        password: None,
+        memberships: vec!["group".to_string()],
+    };
+
+    let resource = PrincipalResource {
+        principal: principal.clone(),
+        members: vec![],
+        simplified_home_set: false,
+    };
+
+    let response = resource
+        .propfind(
+            &format!("/caldav/principal/{}", principal.id),
+            &propfind.prop,
+            propfind.include.as_ref(),
+            &CalDavPrincipalUri("/caldav"),
+            &principal,
+        )
+        .unwrap();
+
+    let _output = response.serialize_to_string().unwrap();
+}

crates/carddav/src/addressbook/methods/import.rs

@@ -0,0 +1,67 @@
+use std::io::BufReader;
+
+use crate::Error;
+use crate::addressbook::AddressbookResourceService;
+use axum::{
+    extract::{Path, State},
+    response::{IntoResponse, Response},
+};
+use http::StatusCode;
+use ical::{
+    parser::{Component, ComponentMut, vcard},
+    property::Property,
+};
+use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
+use tracing::instrument;
+
+#[instrument(skip(resource_service))]
+pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
+    Path((principal, addressbook_id)): Path<(String, String)>,
+    user: Principal,
+    State(resource_service): State<AddressbookResourceService<AS, S>>,
+    body: String,
+) -> Result<Response, Error> {
+    if !user.is_principal(&principal) {
+        return Err(Error::Unauthorized);
+    }
+
+    let parser = vcard::VcardParser::new(BufReader::new(body.as_bytes()));
+
+    let mut objects = vec![];
+    for res in parser {
+        let mut card = res.unwrap();
+        let uid = card.get_uid();
+        if uid.is_none() {
+            let mut card_mut = card.mutable();
+            card_mut.set_property(Property {
+                name: "UID".to_owned(),
+                value: Some(uuid::Uuid::new_v4().to_string()),
+                params: None,
+            });
+            card = card_mut.verify().unwrap();
+        }
+
+        objects.push(card.try_into().unwrap());
+    }
+
+    if objects.is_empty() {
+        return Ok((StatusCode::BAD_REQUEST, "empty addressbook data").into_response());
+    }
+
+    let addressbook = Addressbook {
+        principal,
+        id: addressbook_id,
+        displayname: None,
+        description: None,
+        deleted_at: None,
+        synctoken: 0,
+        push_topic: uuid::Uuid::new_v4().to_string(),
+    };
+
+    let addr_store = resource_service.addr_store;
+    addr_store
+        .import_addressbook(addressbook, objects, false)
+        .await?;
+
+    Ok(StatusCode::OK.into_response())
+}

crates/carddav/src/addressbook/methods/mkcol.rs

@@ -22,7 +22,7 @@ pub struct MkcolAddressbookProp {
     resourcetype: Option<Resourcetype>,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     displayname: Option<String>,
-    #[xml(rename = b"addressbook-description")]
+    #[xml(rename = "addressbook-description")]
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     description: Option<String>,
 }
@@ -34,7 +34,7 @@ pub struct PropElement<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/carddav/src/addressbook/methods/mod.rs

@@ -1,5 +1,5 @@
 pub mod get;
+pub mod import;
 pub mod mkcol;
 pub mod post;
-pub mod put;
 pub mod report;

crates/carddav/src/addressbook/methods/put.rs

@@ -1,47 +0,0 @@
-use crate::Error;
-use crate::addressbook::AddressbookResourceService;
-use axum::response::IntoResponse;
-use axum::{
-    extract::{Path, State},
-    response::Response,
-};
-use http::StatusCode;
-use ical::VcardParser;
-use rustical_ical::AddressObject;
-use rustical_store::Addressbook;
-use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
-use tracing::instrument;
-
-#[instrument(skip(addr_store))]
-pub async fn route_put<AS: AddressbookStore, S: SubscriptionStore>(
-    Path((principal, addressbook_id)): Path<(String, String)>,
-    State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
-    user: Principal,
-    body: String,
-) -> Result<Response, Error> {
-    if !user.is_principal(&principal) {
-        return Err(Error::Unauthorized);
-    }
-
-    let mut objects = vec![];
-    for object in VcardParser::new(body.as_bytes()) {
-        let object = object.map_err(rustical_ical::Error::from)?;
-        objects.push(AddressObject::try_from(object)?);
-    }
-
-    let addressbook = Addressbook {
-        id: addressbook_id.clone(),
-        principal: principal.clone(),
-        displayname: None,
-        description: None,
-        deleted_at: None,
-        synctoken: Default::default(),
-        push_topic: uuid::Uuid::new_v4().to_string(),
-    };
-
-    addr_store
-        .import_addressbook(principal.clone(), addressbook, objects)
-        .await?;
-
-    Ok(StatusCode::CREATED.into_response())
-}

crates/carddav/src/addressbook/service.rs

@@ -3,8 +3,8 @@ use super::methods::report::route_report_addressbook;
 use crate::address_object::AddressObjectResourceService;
 use crate::address_object::resource::AddressObjectResource;
 use crate::addressbook::methods::get::route_get;
+use crate::addressbook::methods::import::route_import;
 use crate::addressbook::methods::post::route_post;
-use crate::addressbook::methods::put::route_put;
 use crate::addressbook::resource::AddressbookResource;
 use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
@@ -139,9 +139,9 @@ impl<AS: AddressbookStore, S: SubscriptionStore> AxumMethods for AddressbookReso
         })
     }
 
-    fn put() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
+    fn import() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
         Some(|state, req| {
-            let mut service = Handler::with_state(route_put::<AS, S>, state);
+            let mut service = Handler::with_state(route_import::<AS, S>, state);
             Box::pin(Service::call(&mut service, req))
         })
     }

crates/carddav/src/principal/prop.rs

@@ -8,14 +8,14 @@ use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
-    #[xml(rename = b"principal-URL")]
+    #[xml(rename = "principal-URL")]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalCollectionSet(HrefElement),

crates/dav/src/privileges.rs

@@ -1,9 +1,10 @@
+use itertools::Itertools;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use std::collections::{HashMap, HashSet};
 
 // https://datatracker.ietf.org/doc/html/rfc3744
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq, PartialOrd, Ord)]
 pub enum UserPrivilege {
     Read,
     Write,
@@ -19,18 +20,18 @@ impl XmlSerialize for UserPrivilegeSet {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
-            #[xml(rename = b"privilege", flatten)]
+            #[xml(rename = "privilege", flatten)]
             privileges: Vec<UserPrivilege>,
         }
 
         FakeUserPrivilegeSet {
-            privileges: self.privileges.iter().cloned().collect(),
+            privileges: self.privileges.iter().cloned().sorted().collect(),
         }
         .serialize(ns, tag, namespaces, writer)
     }

crates/dav/src/resource/axum_methods.rs

@@ -38,6 +38,11 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         None
     }
 
+    #[inline]
+    fn import() -> Option<MethodFunction<Self>> {
+        None
+    }
+
     #[inline]
     fn allow_header() -> Allow {
         let mut allow = vec![
@@ -67,6 +72,9 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         if Self::put().is_some() {
             allow.push(Method::PUT);
         }
+        if Self::import().is_some() {
+            allow.push(Method::from_str("IMPORT").unwrap());
+        }
 
         allow.into_iter().collect()
     }

crates/dav/src/resource/axum_service.rs

@@ -97,6 +97,11 @@ where
                     return svc(self.resource_service.clone(), req);
                 }
             }
+            "IMPORT" => {
+                if let Some(svc) = RS::import() {
+                    return svc(self.resource_service.clone(), req);
+                }
+            }
             _ => {}
         };
         Box::pin(async move {

crates/dav/src/resource/methods/delete.rs

@@ -60,11 +60,11 @@ pub async fn route_delete<R: ResourceService>(
             return Err(crate::Error::PreconditionFailed.into());
         }
     }
-    if let Some(if_none_match) = if_none_match {
+    if let Some(if_none_match) = if_none_match
-        if resource.satisfies_if_none_match(&if_none_match) {
+        && resource.satisfies_if_none_match(&if_none_match)
-            // Precondition failed
+    {
-            return Err(crate::Error::PreconditionFailed.into());
+        // Precondition failed
-        }
+        return Err(crate::Error::PreconditionFailed.into());
     }
     resource_service
         .delete_resource(path_components, !no_trash)

crates/dav/src/resource/methods/propfind.rs

@@ -6,11 +6,7 @@ use crate::resource::Resource;
 use crate::resource::ResourceName;
 use crate::resource::ResourceService;
 use crate::xml::MultistatusElement;
-use crate::xml::PropfindElement;
-use crate::xml::PropfindType;
 use axum::extract::{Extension, OriginalUri, Path, State};
-use rustical_xml::PropName;
-use rustical_xml::XmlDocument;
 use tracing::instrument;
 
 type RSMultistatus<R> = MultistatusElement<
@@ -58,24 +54,8 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     }
 
     // A request body is optional. If empty we MUST return all props
-    let propfind_self: PropfindElement<<<R::Resource as Resource>::Prop as PropName>::Names> =
+    let propfind_self = R::Resource::parse_propfind(body).map_err(Error::XmlError)?;
-        if !body.is_empty() {
+    let propfind_member = R::MemberType::parse_propfind(body).map_err(Error::XmlError)?;
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-                include: None,
-            }
-        };
-    let propfind_member: PropfindElement<<<R::MemberType as Resource>::Prop as PropName>::Names> =
-        if !body.is_empty() {
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-                include: None,
-            }
-        };
 
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {

crates/dav/src/resource/methods/proppatch.rs

@@ -57,7 +57,7 @@ enum Operation<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"propertyupdate")]
+#[xml(root = "propertyupdate")]
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
 

crates/dav/src/resource/mod.rs

@@ -1,15 +1,16 @@
 use crate::Principal;
 use crate::privileges::UserPrivilegeSet;
 use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
-use crate::xml::{PropElement, PropfindType, Resourcetype};
+use crate::xml::{PropElement, PropfindElement, PropfindType, Resourcetype};
 use crate::xml::{TagList, multistatus::ResponseElement};
 use headers::{ETag, IfMatch, IfNoneMatch};
 use http::StatusCode;
 use itertools::Itertools;
 use quick_xml::name::Namespace;
 pub use resource_service::ResourceService;
-use rustical_xml::{EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlSerialize};
+use rustical_xml::{
-use std::collections::HashSet;
+    EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
+};
 use std::str::FromStr;
 
 mod axum_methods;
@@ -102,6 +103,19 @@ pub trait Resource: Clone + Send + 'static {
         principal: &Self::Principal,
     ) -> Result<UserPrivilegeSet, Self::Error>;
 
+    fn parse_propfind(
+        body: &str,
+    ) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
+        if !body.is_empty() {
+            PropfindElement::parse_str(body)
+        } else {
+            Ok(PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            })
+        }
+    }
+
     fn propfind(
         &self,
         path: &str,
@@ -116,7 +130,7 @@ pub trait Resource: Clone + Send + 'static {
             path.push('/');
         }
 
-        let (mut props, mut invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) =
+        let (mut props, mut invalid_props): (Vec<<Self::Prop as PropName>::Names>, Vec<_>) =
             match prop {
                 PropfindType::Propname => {
                     let props = Self::list_props()
@@ -141,7 +155,7 @@ pub trait Resource: Clone + Send + 'static {
                     vec![],
                 ),
                 PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
-                    valid_tags.iter().cloned().collect(),
+                    valid_tags.iter().unique().cloned().collect(),
                     invalid_tags.to_owned(),
                 ),
             };

crates/dav/src/xml/error.rs

@@ -1,12 +1,12 @@
 use rustical_xml::{XmlRootTag, XmlSerialize};
 
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = b"error")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "error")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct ErrorElement<'t, T: XmlSerialize>(#[xml(ty = "untagged")] pub &'t T);

crates/dav/src/xml/multistatus.rs

@@ -22,8 +22,8 @@ pub struct PropstatElement<PropType: XmlSerialize> {
 fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
@@ -39,8 +39,15 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // RFC 2518
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
-#[derive(XmlSerialize)]
+#[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
+#[xml(ns_prefix(
+    crate::namespace::NS_DAV = "",
+    crate::namespace::NS_CARDDAV = "CARD",
+    crate::namespace::NS_CALDAV = "CAL",
+    crate::namespace::NS_CALENDARSERVER = "CS",
+    crate::namespace::NS_DAVPUSH = "PUSH"
+))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
     #[xml(serialize_with = "xml_serialize_optional_status")]
@@ -52,8 +59,8 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
 fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
@@ -79,18 +86,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub member_responses: Vec<ResponseElement<MemberPropType>>,
     pub sync_token: Option<String>,
 }

crates/dav/src/xml/propfind.rs

@@ -7,7 +7,7 @@ use rustical_xml::XmlError;
 use rustical_xml::XmlRootTag;
 
 #[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq)]
-#[xml(root = b"propfind", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "propfind", ns = "crate::namespace::NS_DAV")]
 pub struct PropfindElement<PN: XmlDeserialize> {
     #[xml(ty = "untagged")]
     pub prop: PropfindType<PN>,
@@ -66,6 +66,9 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                 Event::Text(_) | Event::CData(_) => {
                     return Err(XmlError::UnsupportedEvent("Not expecting text here"));
                 }
+                Event::GeneralRef(_) => {
+                    return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
+                }
                 Event::Decl(_) | Event::Comment(_) | Event::DocType(_) | Event::PI(_) => { /* ignore */
                 }
                 Event::End(_end) => {

crates/dav/src/xml/resourcetype.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::{Resourcetype, ResourcetypeInner};
 
     #[derive(XmlSerialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         resourcetype: Resourcetype,
     }

crates/dav/src/xml/sync_collection.rs

@@ -60,7 +60,7 @@ pub struct NresultsElement(#[xml(ty = "text")] u64);
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub sync_token: String,

crates/dav/src/xml/tag_list.rs

@@ -13,8 +13,8 @@ impl XmlSerialize for TagList {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -22,23 +22,18 @@ impl XmlSerialize for TagList {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    format!("{prefix}:")
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname
-            .as_ref()
-            .map(|tagname| ::quick_xml::name::QName(tagname));
 
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname.as_ref() {
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            let mut bytes_start = BytesStart::new(tagname);
-            if !has_prefix {
+            if !has_prefix && let Some(ns) = &ns {
-                if let Some(ns) = &ns {
+                bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                }
             }
             writer.write_event(Event::Start(bytes_start))?;
         }
@@ -51,8 +46,8 @@ impl XmlSerialize for TagList {
             el.write_empty()?;
         }
 
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname.as_ref() {
-            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
         }
         Ok(())
     }

crates/dav_push/src/lib.rs

@@ -25,10 +25,10 @@ pub struct ContentUpdate {
 }
 
 #[derive(XmlSerialize, XmlRootTag, Debug)]
-#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
+#[xml(root = "push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
 #[xml(ns_prefix(
-    rustical_dav::namespace::NS_DAVPUSH = b"",
+    rustical_dav::namespace::NS_DAVPUSH = "",
-    rustical_dav::namespace::NS_DAV = b"D",
+    rustical_dav::namespace::NS_DAV = "D",
 ))]
 struct PushMessage {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -183,6 +183,7 @@ impl<S: SubscriptionStore> DavPushController<S> {
             header::CONTENT_TYPE,
             HeaderValue::from_static("application/octet-stream"),
         );
+        hdrs.insert("TTL", HeaderValue::from(60));
         client.execute(request).await?;
 
         Ok(())

crates/dav_push/src/prop.rs

@@ -35,12 +35,12 @@ pub enum Trigger {
 
 #[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
 pub struct ContentUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 #[derive(XmlSerialize, PartialEq, Clone, Debug)]
 pub struct PropertyUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 impl XmlDeserialize for PropertyUpdate {
@@ -51,8 +51,8 @@ impl XmlDeserialize for PropertyUpdate {
     ) -> Result<Self, rustical_xml::XmlError> {
         #[derive(XmlDeserialize, PartialEq, Clone, Debug)]
         struct FakePropertyUpdate(
-            #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+            #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
-            #[xml(rename = b"prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
+            #[xml(rename = "prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
         );
         let FakePropertyUpdate(depth, _) = FakePropertyUpdate::deserialize(reader, start, empty)?;
         Ok(Self(depth))

crates/dav_push/src/register.rs

@@ -17,7 +17,7 @@ pub struct WebPushSubscription {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionPublicKey {
-    #[xml(ty = "attr", rename = b"type")]
+    #[xml(ty = "attr", rename = "type")]
     pub ty: String,
     #[xml(ty = "text")]
     pub key: String,
@@ -33,7 +33,7 @@ pub struct SubscriptionElement {
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"push-register")]
+#[xml(root = "push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

crates/frontend/js-components/lib/delete-button.ts

@@ -17,7 +17,7 @@ export class DeleteButton extends LitElement {
   }
 
   protected render() {
-    let text = this.trash ? 'Move to trash' : 'Delete'
+    let text = this.trash ? 'Trash' : 'Delete'
     return html`<button class="delete" @click=${e => this._onClick(e)}>${text}</button>`
   }
 

crates/frontend/js-components/lib/edit-addressbook-form.ts

@@ -28,9 +28,9 @@ export class EditAddressbookForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

crates/frontend/js-components/lib/edit-calendar-form.ts

@@ -40,9 +40,9 @@ export class EditCalendarForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

crates/frontend/js-components/lib/import-addressbook-form.ts

@@ -0,0 +1,92 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { Ref, createRef, ref } from 'lit/directives/ref.js';
+
+@customElement("import-addressbook-form")
+export class ImportAddressbookForm extends LitElement {
+  constructor() {
+    super()
+  }
+
+  protected override createRenderRoot() {
+    return this
+  }
+
+  @property()
+  user: string = ''
+  @property()
+  principal: string
+  @property()
+  addressbook_id: string = self.crypto.randomUUID()
+
+  dialog: Ref<HTMLDialogElement> = createRef()
+  form: Ref<HTMLFormElement> = createRef()
+  file: File;
+
+
+  override render() {
+    return html`
+      <button @click=${() => this.dialog.value.showModal()}>Import addressbook</button>
+      <dialog ${ref(this.dialog)}>
+        <h3>Import addressbook</h3>
+        <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            principal (for group addressbook)
+            <select name="principal" value=${this.user} @change=${e => this.principal = e.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map(membership => html`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.addressbook_id} @change=${e => this.addressbook_id = e.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/vcard" name="file" @change=${e => this.file = e.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `
+  }
+
+  async submit(e: SubmitEvent) {
+    e.preventDefault()
+    this.principal ||= this.user
+    if (!this.principal) {
+      alert("Empty principal")
+      return
+    }
+    if (!this.addressbook_id) {
+      alert("Empty id")
+      return
+    }
+    let response = await fetch(`/carddav/principal/${this.principal}/${this.addressbook_id}`, {
+      method: 'IMPORT',
+      headers: {
+        'Content-Type': 'text/vcard'
+      },
+      body: this.file,
+    })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
+    window.location.reload()
+    return null
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'import-addressbook-form': ImportAddressbookForm
+  }
+}

crates/frontend/js-components/lib/import-calendar-form.ts

@@ -0,0 +1,92 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { Ref, createRef, ref } from 'lit/directives/ref.js';
+
+@customElement("import-calendar-form")
+export class ImportCalendarForm extends LitElement {
+  constructor() {
+    super()
+  }
+
+  protected override createRenderRoot() {
+    return this
+  }
+
+  @property()
+  user: string = ''
+  @property()
+  principal: string
+  @property()
+  cal_id: string = self.crypto.randomUUID()
+
+  dialog: Ref<HTMLDialogElement> = createRef()
+  form: Ref<HTMLFormElement> = createRef()
+  file: File;
+
+
+  override render() {
+    return html`
+      <button @click=${() => this.dialog.value.showModal()}>Import calendar</button>
+      <dialog ${ref(this.dialog)}>
+        <h3>Import calendar</h3>
+        <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            principal (for group calendars)
+            <select name="principal" value=${this.user} @change=${e => this.principal = e.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map(membership => html`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/calendar" name="file" @change=${e => this.file = e.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `
+  }
+
+  async submit(e: SubmitEvent) {
+    e.preventDefault()
+    this.principal ||= this.user
+    if (!this.principal) {
+      alert("Empty principal")
+      return
+    }
+    if (!this.cal_id) {
+      alert("Empty id")
+      return
+    }
+    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
+      method: 'IMPORT',
+      headers: {
+        'Content-Type': 'text/calendar'
+      },
+      body: this.file,
+    })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
+    window.location.reload()
+    return null
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'import-calendar-form': ImportCalendarForm
+  }
+}

crates/frontend/js-components/vite.config.ts

@@ -16,8 +16,10 @@ export default defineConfig({
       input: [
         "lib/create-calendar-form.ts",
         "lib/edit-calendar-form.ts",
+        "lib/import-calendar-form.ts",
         "lib/create-addressbook-form.ts",
         "lib/edit-addressbook-form.ts",
+        "lib/import-addressbook-form.ts",
         "lib/delete-button.ts",
       ],
       output: {

crates/frontend/public/assets/js/create-addressbook-form.mjs

@@ -1,6 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {

crates/frontend/public/assets/js/create-calendar-form.mjs

@@ -1,6 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {

crates/frontend/public/assets/js/delete-button.mjs

@@ -19,7 +19,7 @@ let DeleteButton = class extends i {
     return this;
   }
   render() {
-    let text = this.trash ? "Move to trash" : "Delete";
+    let text = this.trash ? "Trash" : "Delete";
     return x`<button class="delete" @click=${(e) => this._onClick(e)}>${text}</button>`;
   }
   async _onClick(event) {

crates/frontend/public/assets/js/edit-addressbook-form.mjs

@@ -1,6 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -26,9 +27,9 @@ let EditAddressbookForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/js/edit-calendar-form.mjs

@@ -1,6 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -27,9 +28,9 @@ let EditCalendarForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/js/import-addressbook-form.mjs

@@ -0,0 +1,100 @@
+import { i, x } from "./lit-z6_uA4GX.mjs";
+import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { e, n } from "./ref-CPp9J0V5.mjs";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
+    if (decorator = decorators[i2])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
+let ImportAddressbookForm = class extends i {
+  constructor() {
+    super();
+    this.user = "";
+    this.addressbook_id = self.crypto.randomUUID();
+    this.dialog = e();
+    this.form = e();
+  }
+  createRenderRoot() {
+    return this;
+  }
+  render() {
+    return x`
+      <button @click=${() => this.dialog.value.showModal()}>Import addressbook</button>
+      <dialog ${n(this.dialog)}>
+        <h3>Import addressbook</h3>
+        <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            principal (for group addressbook)
+            <select name="principal" value=${this.user} @change=${(e2) => this.principal = e2.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map((membership) => x`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.addressbook_id} @change=${(e2) => this.addressbook_id = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/vcard" name="file" @change=${(e2) => this.file = e2.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${(event) => {
+      event.preventDefault();
+      this.dialog.value.close();
+      this.form.value.reset();
+    }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `;
+  }
+  async submit(e2) {
+    e2.preventDefault();
+    this.principal || (this.principal = this.user);
+    if (!this.principal) {
+      alert("Empty principal");
+      return;
+    }
+    if (!this.addressbook_id) {
+      alert("Empty id");
+      return;
+    }
+    let response = await fetch(`/carddav/principal/${this.principal}/${this.addressbook_id}`, {
+      method: "IMPORT",
+      headers: {
+        "Content-Type": "text/vcard"
+      },
+      body: this.file
+    });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
+    window.location.reload();
+    return null;
+  }
+};
+__decorateClass([
+  n$1()
+], ImportAddressbookForm.prototype, "user", 2);
+__decorateClass([
+  n$1()
+], ImportAddressbookForm.prototype, "principal", 2);
+__decorateClass([
+  n$1()
+], ImportAddressbookForm.prototype, "addressbook_id", 2);
+ImportAddressbookForm = __decorateClass([
+  t("import-addressbook-form")
+], ImportAddressbookForm);
+export {
+  ImportAddressbookForm
+};

crates/frontend/public/assets/js/import-calendar-form.mjs

@@ -0,0 +1,100 @@
+import { i, x } from "./lit-z6_uA4GX.mjs";
+import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { e, n } from "./ref-CPp9J0V5.mjs";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
+    if (decorator = decorators[i2])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
+let ImportCalendarForm = class extends i {
+  constructor() {
+    super();
+    this.user = "";
+    this.cal_id = self.crypto.randomUUID();
+    this.dialog = e();
+    this.form = e();
+  }
+  createRenderRoot() {
+    return this;
+  }
+  render() {
+    return x`
+      <button @click=${() => this.dialog.value.showModal()}>Import calendar</button>
+      <dialog ${n(this.dialog)}>
+        <h3>Import calendar</h3>
+        <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            principal (for group calendars)
+            <select name="principal" value=${this.user} @change=${(e2) => this.principal = e2.target.value}>
+              <option value=${this.user}>${this.user}</option>
+              ${window.rusticalUser.memberships.map((membership) => x`
+                <option value=${membership}>${membership}</option>
+              `)}
+            </select>
+          </label>
+          <br>
+          <label>
+            id
+            <input type="text" name="id" value=${this.cal_id} @change=${(e2) => this.cal_id = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            file
+            <input type="file" accept="text/calendar" name="file" @change=${(e2) => this.file = e2.target.files[0]} />
+          </label>
+          <button type="submit">Import</button>
+          <button type="submit" @click=${(event) => {
+      event.preventDefault();
+      this.dialog.value.close();
+      this.form.value.reset();
+    }} class="cancel">Cancel</button>
+      </form>
+      </dialog>
+        `;
+  }
+  async submit(e2) {
+    e2.preventDefault();
+    this.principal || (this.principal = this.user);
+    if (!this.principal) {
+      alert("Empty principal");
+      return;
+    }
+    if (!this.cal_id) {
+      alert("Empty id");
+      return;
+    }
+    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
+      method: "IMPORT",
+      headers: {
+        "Content-Type": "text/calendar"
+      },
+      body: this.file
+    });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
+    window.location.reload();
+    return null;
+  }
+};
+__decorateClass([
+  n$1()
+], ImportCalendarForm.prototype, "user", 2);
+__decorateClass([
+  n$1()
+], ImportCalendarForm.prototype, "principal", 2);
+__decorateClass([
+  n$1()
+], ImportCalendarForm.prototype, "cal_id", 2);
+ImportCalendarForm = __decorateClass([
+  t("import-calendar-form")
+], ImportCalendarForm);
+export {
+  ImportCalendarForm
+};

crates/frontend/public/assets/js/index-_IB1wMbZ.mjs

@@ -0,0 +1,6 @@
+function escapeXml(unsafe) {
+  return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
+export {
+  escapeXml as e
+};

crates/frontend/public/assets/js/ref-CPp9J0V5.mjs

@@ -122,11 +122,7 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     this.rt(this.ct);
   }
 });
-function escapeXml(unsafe) {
-  return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
-}
 export {
-  escapeXml as a,
   e,
   n
 };

crates/frontend/public/assets/style.css

@@ -290,6 +290,7 @@ ul.collection-list {
       .color-chip {
         background: var(--color);
         grid-area: color-chip;
+        margin-left: 8px;
       }
 
       .actions {
@@ -317,6 +318,10 @@ dialog {
   padding: 32px;
 }
 
+dialog::backdrop {
+  background: color-mix(in srgb, var(--background-color), transparent 50%);
+}
+
 footer {
   display: flex;
   justify-content: center;
@@ -342,6 +347,17 @@ select {
   }
 }
 
+form {
+
+  input[type="text"],
+  input[type="password"],
+  input[type="color"],
+  textarea,
+  select {
+    width: 100%;
+  }
+}
+
 svg.icon {
   stroke-width: 2px;
   color: var(--text-on-background-color);

crates/frontend/public/templates/components/sections/addressbooks_section.html

@@ -65,4 +65,5 @@
 {% endif %}
 
 <create-addressbook-form user="{{ user.id }}"></create-addressbook-form>
+<import-addressbook-form user="{{ user.id }}"></import-addressbook-form>
 

crates/frontend/public/templates/components/sections/calendars_section.html

@@ -1,13 +1,13 @@
 <h2>{{ user.id }}'s Calendars</h2>
 <ul class="collection-list">
   {% for (meta, calendar) in calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -15,7 +15,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       {% if let Some(subscription_url) = calendar.subscription_url %}
       <span class="subscription-url">{{ subscription_url }}</span>
@@ -29,9 +29,9 @@
           principal="{{ calendar.principal }}"
           cal_id="{{ calendar.id }}"
           timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
-          displayname="{{ calendar.displayname.as_deref().unwrap_or_default() }}"
+          displayname="{{ calendar.meta.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ calendar.description.as_deref().unwrap_or_default() }}"
+          description="{{ calendar.meta.description.as_deref().unwrap_or_default() }}"
-          color="{{ calendar.color.as_deref().unwrap_or_default() }}"
+          color="{{ calendar.meta.color.as_deref().unwrap_or_default() }}"
           components="{{ calendar.components | json }}"
         ></edit-calendar-form>
         <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
@@ -51,13 +51,13 @@
 <h3>Deleted Calendars</h3>
 <ul class="collection-list">
   {% for (meta, calendar) in deleted_calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -65,7 +65,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       <div class="actions">
         <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"
@@ -84,4 +84,5 @@
 </ul>
 {% endif %}
 <create-calendar-form user="{{ user.id }}"></create-calendar-form>
+<import-calendar-form user="{{ user.id }}"></import-calendar-form>
 

crates/frontend/public/templates/pages/calendar.html

@@ -4,9 +4,9 @@
 {% endblock %}
 
 {% block content %}
-{% let name = calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
+{% let name = calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
 <h1>{{ calendar.principal }}/{{ name }}</h1>
-{% if let Some(description) = calendar.description %}<p>{{ description }}</p>{% endif%}
+{% if let Some(description) = calendar.meta.description %}<p>{{ description }}</p>{% endif%}
 
 {% if let Some(subscription_url) = calendar.subscription_url %}
 <h2>Subscription URL</h2>
@@ -25,9 +25,6 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
-{% if let Some(timezone) = calendar.get_vtimezone() %}
-<textarea rows="16" readonly>{{ timezone }}</textarea>
-{% endif %}
 
 <pre>{{ calendar|json }}</pre>
 

crates/frontend/public/templates/pages/user.html

@@ -7,8 +7,10 @@ window.rusticalUser = JSON.parse(document.querySelector('#data-rustical-user').i
 </script>
 <script type="module" src="/frontend/assets/js/create-calendar-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/edit-calendar-form.mjs" async></script>
+<script type="module" src="/frontend/assets/js/import-calendar-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/create-addressbook-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/edit-addressbook-form.mjs" async></script>
+<script type="module" src="/frontend/assets/js/import-addressbook-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/delete-button.mjs" async></script>
 {% endblock %}
 {% block header_center %}

crates/frontend/src/assets.rs

@@ -13,6 +13,7 @@ use tower::Service;
 
 #[derive(Clone, RustEmbed, Default)]
 #[folder = "public/assets"]
+#[allow(dead_code)] // Since this is not used with the frontend-dev feature
 pub struct Assets;
 
 #[derive(Clone, Default)]

crates/frontend/src/lib.rs

@@ -45,38 +45,38 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
     frontend_config: FrontendConfig,
     oidc_config: Option<OidcConfig>,
 ) -> Router {
-    let mut router = Router::new();
+    let user_router = Router::new()
-    router = router
+        .route("/", get(route_get_home))
-        .route("/", get(route_root))
+        .route("/{user}", get(route_user_named::<CS, AS, AP>))
-        .route("/user", get(route_get_home))
-        .route("/user/{user}", get(route_user_named::<CS, AS, AP>))
         // App token management
-        .route("/user/{user}/app_token", post(route_post_app_token::<AP>))
+        .route("/{user}/app_token", post(route_post_app_token::<AP>))
         .route(
             // POST because HTML5 forms don't support DELETE method
-            "/user/{user}/app_token/{id}/delete",
+            "/{user}/app_token/{id}/delete",
             post(route_delete_app_token::<AP>),
         )
         // Calendar
-        .route("/user/{user}/calendar", get(route_calendars::<CS>))
+        .route("/{user}/calendar", get(route_calendars::<CS>))
+        .route("/{user}/calendar/{calendar}", get(route_calendar::<CS>))
         .route(
-            "/user/{user}/calendar/{calendar}",
+            "/{user}/calendar/{calendar}/restore",
-            get(route_calendar::<CS>),
-        )
-        .route(
-            "/user/{user}/calendar/{calendar}/restore",
             post(route_calendar_restore::<CS>),
         )
         // Addressbook
-        .route("/user/{user}/addressbook", get(route_addressbooks::<AS>))
+        .route("/{user}/addressbook", get(route_addressbooks::<AS>))
         .route(
-            "/user/{user}/addressbook/{addressbook}",
+            "/{user}/addressbook/{addressbook}",
             get(route_addressbook::<AS>),
         )
         .route(
-            "/user/{user}/addressbook/{addressbook}/restore",
+            "/{user}/addressbook/{addressbook}/restore",
             post(route_addressbook_restore::<AS>),
         )
+        .layer(middleware::from_fn(unauthorized_handler));
+
+    let router = Router::new()
+        .route("/", get(route_root))
+        .nest("/user", user_router)
         .route("/login", get(route_get_login).post(route_post_login::<AP>))
         .route("/logout", post(route_post_logout));
 
@@ -109,8 +109,7 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
         .layer(Extension(cal_store.clone()))
         .layer(Extension(addr_store.clone()))
         .layer(Extension(frontend_config.clone()))
-        .layer(Extension(oidc_config.clone()))
+        .layer(Extension(oidc_config.clone()));
-        .layer(middleware::from_fn(unauthorized_handler));
 
     Router::new()
         .nest(prefix, router)

crates/frontend/src/routes/login.rs

@@ -13,7 +13,7 @@ use http::StatusCode;
 use rustical_store::auth::AuthenticationProvider;
 use serde::Deserialize;
 use tower_sessions::Session;
-use tracing::instrument;
+use tracing::{instrument, warn};
 use url::Url;
 
 #[derive(Template, WebTemplate)]
@@ -98,6 +98,7 @@ pub async fn route_post_login<AP: AuthenticationProvider>(
         session.insert("user", user.id).await.unwrap();
         Redirect::to(&redirect_uri).into_response()
     } else {
+        warn!("Failed password login attempt as {username}");
         StatusCode::UNAUTHORIZED.into_response()
     }
 }

crates/ical/src/address_object.rs

@@ -20,19 +20,21 @@ impl TryFrom<VcardContact> for AddressObject {
     type Error = Error;
 
     fn try_from(vcard: VcardContact) -> Result<Self, Self::Error> {
-        let id = vcard
+        let uid = vcard
-            .get_property("UID")
+            .get_uid()
-            .ok_or(Error::InvalidData("Missing UID".to_owned()))?
+            .ok_or(Error::InvalidData("missing UID".to_owned()))?
-            .value
+            .to_owned();
-            .clone()
-            .ok_or(Error::InvalidData("Missing UID".to_owned()))?;
         let vcf = vcard.generate();
-        Ok(Self { id, vcf, vcard })
+        Ok(Self {
+            vcf,
+            vcard,
+            id: uid,
+        })
     }
 }
 
 impl AddressObject {
-    pub fn from_vcf(object_id: String, vcf: String) -> Result<Self, Error> {
+    pub fn from_vcf(id: String, vcf: String) -> Result<Self, Error> {
         let mut parser = vcard::VcardParser::new(BufReader::new(vcf.as_bytes()));
         let vcard = parser.next().ok_or(Error::MissingContact)??;
         if parser.next().is_some() {
@@ -40,11 +42,7 @@ impl AddressObject {
                 "multiple vcards, only one allowed".to_owned(),
             ));
         }
-        Ok(Self {
+        Ok(Self { id, vcf, vcard })
-            id: object_id,
-            vcf,
-            vcard,
-        })
     }
 
     pub fn get_id(&self) -> &str {
@@ -53,7 +51,7 @@ impl AddressObject {
 
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(&self.id);
+        hasher.update(self.get_id());
         hasher.update(self.get_vcf());
         format!("\"{:x}\"", hasher.finalize())
     }

crates/ical/src/duration.rs

@@ -1,53 +0,0 @@
-use crate::CalDateTimeError;
-use chrono::Duration;
-use lazy_static::lazy_static;
-
-lazy_static! {
-    static ref RE_DURATION: regex::Regex = regex::Regex::new(r"^(?<sign>[+-])?P((?P<W>\d+)W)?((?P<D>\d+)D)?(T((?P<H>\d+)H)?((?P<M>\d+)M)?((?P<S>\d+)S)?)?$").unwrap();
-}
-
-pub fn parse_duration(string: &str) -> Result<Duration, CalDateTimeError> {
-    let captures = RE_DURATION
-        .captures(string)
-        .ok_or(CalDateTimeError::InvalidDurationFormat(string.to_string()))?;
-
-    let mut duration = Duration::zero();
-    if let Some(weeks) = captures.name("W") {
-        duration += Duration::weeks(weeks.as_str().parse().unwrap());
-    }
-    if let Some(days) = captures.name("D") {
-        duration += Duration::days(days.as_str().parse().unwrap());
-    }
-    if let Some(hours) = captures.name("H") {
-        duration += Duration::hours(hours.as_str().parse().unwrap());
-    }
-    if let Some(minutes) = captures.name("M") {
-        duration += Duration::minutes(minutes.as_str().parse().unwrap());
-    }
-    if let Some(seconds) = captures.name("S") {
-        duration += Duration::seconds(seconds.as_str().parse().unwrap());
-    }
-    if let Some(sign) = captures.name("sign") {
-        if sign.as_str() == "-" {
-            duration = -duration;
-        }
-    }
-
-    Ok(duration)
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::Duration;
-
-    use crate::parse_duration;
-
-    #[test]
-    fn test_parse_duration() {
-        assert_eq!(parse_duration("P12W").unwrap(), Duration::weeks(12));
-        assert_eq!(parse_duration("P12D").unwrap(), Duration::days(12));
-        assert_eq!(parse_duration("PT12H").unwrap(), Duration::hours(12));
-        assert_eq!(parse_duration("PT12M").unwrap(), Duration::minutes(12));
-        assert_eq!(parse_duration("PT12S").unwrap(), Duration::seconds(12));
-    }
-}

crates/ical/src/icalendar/event.rs

@@ -1,5 +1,5 @@
+use crate::CalDateTime;
 use crate::Error;
-use crate::{CalDateTime, parse_duration};
 use chrono::{DateTime, Duration, Utc};
 use ical::parser::ComponentMut;
 use ical::{generator::IcalEvent, parser::Component, property::Property};
@@ -15,8 +15,12 @@ pub struct EventObject {
 }
 
 impl EventObject {
+    pub fn get_uid(&self) -> &str {
+        self.event.get_uid()
+    }
+
     pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtstart) = self.event.get_property("DTSTART") {
+        if let Some(dtstart) = self.event.get_dtstart() {
             Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
         } else {
             Ok(None)
@@ -24,7 +28,7 @@ impl EventObject {
     }
 
     pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtend) = self.event.get_property("DTEND") {
+        if let Some(dtend) = self.event.get_dtend() {
             Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
         } else {
             Ok(None)
@@ -32,33 +36,21 @@ impl EventObject {
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(_rrule) = self.event.get_property("RRULE") {
+        if self.event.get_rrule().is_some() {
             // TODO: understand recurrence rules
             return Ok(None);
         }
 
-        if let Some(dtend) = self.event.get_property("DTEND") {
+        if let Some(dtend) = self.get_dtend()? {
-            return Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?));
+            return Ok(Some(dtend));
         };
 
-        let duration = self.get_duration()?.unwrap_or(Duration::days(1));
+        let duration = self.event.get_duration().unwrap_or(Duration::days(1));
 
         let first_occurence = self.get_dtstart()?;
         Ok(first_occurence.map(|first_occurence| first_occurence + duration))
     }
 
-    pub fn get_duration(&self) -> Result<Option<Duration>, Error> {
-        if let Some(Property {
-            value: Some(duration),
-            ..
-        }) = self.event.get_property("DURATION")
-        {
-            Ok(Some(parse_duration(duration)?))
-        } else {
-            Ok(None)
-        }
-    }
-
     pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> {
         let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_dtstart()? {
             if let Some(dtend) = self.get_dtend()? {
@@ -104,6 +96,7 @@ impl EventObject {
         &self,
         start: Option<DateTime<Utc>>,
         end: Option<DateTime<Utc>>,
+        overrides: &[EventObject],
     ) -> Result<Vec<IcalEvent>, Error> {
         if let Some(mut rrule_set) = self.recurrence_ruleset()? {
             if let Some(start) = start {
@@ -119,13 +112,30 @@ impl EventObject {
                 .get_dtend()?
                 .map(|dtend| dtend.as_datetime().into_owned() - dtstart.as_datetime().into_owned());
 
-            for date in dates {
+            'recurrence: for date in dates {
                 let date = CalDateTime::from(date);
                 let dateformat = if dtstart.is_date() {
                     date.format_date()
                 } else {
                     date.format()
                 };
+
+                for _override in overrides {
+                    if let Some(override_id) = &_override
+                        .event
+                        .get_recurrence_id()
+                        .as_ref()
+                        .expect("overrides have a recurrence id")
+                        .value
+                        && override_id == &dateformat
+                    {
+                        // We have an override for this occurence
+                        //
+                        events.push(_override.event.clone());
+                        continue 'recurrence;
+                    }
+                }
+
                 let mut ev = self.event.clone().mutable();
                 ev.remove_property("RRULE");
                 ev.remove_property("RDATE");
@@ -241,10 +251,18 @@ END:VEVENT\r\n",
     #[test]
     fn test_expand_recurrence() {
         let event = CalendarObject::from_ics(ICS.to_string()).unwrap();
-        let event = event.event().unwrap();
+        let (event, overrides) = if let crate::CalendarObjectComponent::Event(
+            main_event,
+            overrides,
+        ) = event.get_data()
+        {
+            (main_event, overrides)
+        } else {
+            panic!()
+        };
 
         let events: Vec<String> = event
-            .expand_recurrence(None, None)
+            .expand_recurrence(None, None, overrides)
             .unwrap()
             .into_iter()
             .map(|event| Emitter::generate(&event))

crates/ical/src/icalendar/journal.rs

@@ -3,3 +3,9 @@ use ical::parser::ical::component::IcalJournal;
 
 #[derive(Debug, Clone, From)]
 pub struct JournalObject(pub IcalJournal);
+
+impl JournalObject {
+    pub fn get_uid(&self) -> &str {
+        self.0.get_uid()
+    }
+}

crates/ical/src/icalendar/object.rs

@@ -5,12 +5,14 @@ use chrono::DateTime;
 use chrono::Utc;
 use derive_more::Display;
 use ical::generator::{Emitter, IcalCalendar};
+use ical::parser::ical::component::IcalTimeZone;
 use ical::property::Property;
+use serde::Deserialize;
 use serde::Serialize;
 use sha2::{Digest, Sha256};
 use std::{collections::HashMap, io::BufReader};
 
-#[derive(Debug, Clone, Serialize, PartialEq, Eq, Display)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Display)]
 // specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
 pub enum CalendarObjectType {
     #[serde(rename = "VEVENT")]
@@ -54,22 +56,80 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
 
 #[derive(Debug, Clone)]
 pub enum CalendarObjectComponent {
-    Event(EventObject),
+    Event(EventObject, Vec<EventObject>),
-    Todo(TodoObject),
+    Todo(TodoObject, Vec<TodoObject>),
-    Journal(JournalObject),
+    Journal(JournalObject, Vec<JournalObject>),
 }
 
-impl Default for CalendarObjectComponent {
+impl CalendarObjectComponent {
-    fn default() -> Self {
+    fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> {
-        Self::Event(EventObject::default())
+        let main_event = events
+            .extract_if(.., |event| event.event.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = events;
+        for event in &overrides {
+            if event.get_uid() != main_event.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if event.event.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Event(main_event, overrides))
+    }
+    fn from_todos(mut todos: Vec<TodoObject>) -> Result<Self, Error> {
+        let main_todo = todos
+            .extract_if(.., |todo| todo.0.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = todos;
+        for todo in &overrides {
+            if todo.get_uid() != main_todo.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if todo.0.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Todo(main_todo, overrides))
+    }
+    fn from_journals(mut journals: Vec<JournalObject>) -> Result<Self, Error> {
+        let main_journal = journals
+            .extract_if(.., |journal| journal.0.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = journals;
+        for journal in &overrides {
+            if journal.get_uid() != main_journal.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if journal.0.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Journal(main_journal, overrides))
     }
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
-pub struct CalendarObject<const VERIFIED: bool = true> {
+pub struct CalendarObject {
     data: CalendarObjectComponent,
     properties: Vec<Property>,
     ics: String,
+    vtimezones: HashMap<String, IcalTimeZone>,
 }
 
 impl CalendarObject {
@@ -81,16 +141,16 @@ impl CalendarObject {
                 "multiple calendars, only one allowed".to_owned(),
             ));
         }
-        if cal.events.len()
+
-            + cal.alarms.len()
+        if !cal.events.is_empty() as u8
-            + cal.todos.len()
+            + !cal.todos.is_empty() as u8
-            + cal.journals.len()
+            + !cal.journals.is_empty() as u8
-            + cal.free_busys.len()
+            + !cal.free_busys.is_empty() as u8
             != 1
         {
             // https://datatracker.ietf.org/doc/html/rfc4791#section-4.1
             return Err(Error::InvalidData(
-                "iCalendar object is only allowed to have exactly one component".to_owned(),
+                "iCalendar object must have exactly one component type".to_owned(),
             ));
         }
 
@@ -101,12 +161,34 @@ impl CalendarObject {
             .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
             .collect();
 
-        let data = if let Some(event) = cal.events.into_iter().next() {
+        let vtimezones = cal
-            CalendarObjectComponent::Event(EventObject { event, timezones })
+            .timezones
-        } else if let Some(todo) = cal.todos.into_iter().next() {
+            .clone()
-            CalendarObjectComponent::Todo(todo.into())
+            .into_iter()
-        } else if let Some(journal) = cal.journals.into_iter().next() {
+            .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
-            CalendarObjectComponent::Journal(journal.into())
+            .collect();
+
+        let data = if !cal.events.is_empty() {
+            CalendarObjectComponent::from_events(
+                cal.events
+                    .into_iter()
+                    .map(|event| EventObject {
+                        event,
+                        timezones: timezones.clone(),
+                    })
+                    .collect(),
+            )?
+        } else if !cal.todos.is_empty() {
+            CalendarObjectComponent::from_todos(
+                cal.todos.into_iter().map(|todo| todo.into()).collect(),
+            )?
+        } else if !cal.journals.is_empty() {
+            CalendarObjectComponent::from_journals(
+                cal.journals
+                    .into_iter()
+                    .map(|journal| journal.into())
+                    .collect(),
+            )?
         } else {
             return Err(Error::InvalidData(
                 "iCalendar component type not supported :(".to_owned(),
@@ -117,18 +199,25 @@ impl CalendarObject {
             data,
             properties: cal.properties,
             ics,
+            vtimezones,
         })
     }
 
+    pub fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
+        &self.vtimezones
+    }
+
     pub fn get_data(&self) -> &CalendarObjectComponent {
         &self.data
     }
 
     pub fn get_id(&self) -> &str {
         match &self.data {
-            CalendarObjectComponent::Todo(todo) => todo.0.get_uid(),
+            // We've made sure before that the first component exists and all components share the
-            CalendarObjectComponent::Event(event) => event.event.get_uid(),
+            // same UID
-            CalendarObjectComponent::Journal(journal) => journal.0.get_uid(),
+            CalendarObjectComponent::Todo(todo, _) => todo.0.get_uid(),
+            CalendarObjectComponent::Event(event, _) => event.event.get_uid(),
+            CalendarObjectComponent::Journal(journal, _) => journal.0.get_uid(),
         }
     }
 
@@ -149,33 +238,40 @@ impl CalendarObject {
 
     pub fn get_object_type(&self) -> CalendarObjectType {
         match self.data {
-            CalendarObjectComponent::Todo(_) => CalendarObjectType::Todo,
+            CalendarObjectComponent::Todo(_, _) => CalendarObjectType::Todo,
-            CalendarObjectComponent::Event(_) => CalendarObjectType::Event,
+            CalendarObjectComponent::Event(_, _) => CalendarObjectType::Event,
-            CalendarObjectComponent::Journal(_) => CalendarObjectType::Journal,
+            CalendarObjectComponent::Journal(_, _) => CalendarObjectType::Journal,
         }
     }
 
     pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
         match &self.data {
-            CalendarObjectComponent::Event(event) => event.get_dtstart(),
+            CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain([main_event].into_iter())
+                .map(|event| event.get_dtstart())
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .min()),
             _ => Ok(None),
         }
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
         match &self.data {
-            CalendarObjectComponent::Event(event) => event.get_last_occurence(),
+            CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain([main_event].into_iter())
+                .map(|event| event.get_last_occurence())
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .max()),
             _ => Ok(None),
         }
     }
 
-    pub fn event(&self) -> Option<&EventObject> {
-        match &self.data {
-            CalendarObjectComponent::Event(event) => Some(event),
-            _ => None,
-        }
-    }
-
     pub fn expand_recurrence(
         &self,
         start: Option<DateTime<Utc>>,
@@ -183,10 +279,10 @@ impl CalendarObject {
     ) -> Result<String, Error> {
         // Only events can be expanded
         match &self.data {
-            CalendarObjectComponent::Event(event) => {
+            CalendarObjectComponent::Event(main_event, overrides) => {
                 let cal = IcalCalendar {
                     properties: self.properties.clone(),
-                    events: event.expand_recurrence(start, end)?,
+                    events: main_event.expand_recurrence(start, end, overrides)?,
                     ..Default::default()
                 };
                 Ok(cal.generate())

crates/ical/src/icalendar/todo.rs

@@ -3,3 +3,9 @@ use ical::parser::ical::component::IcalTodo;
 
 #[derive(Debug, Clone, From)]
 pub struct TodoObject(pub IcalTodo);
+
+impl TodoObject {
+    pub fn get_uid(&self) -> &str {
+        self.0.get_uid()
+    }
+}

crates/ical/src/lib.rs

@@ -3,9 +3,6 @@ mod timezone;
 pub use timestamp::*;
 pub use timezone::*;
 
-mod duration;
-pub use duration::parse_duration;
-
 mod icalendar;
 pub use icalendar::*;
 

crates/ical/src/timestamp.rs

@@ -1,4 +1,4 @@
-use super::timezone::CalTimezone;
+use super::timezone::ICalTimezone;
 use chrono::{DateTime, Datelike, Duration, Local, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use chrono_tz::Tz;
 use derive_more::derive::Deref;
@@ -64,8 +64,8 @@ pub enum CalDateTime {
     // Form 2, example: 19980119T070000Z -> UTC
     // Form 3, example: TZID=America/New_York:19980119T020000 -> Olson
     // https://en.wikipedia.org/wiki/Tz_database
-    DateTime(DateTime<CalTimezone>),
+    DateTime(DateTime<ICalTimezone>),
-    Date(NaiveDate, CalTimezone),
+    Date(NaiveDate, ICalTimezone),
 }
 
 impl From<CalDateTime> for DateTime<rrule::Tz> {
@@ -102,13 +102,13 @@ impl Ord for CalDateTime {
 
 impl From<DateTime<Local>> for CalDateTime {
     fn from(value: DateTime<Local>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Local))
+        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Local))
     }
 }
 
 impl From<DateTime<Utc>> for CalDateTime {
     fn from(value: DateTime<Utc>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Olson(chrono_tz::UTC)))
+        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
     }
 }
 
@@ -151,6 +151,7 @@ impl CalDateTime {
         } else {
             // No explicit timezone specified.
             // This is valid and will be localtime or UTC depending on the value
+            // We will stick to this default as documented in https://github.com/lennart-k/rustical/issues/102
             None
         };
 
@@ -160,7 +161,7 @@ impl CalDateTime {
     pub fn format(&self) -> String {
         match self {
             Self::DateTime(datetime) => match datetime.timezone() {
-                CalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
+                ICalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
                 _ => datetime.format(LOCAL_DATE_TIME).to_string(),
             },
             Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
@@ -185,7 +186,7 @@ impl CalDateTime {
         matches!(&self, Self::Date(_, _))
     }
 
-    pub fn as_datetime(&self) -> Cow<'_, DateTime<CalTimezone>> {
+    pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
         match self {
             Self::DateTime(datetime) => Cow::Borrowed(datetime),
             Self::Date(date, tz) => Cow::Owned(
@@ -209,7 +210,7 @@ impl CalDateTime {
             }
             return Ok(CalDateTime::DateTime(
                 datetime
-                    .and_local_timezone(CalTimezone::Local)
+                    .and_local_timezone(ICalTimezone::Local)
                     .earliest()
                     .ok_or(CalDateTimeError::LocalTimeGap)?,
             ));
@@ -219,8 +220,8 @@ impl CalDateTime {
             return Ok(datetime.and_utc().into());
         }
         let timezone = timezone
-            .map(CalTimezone::Olson)
+            .map(ICalTimezone::Olson)
-            .unwrap_or(CalTimezone::Local);
+            .unwrap_or(ICalTimezone::Local);
         if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
             return Ok(CalDateTime::Date(date, timezone));
         }
@@ -252,7 +253,7 @@ impl CalDateTime {
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(year, month, day)
                         .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
-                    CalTimezone::Local,
+                    ICalTimezone::Local,
                 ),
                 false,
             ));
@@ -264,7 +265,7 @@ impl CalDateTime {
         self.as_datetime().to_utc()
     }
 
-    pub fn timezone(&self) -> CalTimezone {
+    pub fn timezone(&self) -> ICalTimezone {
         match &self {
             CalDateTime::DateTime(datetime) => datetime.timezone(),
             CalDateTime::Date(_, tz) => tz.to_owned(),
@@ -400,7 +401,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                 ),
                 true
             )
@@ -410,7 +411,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                 ),
                 true
             )
@@ -420,7 +421,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                 ),
                 false
             )

crates/ical/src/timezone.rs

@@ -3,21 +3,21 @@ use chrono_tz::Tz;
 use derive_more::{Display, From};
 
 #[derive(Debug, Clone, From, PartialEq, Eq)]
-pub enum CalTimezone {
+pub enum ICalTimezone {
     Local,
     Olson(Tz),
 }
 
-impl From<CalTimezone> for rrule::Tz {
+impl From<ICalTimezone> for rrule::Tz {
-    fn from(value: CalTimezone) -> Self {
+    fn from(value: ICalTimezone) -> Self {
         match value {
-            CalTimezone::Local => Self::LOCAL,
+            ICalTimezone::Local => Self::LOCAL,
-            CalTimezone::Olson(tz) => Self::Tz(tz),
+            ICalTimezone::Olson(tz) => Self::Tz(tz),
         }
     }
 }
 
-impl From<rrule::Tz> for CalTimezone {
+impl From<rrule::Tz> for ICalTimezone {
     fn from(value: rrule::Tz) -> Self {
         match value {
             rrule::Tz::Local(_) => Self::Local,
@@ -41,7 +41,7 @@ impl chrono::Offset for CalTimezoneOffset {
     }
 }
 
-impl TimeZone for CalTimezone {
+impl TimeZone for ICalTimezone {
     type Offset = CalTimezoneOffset;
 
     fn from_offset(offset: &Self::Offset) -> Self {

crates/ical/tests/test_cal_object.rs

@@ -0,0 +1,30 @@
+use rustical_ical::CalendarObject;
+
+const MULTI_VEVENT: &str = r#"
+BEGIN:VCALENDAR
+PRODID:-//Example Corp.//CalDAV Client//EN
+VERSION:2.0
+BEGIN:VEVENT
+UID:2@example.com
+SUMMARY:Weekly Meeting
+DTSTAMP:20041210T183838Z
+DTSTART:20041206T120000Z
+DTEND:20041206T130000Z
+RRULE:FREQ=WEEKLY
+END:VEVENT
+BEGIN:VEVENT
+UID:2@example.com
+SUMMARY:Weekly Meeting
+RECURRENCE-ID:20041213T120000Z
+DTSTAMP:20041210T183838Z
+DTSTART:20041213T130000Z
+DTEND:20041213T140000Z
+END:VEVENT
+END:VCALENDAR
+"#;
+
+#[test]
+fn parse_calendar_object() {
+    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string()).unwrap();
+    object.expand_recurrence(None, None).unwrap();
+}

crates/oidc/src/lib.rs

@@ -192,20 +192,19 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
         .await
         .map_err(|e| OidcError::UserInfo(e.to_string()))?;
 
-    if let Some(require_group) = &oidc_config.require_group {
+    if let Some(require_group) = &oidc_config.require_group
-        if !user_info_claims
+        && !user_info_claims
             .additional_claims()
             .groups
             .clone()
             .unwrap_or_default()
             .contains(require_group)
-        {
+    {
-            return Ok((
+        return Ok((
-                StatusCode::UNAUTHORIZED,
+            StatusCode::UNAUTHORIZED,
-                "User is not in an authorized group to use RustiCal",
+            "User is not in an authorized group to use RustiCal",
-            )
+        )
-                .into_response());
+            .into_response());
-        }
     }
 
     let user_id = match oidc_config.claim_userid {

crates/store/src/addressbook_store.rs

@@ -76,8 +76,8 @@ pub trait AddressbookStore: Send + Sync + 'static {
 
     async fn import_addressbook(
         &self,
-        principal: String,
         addressbook: Addressbook,
         objects: Vec<AddressObject>,
+        merge_existing: bool,
     ) -> Result<(), Error>;
 }

crates/store/src/auth/middleware.rs

@@ -72,12 +72,11 @@ where
         let mut inner = self.inner.clone();
 
         Box::pin(async move {
-            if let Some(session) = request.extensions().get::<Session>() {
+            if let Some(session) = request.extensions().get::<Session>()
-                if let Ok(Some(user_id)) = session.get::<String>("user").await {
+                && let Ok(Some(user_id)) = session.get::<String>("user").await
-                    if let Ok(Some(user)) = ap.get_principal(&user_id).await {
+                && let Ok(Some(user)) = ap.get_principal(&user_id).await
-                        request.extensions_mut().insert(user);
+            {
-                    }
+                request.extensions_mut().insert(user);
-                }
             }
 
             if let Some(auth) = auth_header {

crates/store/src/calendar.rs

@@ -3,16 +3,26 @@ use std::str::FromStr;
 use crate::synctoken::format_synctoken;
 use chrono::NaiveDateTime;
 use rustical_ical::CalendarObjectType;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Default, Clone, Serialize)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
-pub struct Calendar {
+pub struct CalendarMetadata {
-    pub principal: String,
+    // Attributes that may be outsourced
-    pub id: String,
     pub displayname: Option<String>,
     pub order: i64,
     pub description: Option<String>,
     pub color: Option<String>,
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub struct Calendar {
+    // Attributes that may be outsourced
+    #[serde(flatten)]
+    pub meta: CalendarMetadata,
+
+    // Common calendar attributes
+    pub principal: String,
+    pub id: String,
     pub timezone_id: Option<String>,
     pub deleted_at: Option<NaiveDateTime>,
     pub synctoken: i64,

crates/store/src/calendar_store.rs

@@ -34,6 +34,12 @@ pub trait CalendarStore: Send + Sync + 'static {
         use_trashbin: bool,
     ) -> Result<(), Error>;
     async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), Error>;
+    async fn import_calendar(
+        &self,
+        calendar: Calendar,
+        objects: Vec<CalendarObject>,
+        merge_existing: bool,
+    ) -> Result<(), Error>;
 
     async fn sync_changes(
         &self,

crates/store/src/combined_calendar_store.rs

@@ -1,264 +1,208 @@
+use crate::CalendarStore;
 use async_trait::async_trait;
-use derive_more::Constructor;
+use std::{collections::HashMap, sync::Arc};
-use rustical_ical::CalendarObject;
-use std::sync::Arc;
 
-use crate::{
+pub trait PrefixedCalendarStore: CalendarStore {
-    Calendar, CalendarStore, Error, calendar_store::CalendarQuery,
+    const PREFIX: &'static str;
-    contact_birthday_store::BIRTHDAYS_PREFIX,
-};
-
-#[derive(Debug, Constructor)]
-pub struct CombinedCalendarStore<CS: CalendarStore, BS: CalendarStore> {
-    cal_store: Arc<CS>,
-    birthday_store: Arc<BS>,
 }
 
-impl<CS: CalendarStore, BS: CalendarStore> Clone for CombinedCalendarStore<CS, BS> {
+#[derive(Clone)]
-    fn clone(&self) -> Self {
+pub struct CombinedCalendarStore {
+    stores: HashMap<&'static str, Arc<dyn CalendarStore>>,
+    default: Arc<dyn CalendarStore>,
+}
+
+impl CombinedCalendarStore {
+    pub fn new(default: Arc<dyn CalendarStore>) -> Self {
         Self {
-            cal_store: self.cal_store.clone(),
+            stores: HashMap::new(),
-            birthday_store: self.birthday_store.clone(),
+            default,
         }
     }
+
+    pub fn with_store<CS: PrefixedCalendarStore>(mut self, store: Arc<CS>) -> Self {
+        let store: Arc<dyn CalendarStore> = store;
+        self.stores.insert(CS::PREFIX, store);
+        self
+    }
+
+    fn store_for_id(&self, id: &str) -> Arc<dyn CalendarStore> {
+        self.stores
+            .iter()
+            .find(|&(prefix, _store)| id.starts_with(prefix))
+            .map(|(_prefix, store)| store.clone())
+            .unwrap_or(self.default.clone())
+    }
 }
 
 #[async_trait]
-impl<CS: CalendarStore, BS: CalendarStore> CalendarStore for CombinedCalendarStore<CS, BS> {
+impl CalendarStore for CombinedCalendarStore {
     #[inline]
     async fn get_calendar(
         &self,
         principal: &str,
         id: &str,
         show_deleted: bool,
-    ) -> Result<Calendar, Error> {
+    ) -> Result<crate::Calendar, crate::Error> {
-        if id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(id)
-            self.birthday_store
+            .get_calendar(principal, id, show_deleted)
-                .get_calendar(principal, id, show_deleted)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .get_calendar(principal, id, show_deleted)
-                .await
-        }
     }
 
-    #[inline]
     async fn update_calendar(
         &self,
         principal: String,
         id: String,
-        calendar: Calendar,
+        calendar: crate::Calendar,
     ) -> Result<(), crate::Error> {
-        if id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(&id)
-            self.birthday_store
+            .update_calendar(principal, id, calendar)
-                .update_calendar(principal, id, calendar)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .update_calendar(principal, id, calendar)
-                .await
-        }
     }
 
-    #[inline]
+    async fn insert_calendar(&self, calendar: crate::Calendar) -> Result<(), crate::Error> {
-    async fn insert_calendar(&self, calendar: Calendar) -> Result<(), Error> {
+        self.store_for_id(&calendar.id)
-        if calendar.id.starts_with(BIRTHDAYS_PREFIX) {
+            .insert_calendar(calendar)
-            Err(Error::ReadOnly)
+            .await
-        } else {
-            self.cal_store.insert_calendar(calendar).await
-        }
     }
 
-    #[inline]
+    async fn delete_calendar(
-    async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
+        &self,
-        Ok([
+        principal: &str,
-            self.cal_store.get_calendars(principal).await?,
+        name: &str,
-            self.birthday_store.get_calendars(principal).await?,
+        use_trashbin: bool,
-        ]
+    ) -> Result<(), crate::Error> {
-        .concat())
+        self.store_for_id(name)
+            .delete_calendar(principal, name, use_trashbin)
+            .await
+    }
+
+    async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), crate::Error> {
+        self.store_for_id(name)
+            .restore_calendar(principal, name)
+            .await
+    }
+
+    async fn sync_changes(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        synctoken: i64,
+    ) -> Result<(Vec<rustical_ical::CalendarObject>, Vec<String>, i64), crate::Error> {
+        self.store_for_id(cal_id)
+            .sync_changes(principal, cal_id, synctoken)
+            .await
+    }
+
+    async fn import_calendar(
+        &self,
+        calendar: crate::Calendar,
+        objects: Vec<rustical_ical::CalendarObject>,
+        merge_existing: bool,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(&calendar.id)
+            .import_calendar(calendar, objects, merge_existing)
+            .await
+    }
+
+    async fn calendar_query(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        query: crate::calendar_store::CalendarQuery,
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+        self.store_for_id(cal_id)
+            .calendar_query(principal, cal_id, query)
+            .await
+    }
+
+    async fn restore_object(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        object_id: &str,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(cal_id)
+            .restore_object(principal, cal_id, object_id)
+            .await
+    }
+
+    async fn calendar_metadata(
+        &self,
+        principal: &str,
+        cal_id: &str,
+    ) -> Result<crate::CollectionMetadata, crate::Error> {
+        self.store_for_id(cal_id)
+            .calendar_metadata(principal, cal_id)
+            .await
+    }
+
+    async fn get_objects(
+        &self,
+        principal: &str,
+        cal_id: &str,
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+        self.store_for_id(cal_id)
+            .get_objects(principal, cal_id)
+            .await
+    }
+
+    async fn put_object(
+        &self,
+        principal: String,
+        cal_id: String,
+        object: rustical_ical::CalendarObject,
+        overwrite: bool,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(&cal_id)
+            .put_object(principal, cal_id, object, overwrite)
+            .await
     }
 
-    #[inline]
     async fn delete_object(
         &self,
         principal: &str,
         cal_id: &str,
         object_id: &str,
         use_trashbin: bool,
-    ) -> Result<(), Error> {
+    ) -> Result<(), crate::Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id)
-            self.birthday_store
+            .delete_object(principal, cal_id, object_id, use_trashbin)
-                .delete_object(principal, cal_id, object_id, use_trashbin)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .delete_object(principal, cal_id, object_id, use_trashbin)
-                .await
-        }
     }
 
-    #[inline]
     async fn get_object(
         &self,
         principal: &str,
         cal_id: &str,
         object_id: &str,
         show_deleted: bool,
-    ) -> Result<CalendarObject, Error> {
+    ) -> Result<rustical_ical::CalendarObject, crate::Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id)
-            self.birthday_store
+            .get_object(principal, cal_id, object_id, show_deleted)
-                .get_object(principal, cal_id, object_id, show_deleted)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .get_object(principal, cal_id, object_id, show_deleted)
-                .await
-        }
     }
 
-    #[inline]
+    async fn get_calendars(&self, principal: &str) -> Result<Vec<crate::Calendar>, crate::Error> {
-    async fn sync_changes(
+        let mut calendars = self.default.get_calendars(principal).await?;
+        for store in self.stores.values() {
+            calendars.extend(store.get_calendars(principal).await?);
+        }
+        Ok(calendars)
+    }
+
+    async fn get_deleted_calendars(
         &self,
         principal: &str,
-        cal_id: &str,
+    ) -> Result<Vec<crate::Calendar>, crate::Error> {
-        synctoken: i64,
+        let mut calendars = self.default.get_deleted_calendars(principal).await?;
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
+        for store in self.stores.values() {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+            calendars.extend(store.get_deleted_calendars(principal).await?);
-            self.birthday_store
-                .sync_changes(principal, cal_id, synctoken)
-                .await
-        } else {
-            self.cal_store
-                .sync_changes(principal, cal_id, synctoken)
-                .await
         }
+        Ok(calendars)
     }
 
-    #[inline]
-    async fn calendar_metadata(
-        &self,
-        principal: &str,
-        cal_id: &str,
-    ) -> Result<crate::CollectionMetadata, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .calendar_metadata(principal, cal_id)
-                .await
-        } else {
-            self.cal_store.calendar_metadata(principal, cal_id).await
-        }
-    }
-    #[inline]
-    async fn get_objects(
-        &self,
-        principal: &str,
-        cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.get_objects(principal, cal_id).await
-        } else {
-            self.cal_store.get_objects(principal, cal_id).await
-        }
-    }
-
-    #[inline]
-    async fn calendar_query(
-        &self,
-        principal: &str,
-        cal_id: &str,
-        query: CalendarQuery,
-    ) -> Result<Vec<CalendarObject>, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .calendar_query(principal, cal_id, query)
-                .await
-        } else {
-            self.cal_store
-                .calendar_query(principal, cal_id, query)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), Error> {
-        if name.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.restore_calendar(principal, name).await
-        } else {
-            self.cal_store.restore_calendar(principal, name).await
-        }
-    }
-
-    #[inline]
-    async fn delete_calendar(
-        &self,
-        principal: &str,
-        name: &str,
-        use_trashbin: bool,
-    ) -> Result<(), Error> {
-        if name.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .delete_calendar(principal, name, use_trashbin)
-                .await
-        } else {
-            self.cal_store
-                .delete_calendar(principal, name, use_trashbin)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn get_deleted_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
-        Ok([
-            self.birthday_store.get_deleted_calendars(principal).await?,
-            self.cal_store.get_deleted_calendars(principal).await?,
-        ]
-        .concat())
-    }
-
-    #[inline]
-    async fn restore_object(
-        &self,
-        principal: &str,
-        cal_id: &str,
-        object_id: &str,
-    ) -> Result<(), Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .restore_object(principal, cal_id, object_id)
-                .await
-        } else {
-            self.cal_store
-                .restore_object(principal, cal_id, object_id)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn put_object(
-        &self,
-        principal: String,
-        cal_id: String,
-        object: CalendarObject,
-        overwrite: bool,
-    ) -> Result<(), Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .put_object(principal, cal_id, object, overwrite)
-                .await
-        } else {
-            self.cal_store
-                .put_object(principal, cal_id, object, overwrite)
-                .await
-        }
-    }
-
-    #[inline]
     fn is_read_only(&self, cal_id: &str) -> bool {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id).is_read_only(cal_id)
-            self.birthday_store.is_read_only(cal_id)
-        } else {
-            self.cal_store.is_read_only(cal_id)
-        }
     }
 }

crates/store/src/contact_birthday_store.rs

@@ -1,4 +1,7 @@
-use crate::{Addressbook, AddressbookStore, Calendar, CalendarStore, Error};
+use crate::{
+    Addressbook, AddressbookStore, Calendar, CalendarStore, Error, calendar::CalendarMetadata,
+    combined_calendar_store::PrefixedCalendarStore,
+};
 use async_trait::async_trait;
 use derive_more::derive::Constructor;
 use rustical_ical::{AddressObject, CalendarObject, CalendarObjectType};
@@ -10,16 +13,22 @@ pub(crate) const BIRTHDAYS_PREFIX: &str = "_birthdays_";
 #[derive(Constructor, Clone)]
 pub struct ContactBirthdayStore<AS: AddressbookStore>(Arc<AS>);
 
+impl<AS: AddressbookStore> PrefixedCalendarStore for ContactBirthdayStore<AS> {
+    const PREFIX: &'static str = BIRTHDAYS_PREFIX;
+}
+
 fn birthday_calendar(addressbook: Addressbook) -> Calendar {
     Calendar {
         principal: addressbook.principal,
         id: format!("{}{}", BIRTHDAYS_PREFIX, addressbook.id),
-        displayname: addressbook
+        meta: CalendarMetadata {
-            .displayname
+            displayname: addressbook
-            .map(|name| format!("{name} birthdays")),
+                .displayname
-        order: 0,
+                .map(|name| format!("{name} birthdays")),
-        description: None,
+            order: 0,
-        color: None,
+            description: None,
+            color: None,
+        },
         timezone_id: None,
         deleted_at: addressbook.deleted_at,
         synctoken: addressbook.synctoken,
@@ -83,6 +92,15 @@ impl<AS: AddressbookStore> CalendarStore for ContactBirthdayStore<AS> {
         Err(Error::ReadOnly)
     }
 
+    async fn import_calendar(
+        &self,
+        _calendar: Calendar,
+        _objects: Vec<CalendarObject>,
+        _merge_existing: bool,
+    ) -> Result<(), Error> {
+        Err(Error::ReadOnly)
+    }
+
     async fn sync_changes(
         &self,
         principal: &str,

crates/store/src/lib.rs

@@ -22,7 +22,7 @@ pub use secret::Secret;
 pub use subscription_store::*;
 
 pub use addressbook::Addressbook;
-pub use calendar::Calendar;
+pub use calendar::{Calendar, CalendarMetadata};
 
 #[derive(Debug, Clone)]
 pub enum CollectionOperationInfo {

crates/store_sqlite/src/addressbook_store.rs

@@ -17,7 +17,7 @@ struct AddressObjectRow {
 }
 
 impl TryFrom<AddressObjectRow> for AddressObject {
-    type Error = crate::Error;
+    type Error = rustical_store::Error;
 
     fn try_from(value: AddressObjectRow) -> Result<Self, Self::Error> {
         Ok(Self::from_vcf(value.id, value.vcf)?)
@@ -259,7 +259,7 @@ impl SqliteAddressbookStore {
         .fetch_all(executor)
         .await.map_err(crate::Error::from)?
         .into_iter()
-        .map(|row| row.try_into().map_err(rustical_store::Error::from))
+        .map(|row| row.try_into())
         .collect()
     }
 
@@ -270,7 +270,7 @@ impl SqliteAddressbookStore {
         object_id: &str,
         show_deleted: bool,
     ) -> Result<AddressObject, rustical_store::Error> {
-        Ok(sqlx::query_as!(
+        sqlx::query_as!(
             AddressObjectRow,
             "SELECT id, vcf FROM addressobjects WHERE (principal, addressbook_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
             principal,
@@ -281,7 +281,7 @@ impl SqliteAddressbookStore {
         .fetch_one(executor)
         .await
         .map_err(crate::Error::from)?
-        .try_into()?)
+        .try_into()
     }
 
     async fn _put_object<'e, E: Executor<'e, Database = Sqlite>>(
@@ -433,14 +433,14 @@ impl AddressbookStore for SqliteAddressbookStore {
         Self::_delete_addressbook(&mut *tx, principal, addressbook_id, use_trashbin).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        if let Some(addressbook) = addressbook {
+        if let Some(addressbook) = addressbook
-            if let Err(err) = self.sender.try_send(CollectionOperation {
+            && let Err(err) = self.sender.try_send(CollectionOperation {
                 data: CollectionOperationInfo::Delete,
                 topic: addressbook.push_topic,
-            }) {
+            })
-                error!("Push notification about deleted addressbook failed: {err}");
+        {
-            };
+            error!("Push notification about deleted addressbook failed: {err}");
-        }
+        };
 
         Ok(())
     }
@@ -627,20 +627,32 @@ impl AddressbookStore for SqliteAddressbookStore {
     #[instrument(skip(objects))]
     async fn import_addressbook(
         &self,
-        principal: String,
         addressbook: Addressbook,
         objects: Vec<AddressObject>,
+        merge_existing: bool,
     ) -> Result<(), Error> {
         let mut tx = self.db.begin().await.map_err(crate::Error::from)?;
 
-        let addressbook_id = addressbook.id.clone();
+        let existing =
-        Self::_insert_addressbook(&mut *tx, addressbook).await?;
+            match Self::_get_addressbook(&mut *tx, &addressbook.principal, &addressbook.id, true)
+                .await
+            {
+                Ok(addressbook) => Some(addressbook),
+                Err(Error::NotFound) => None,
+                Err(err) => return Err(err),
+            };
+        if existing.is_some() && !merge_existing {
+            return Err(Error::AlreadyExists);
+        }
+        if existing.is_none() {
+            Self::_insert_addressbook(&mut *tx, addressbook.clone()).await?;
+        }
 
         for object in objects {
             Self::_put_object(
                 &mut *tx,
-                principal.clone(),
+                addressbook.principal.clone(),
-                addressbook_id.clone(),
+                addressbook.id.clone(),
                 object,
                 false,
             )

crates/store_sqlite/src/calendar_store.rs

@@ -5,7 +5,7 @@ use derive_more::derive::Constructor;
 use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
-use rustical_store::{Calendar, CalendarStore, CollectionMetadata, Error};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, CollectionMetadata, Error};
 use rustical_store::{CollectionOperation, CollectionOperationInfo};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
@@ -69,10 +69,12 @@ impl From<CalendarRow> for Calendar {
         Self {
             principal: value.principal,
             id: value.id,
-            displayname: value.displayname,
+            meta: CalendarMetadata {
-            order: value.order,
+                displayname: value.displayname,
-            description: value.description,
+                order: value.order,
-            color: value.color,
+                description: value.description,
+                color: value.color,
+            },
             timezone_id: value.timezone_id,
             deleted_at: value.deleted_at,
             synctoken: value.synctoken,
@@ -159,10 +161,10 @@ impl SqliteCalendarStore {
                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
             calendar.principal,
             calendar.id,
-            calendar.displayname,
+            calendar.meta.displayname,
-            calendar.description,
+            calendar.meta.description,
-            calendar.order,
+            calendar.meta.order,
-            calendar.color,
+            calendar.meta.color,
             calendar.subscription_url,
             calendar.timezone_id,
             calendar.push_topic,
@@ -189,10 +191,10 @@ impl SqliteCalendarStore {
                 WHERE (principal, id) = (?, ?)"#,
             calendar.principal,
             calendar.id,
-            calendar.displayname,
+            calendar.meta.displayname,
-            calendar.description,
+            calendar.meta.description,
-            calendar.order,
+            calendar.meta.order,
-            calendar.color,
+            calendar.meta.color,
             calendar.timezone_id,
             calendar.push_topic,
             comp_event, comp_todo, comp_journal,
@@ -351,7 +353,6 @@ impl SqliteCalendarStore {
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        // TODO: Prevent objects from being commited to a subscription calendar
         let (object_id, ics) = (object.get_id(), object.get_ics());
 
         let first_occurence = object
@@ -554,14 +555,14 @@ impl CalendarStore for SqliteCalendarStore {
         Self::_delete_calendar(&mut *tx, principal, id, use_trashbin).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        if let Some(cal) = cal {
+        if let Some(cal) = cal
-            if let Err(err) = self.sender.try_send(CollectionOperation {
+            && let Err(err) = self.sender.try_send(CollectionOperation {
                 data: CollectionOperationInfo::Delete,
                 topic: cal.push_topic,
-            }) {
+            })
-                error!("Push notification about deleted calendar failed: {err}");
+        {
-            };
+            error!("Push notification about deleted calendar failed: {err}");
-        }
+        };
         Ok(())
     }
 
@@ -570,6 +571,43 @@ impl CalendarStore for SqliteCalendarStore {
         Self::_restore_calendar(&self.db, principal, id).await
     }
 
+    #[instrument]
+    async fn import_calendar(
+        &self,
+        calendar: Calendar,
+        objects: Vec<CalendarObject>,
+        merge_existing: bool,
+    ) -> Result<(), Error> {
+        let mut tx = self.db.begin().await.map_err(crate::Error::from)?;
+
+        let existing_cal =
+            match Self::_get_calendar(&mut *tx, &calendar.principal, &calendar.id, true).await {
+                Ok(cal) => Some(cal),
+                Err(Error::NotFound) => None,
+                Err(err) => return Err(err),
+            };
+        if existing_cal.is_some() && !merge_existing {
+            return Err(Error::AlreadyExists);
+        }
+        if existing_cal.is_none() {
+            Self::_insert_calendar(&mut *tx, calendar.clone()).await?;
+        }
+
+        for object in objects {
+            Self::_put_object(
+                &mut *tx,
+                calendar.principal.clone(),
+                calendar.id.clone(),
+                object,
+                false,
+            )
+            .await?;
+        }
+
+        tx.commit().await.map_err(crate::Error::from)?;
+        Ok(())
+    }
+
     #[instrument]
     async fn calendar_query(
         &self,
@@ -630,11 +668,16 @@ impl CalendarStore for SqliteCalendarStore {
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        // TODO: Prevent objects from being commited to a subscription calendar
         let mut tx = self.db.begin().await.map_err(crate::Error::from)?;
 
         let object_id = object.get_id().to_owned();
 
+        let calendar = Self::_get_calendar(&mut *tx, &principal, &cal_id, true).await?;
+        if calendar.subscription_url.is_some() {
+            // We cannot commit an object to a subscription calendar
+            return Err(Error::ReadOnly);
+        }
+
         Self::_put_object(
             &mut *tx,
             principal.to_owned(),

crates/xml/derive/src/attrs.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use darling::{FromDeriveInput, FromField, FromMeta, FromVariant, util::Flag};
-use syn::{Ident, LitByteStr};
+use syn::{Ident, LitStr};
 
 #[derive(Debug, Default, FromMeta, Clone)]
 pub struct TagAttrs {
-    pub rename: Option<LitByteStr>,
+    pub rename: Option<LitStr>,
     pub ns: Option<syn::Path>,
 }
 
@@ -30,10 +30,10 @@ pub struct EnumAttrs {
 #[derive(Default, FromDeriveInput, Clone)]
 #[darling(attributes(xml))]
 pub struct StructAttrs {
-    pub root: Option<LitByteStr>,
+    pub root: Option<LitStr>,
     pub ns: Option<syn::Path>,
     #[darling(default)]
-    pub ns_prefix: HashMap<syn::Path, LitByteStr>,
+    pub ns_prefix: HashMap<syn::Path, LitStr>,
     pub allow_invalid: Flag,
 }
 

crates/xml/derive/src/field.rs

@@ -35,7 +35,7 @@ impl Field {
     }
 
     /// Field name in XML
-    pub fn xml_name(&self) -> syn::LitByteStr {
+    pub fn xml_name(&self) -> syn::LitStr {
         if let Some(rename) = self.attrs.common.rename.to_owned() {
             rename
         } else {
@@ -43,7 +43,7 @@ impl Field {
                 .field_ident()
                 .as_ref()
                 .expect("unnamed tag fields need a rename attribute");
-            syn::LitByteStr::new(ident.to_string().to_kebab_case().as_bytes(), ident.span())
+            syn::LitStr::new(ident.to_string().to_kebab_case().as_str(), ident.span())
         }
     }
 
@@ -174,6 +174,8 @@ impl Field {
             .map(|ns| quote! { if ns == #ns });
 
         let field_name = self.xml_name();
+        let b_field_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), field_name.span());
         let builder_field_ident = self.builder_field_ident();
         let deserializer = self.deserializer_type();
         let value = quote! { <#deserializer as rustical_xml::XmlDeserialize>::deserialize(reader, &start, empty)? };
@@ -186,7 +188,7 @@ impl Field {
         };
 
         Some(quote! {
-            (#namespace_match, #field_name) #namespace_condition => { #assignment; }
+            (#namespace_match, #b_field_name) #namespace_condition => { #assignment; }
         })
     }
 
@@ -231,6 +233,8 @@ impl Field {
         }
         let builder_field_ident = self.builder_field_ident();
         let field_name = self.xml_name();
+        let b_field_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), field_name.span());
 
         let value = wrap_option_if_no_default(
             quote! {
@@ -240,7 +244,7 @@ impl Field {
         );
 
         Some(quote! {
-            #field_name => {
+            #b_field_name => {
                 builder.#builder_field_ident = #value;
             }
         })
@@ -255,7 +259,6 @@ impl Field {
         let value = quote! {
             if let ::quick_xml::name::ResolveResult::Bound(ns) = &ns {
                 Some(ns.into())
-                // Some(rustical_xml::ValueDeserialize::deserialize(&String::from_utf8_lossy(ns.0.as_ref()))?)
             } else {
                 None
             }

crates/xml/derive/src/generic.rs

@@ -1,16 +1,12 @@
 pub(crate) fn get_generic_type(ty: &syn::Type) -> Option<&syn::Type> {
-    if let syn::Type::Path(syn::TypePath { path, .. }) = ty {
+    if let syn::Type::Path(syn::TypePath { path, .. }) = ty
-        if let Some(seg) = path.segments.last() {
+        && let Some(seg) = path.segments.last()
-            if let syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+        && let syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
-                args,
+            args, ..
-                ..
+        }) = &seg.arguments
-            }) = &seg.arguments
+        && let Some(syn::GenericArgument::Type(t)) = &args.first()
-            {
+    {
-                if let Some(syn::GenericArgument::Type(t)) = &args.first() {
+        return Some(t);
-                    return Some(t);
-                }
-            }
-        }
     }
     None
 }

crates/xml/derive/src/variant.rs

@@ -14,13 +14,13 @@ impl Variant {
         &self.variant.ident
     }
 
-    pub fn xml_name(&self) -> syn::LitByteStr {
+    pub fn xml_name(&self) -> syn::LitStr {
         self.attrs
             .common
             .rename
             .to_owned()
-            .unwrap_or(syn::LitByteStr::new(
+            .unwrap_or(syn::LitStr::new(
-                self.ident().to_string().to_kebab_case().as_bytes(),
+                self.ident().to_string().to_kebab_case().as_str(),
                 self.ident().span(),
             ))
     }
@@ -75,6 +75,8 @@ impl Variant {
         }
         let ident = self.ident();
         let variant_name = self.xml_name();
+        let b_variant_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), variant_name.span());
         let deserializer_type = self.deserializer_type();
 
         Some(
@@ -93,7 +95,7 @@ impl Variant {
                         panic!("tuple variants should contain exactly one element");
                     }
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             let val = Some(<#deserializer_type as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?);
                             Ok(Self::#ident(val))
                         }
@@ -104,7 +106,7 @@ impl Variant {
                         panic!("tuple variants should contain exactly one element");
                     }
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             let val = <#deserializer_type as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
                             Ok(Self::#ident(val))
                         }
@@ -112,7 +114,7 @@ impl Variant {
                 }
                 (false, Fields::Unit, _) => {
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             // Make sure that content is still consumed
                             <() as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
                             Ok(Self::#ident)

crates/xml/derive/src/xml_enum/impl_prop_name.rs

@@ -111,8 +111,7 @@ impl Enum {
                     Some(ns) => quote! { Some(#ns) },
                     None => quote! { None },
                 };
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 let out = quote! {(#ns, #xml_name)};
 
                 let ident = &variant.variant.ident;
@@ -134,8 +133,7 @@ impl Enum {
 
             let str_to_unit_branches = tagged_variants.iter().map(|variant| {
                 let ident = &variant.variant.ident;
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 if variant.attrs.prop.is_some() {
                     quote! { #xml_name => Ok(Self::#ident (Default::default())) }
                 } else {

crates/xml/derive/src/xml_enum/impl_se.rs

@@ -16,8 +16,8 @@ impl Enum {
                 fn serialize(
                     &self,
                     ns: Option<::quick_xml::name::Namespace>,
-                    tag: Option<&[u8]>,
+                    tag: Option<&str>,
-                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &[u8]>,
+                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &str>,
                     writer: &mut ::quick_xml::Writer<&mut Vec<u8>>
                 ) -> ::std::io::Result<()> {
                     use ::quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
@@ -25,19 +25,20 @@ impl Enum {
                     let prefix = ns
                         .map(|ns| namespaces.get(&ns))
                         .unwrap_or(None)
-                        .map(|prefix| if !prefix.is_empty() {
+                         .map(|prefix| {
-                            [*prefix, b":"].concat()
+                             if !prefix.is_empty() {
-                        } else {
+                                format!("{prefix}:")
-                            vec![]
+                             } else {
-                        });
+                                String::new()
+                             }
+                         });
                     let has_prefix = prefix.is_some();
                     let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-                    let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));
 
                     const enum_untagged: bool = #enum_untagged;
 
-                    if let Some(qname) = &qname {
+                    if let Some(tagname) = tagname.as_ref() {
-                        let mut bytes_start = BytesStart::from(qname.to_owned());
+                        let mut bytes_start = BytesStart::new(tagname);
                         if !has_prefix {
                             if let Some(ns) = &ns {
                                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
@@ -48,8 +49,8 @@ impl Enum {
 
                     #(#variant_serializers);*
 
-                    if let Some(qname) = &qname {
+                    if let Some(tagname) = tagname.as_ref() {
-                        writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+                        writer.write_event(Event::End(BytesEnd::new(tagname)))?;
                     }
                     Ok(())
                 }

crates/xml/derive/src/xml_enum/mod.rs

@@ -66,6 +66,9 @@ impl Enum {
                             Event::CData(cdata) => {
                                 return Err(::rustical_xml::XmlError::UnsupportedEvent("CDATA"));
                             }
+                            Event::GeneralRef(_) => {
+                                return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
+                            }
                             Event::Decl(_) => { /* <?xml ... ?> ignore this */ }
                             Event::Comment(_) => { /* ignore */ }
                             Event::DocType(_) => { /* ignore */ }
@@ -108,8 +111,7 @@ impl Enum {
                     Some(ns) => quote! { Some(#ns) },
                     None => quote! { None },
                 };
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 quote! {(#ns, #xml_name)}
             });
 

crates/xml/derive/src/xml_struct/impl_se.rs

@@ -33,7 +33,7 @@ impl NamedStruct {
                 let field_index = field.target_field_index();
                 quote! {
                     ::quick_xml::events::attributes::Attribute {
-                        key: ::quick_xml::name::QName(#field_name),
+                        key: ::quick_xml::name::QName(#field_name.as_bytes()),
                         value: ::std::borrow::Cow::from(::rustical_xml::ValueSerialize::serialize(&self.#field_index).into_bytes())
                     }
                 }
@@ -47,7 +47,7 @@ impl NamedStruct {
                 let field_index = field.target_field_index();
                 quote! {
                     let tag_str = self.#field_index.to_string();
-                    let tag = Some(tag.unwrap_or(tag_str.as_bytes()));
+                    let tag = Some(tag.unwrap_or(tag_str.as_str()));
                 }
             });
 
@@ -70,13 +70,12 @@ impl NamedStruct {
                 .ns_prefix
                 .iter()
                 .map(|(ns, prefix)| {
-                    let sep = if !prefix.value().is_empty() {
+                    let attr_name = if prefix.value().is_empty() {
-                        b":".to_vec()
+                        "xmlns".to_owned()
                     } else {
-                        b"".to_vec()
+                        format!("xmlns:{}", prefix.value())
                     };
-                    let attr_name = [b"xmlns".as_ref(), &sep, &prefix.value()].concat();
+                    let a = syn::LitByteStr::new(attr_name.as_bytes(), prefix.span());
-                    let a = syn::LitByteStr::new(&attr_name, prefix.span());
                     quote! {
                          bytes_start.push_attribute((#a.as_ref(), #ns.as_ref()));
                     }
@@ -91,8 +90,8 @@ impl NamedStruct {
                 fn serialize(
                     &self,
                     ns: Option<::quick_xml::name::Namespace>,
-                    tag: Option<&[u8]>,
+                    tag: Option<&str>,
-                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &[u8]>,
+                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &str>,
                     writer: &mut ::quick_xml::Writer<&mut Vec<u8>>
                 ) -> ::std::io::Result<()> {
                     use ::quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
@@ -105,17 +104,16 @@ impl NamedStruct {
                          .unwrap_or(None)
                          .map(|prefix| {
                              if !prefix.is_empty() {
-                                 [*prefix, b":"].concat()
+                                format!("{prefix}:")
                              } else {
-                                 Vec::new()
+                                String::new()
                              }
                          });
                      let has_prefix = prefix.is_some();
                      let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-                     let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));
+
-                    //
+                    if let Some(tagname) = tagname.as_ref() {
-                    if let Some(qname) = &qname {
+                        let mut bytes_start = BytesStart::new(tagname);
-                        let mut bytes_start = BytesStart::from(qname.to_owned());
                         if !has_prefix {
                             if let Some(ns) = &ns {
                                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
@@ -134,8 +132,8 @@ impl NamedStruct {
                     }
                     if !#is_empty {
                         #(#tag_writers);*
-                        if let Some(qname) = &qname {
+                        if let Some(tagname) = tagname.as_ref() {
-                            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+                            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
                         }
                     }
                     Ok(())

crates/xml/derive/src/xml_struct/mod.rs

@@ -68,7 +68,7 @@ impl NamedStruct {
                 .ns_prefix
                 .iter()
                 .map(|(ns, prefix)| {
-                    quote! { (#ns, #prefix.as_ref()) }
+                    quote! { (#ns, #prefix) }
                 })
                 .collect()
         } else {
@@ -77,9 +77,9 @@ impl NamedStruct {
 
         quote! {
             impl #impl_generics ::rustical_xml::XmlRootTag for #ident #type_generics #where_clause {
-                fn root_tag() -> &'static [u8] { #root }
+                fn root_tag() -> &'static str { #root }
                 fn root_ns() -> Option<::quick_xml::name::Namespace<'static>> { #ns }
-                fn root_ns_prefixes() -> ::std::collections::HashMap<::quick_xml::name::Namespace<'static>, &'static [u8]> {
+                fn root_ns_prefixes() -> ::std::collections::HashMap<::quick_xml::name::Namespace<'static>, &'static str> {
                     ::std::collections::HashMap::from_iter(vec![
                         #(#prefixes),*
                     ])
@@ -148,6 +148,8 @@ impl NamedStruct {
                         }
                     }
 
+                    let mut string = String::new();
+
                     if !empty {
                         loop {
                             let event = reader.read_event_into(&mut buf)?;
@@ -167,12 +169,23 @@ impl NamedStruct {
                                     }
                                 }
                                 Event::Text(bytes_text) => {
-                                    let text = bytes_text.unescape()?;
+                                    let text = bytes_text.decode()?;
-                                    #(#text_field_branches)*
+                                    string.push_str(&text);
                                 }
                                 Event::CData(cdata) => {
                                     let text = String::from_utf8(cdata.to_vec())?;
-                                    #(#text_field_branches)*
+                                    string.push_str(&text);
+                                }
+                                Event::GeneralRef(gref) => {
+                                    if let Some(char) = gref.resolve_char_ref()? {
+                                        string.push(char);
+                                    } else if let Some(text) =
+                                        quick_xml::escape::resolve_xml_entity(&gref.xml_content()?)
+                                    {
+                                        string.push_str(text);
+                                    } else {
+                                        return Err(XmlError::UnsupportedEvent("invalid XML ref"));
+                                    }
                                 }
                                 Event::Decl(_) => { /* <?xml ... ?> ignore this */ }
                                 Event::Comment(_) => { /* ignore */ }
@@ -185,6 +198,9 @@ impl NamedStruct {
                         }
                     }
 
+                    let text = string;
+                    #(#text_field_branches)*
+
                     Ok(Self {
                         #(#builder_field_builds),*
                     })

crates/xml/src/de.rs

@@ -49,7 +49,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
                     let (ns, name) = reader.resolve_element(start.name());
                     let matches = match (Self::root_ns(), &ns, name) {
                         // Wrong tag
-                        (_, _, name) if name.as_ref() != Self::root_tag() => false,
+                        (_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,
                         // Wrong namespace
                         (Some(root_ns), ns, _) if &ResolveResult::Bound(root_ns) != ns => false,
                         _ => true,
@@ -60,7 +60,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
                             format!("{ns:?}"),
                             String::from_utf8_lossy(name.as_ref()).to_string(),
                             format!("{root_ns:?}"),
-                            String::from_utf8_lossy(Self::root_tag()).to_string(),
+                            Self::root_tag().to_owned(),
                         ));
                     };
 

crates/xml/src/error.rs

@@ -8,6 +8,8 @@ pub enum XmlError {
     #[error(transparent)]
     QuickXmlError(#[from] quick_xml::Error),
     #[error(transparent)]
+    QuickXmlEncodingError(#[from] quick_xml::encoding::EncodingError),
+    #[error(transparent)]
     QuickXmlAttrError(#[from] quick_xml::events::attributes::AttrError),
     #[error(transparent)]
     FromUtf8Error(#[from] FromUtf8Error),

crates/xml/src/lib.rs

@@ -23,9 +23,9 @@ pub use xml_derive::PropName;
 pub use xml_derive::XmlRootTag;
 
 pub trait XmlRootTag {
-    fn root_tag() -> &'static [u8];
+    fn root_tag() -> &'static str;
     fn root_ns() -> Option<Namespace<'static>>;
-    fn root_ns_prefixes() -> HashMap<Namespace<'static>, &'static [u8]>;
+    fn root_ns_prefixes() -> HashMap<Namespace<'static>, &'static str>;
 }
 
 #[derive(Debug)]