version 0.9.2

fixes #116

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.8.1"
+version = "0.9.2"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"
@@ -48,7 +48,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 = [

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

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,6 +37,7 @@ 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")
@@ -65,6 +66,7 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     }
 
     for object in &objects {
+        vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
             CalendarObjectComponent::Event(EventObject {
                 event,
@@ -83,6 +85,10 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         }
     }
 
+    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,102 @@
+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_ical::{CalendarObject, CalendarObjectType};
+use rustical_store::{Calendar, 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>>,
+    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,
+        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, false).await?;
+
+    Ok(StatusCode::OK.into_response())
+}

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

@@ -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")]

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/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,
@@ -224,13 +225,13 @@ 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}"
                         )));
                     }
-                    }
                     self.cal.timezone_id = timezone_id;
                     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/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,12 +60,12 @@ 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());
     }
-    }
     resource_service
         .delete_resource(path_components, !no_trash)
         .await?;

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>,

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,16 +22,16 @@ 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));
+            .map(|tagname| ::quick_xml::name::QName(tagname.as_bytes()));
 
         if let Some(qname) = &qname {
             let mut bytes_start = BytesStart::from(qname.to_owned());

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/edit-addressbook-form.ts

@@ -30,7 +30,7 @@ export class EditAddressbookForm extends LitElement {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</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

@@ -42,7 +42,7 @@ export class EditCalendarForm extends LitElement {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Edit calendar</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/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) => {
@@ -28,7 +29,7 @@ let EditAddressbookForm = class extends i {
     return x`
       <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</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) => {
@@ -29,7 +30,7 @@ let EditCalendarForm = class extends i {
     return x`
       <button @click=${() => this.dialog.value.showModal()}>Edit calendar</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

@@ -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/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/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/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")]
@@ -66,10 +68,11 @@ impl Default for CalendarObjectComponent {
 }
 
 #[derive(Debug, Clone, Default)]
-pub struct CalendarObject<const VERIFIED: bool = true> {
+pub struct CalendarObject {
     data: CalendarObjectComponent,
     properties: Vec<Property>,
     ics: String,
+    vtimezones: HashMap<String, IcalTimeZone>,
 }
 
 impl CalendarObject {
@@ -101,6 +104,13 @@ impl CalendarObject {
             .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
             .collect();
 
+        let vtimezones = cal
+            .timezones
+            .clone()
+            .into_iter()
+            .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
+            .collect();
+
         let data = if let Some(event) = cal.events.into_iter().next() {
             CalendarObjectComponent::Event(EventObject { event, timezones })
         } else if let Some(todo) = cal.todos.into_iter().next() {
@@ -117,9 +127,14 @@ 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
     }

crates/ical/src/timestamp.rs

@@ -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
         };
 

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/calendar.rs

@@ -3,9 +3,9 @@ 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 principal: String,
     pub id: String,

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

@@ -189,6 +189,24 @@ impl<CS: CalendarStore, BS: CalendarStore> CalendarStore for CombinedCalendarSto
         }
     }
 
+    #[inline]
+    async fn import_calendar(
+        &self,
+        calendar: Calendar,
+        objects: Vec<CalendarObject>,
+        merge_existing: bool,
+    ) -> Result<(), Error> {
+        if calendar.id.starts_with(BIRTHDAYS_PREFIX) {
+            self.birthday_store
+                .import_calendar(calendar, objects, merge_existing)
+                .await
+        } else {
+            self.cal_store
+                .import_calendar(calendar, objects, merge_existing)
+                .await
+        }
+    }
+
     #[inline]
     async fn delete_calendar(
         &self,

crates/store/src/contact_birthday_store.rs

@@ -83,6 +83,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_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>>(
@@ -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

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

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
+        && let Some(syn::GenericArgument::Type(t)) = &args.first()
     {
-                if let Some(syn::GenericArgument::Type(t)) = &args.first() {
         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,14 +25,16 @@ 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() {
+                                format!("{prefix}:")
                              } else {
-                            vec![]
+                                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));
+                    let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname.as_bytes()));
 
                     const enum_untagged: bool = #enum_untagged;
 

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

@@ -108,8 +108,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,15 +104,15 @@ 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));
+                     let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname.as_bytes()));
-                    //
+
                     if let Some(qname) = &qname {
                         let mut bytes_start = BytesStart::from(qname.to_owned());
                         if !has_prefix {

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),*
                     ])

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/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)]

crates/xml/src/namespace.rs

@@ -28,7 +28,7 @@ impl<'a> From<&'a Namespace<'a>> for NamespaceOwned {
 }
 
 impl NamespaceOwned {
-    pub fn as_ref(&self) -> Namespace {
+    pub fn as_ref(&self) -> Namespace<'_> {
         Namespace(&self.0)
     }
 }

crates/xml/src/se.rs

@@ -10,8 +10,8 @@ pub trait XmlSerialize {
     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<()>;
 
@@ -22,8 +22,8 @@ impl<T: XmlSerialize> XmlSerialize for Option<T> {
     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<()> {
         if let Some(some) = self {
@@ -60,8 +60,8 @@ impl XmlSerialize for () {
     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
@@ -69,21 +69,19 @@ impl XmlSerialize for () {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    [*prefix, ":"].concat()
                 } 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| QName(tagname));
+        let qname = tagname.as_ref().map(|tagname| QName(tagname.as_bytes()));
         if let Some(qname) = &qname {
             let mut bytes_start = BytesStart::from(qname.to_owned());
-            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()));
             }
-            }
             writer.write_event(Event::Empty(bytes_start))?;
         }
         Ok(())

crates/xml/src/value.rs

@@ -107,8 +107,8 @@ impl<T: ValueSerialize> XmlSerialize for T {
     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
@@ -116,21 +116,19 @@ impl<T: ValueSerialize> XmlSerialize for T {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    [*prefix, ":"].concat()
                 } 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| QName(tagname));
+        let qname = tagname.as_ref().map(|tagname| QName(tagname.as_bytes()));
         if let Some(qname) = &qname {
             let mut bytes_start = BytesStart::from(qname.to_owned());
-            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()));
             }
-            }
             writer.write_event(Event::Start(bytes_start))?;
         }
         writer.write_event(Event::Text(BytesText::new(&self.serialize())))?;

crates/xml/tests/de_enum.rs

@@ -1,9 +1,9 @@
-use rustical_xml::{de::XmlDocument, XmlDeserialize, XmlRootTag};
+use rustical_xml::{XmlDeserialize, XmlRootTag, de::XmlDocument};
 
 #[test]
 fn test_struct_tagged_enum() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Propfind {
         prop: Prop,
     }
@@ -58,7 +58,7 @@ fn test_struct_tagged_enum() {
 #[test]
 fn test_tagged_enum_complex() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Propfind {
         prop: PropStruct,
     }
@@ -116,7 +116,7 @@ fn test_enum_document() {
 #[test]
 fn test_untagged_enum() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         prop: PropElement,
     }

crates/xml/tests/de_struct.rs

@@ -6,7 +6,7 @@ use std::collections::HashSet;
 #[test]
 fn test_struct_text_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "text")]
         text: String,
@@ -27,7 +27,7 @@ fn test_struct_text_field() {
 #[test]
 fn test_struct_document() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -52,9 +52,9 @@ fn test_struct_document() {
 #[test]
 fn test_struct_rename_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"ok-wow")]
+        #[xml(rename = "ok-wow")]
         child: Child,
     }
 
@@ -78,7 +78,7 @@ fn test_struct_rename_field() {
 #[test]
 fn test_struct_optional_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Option<Child>,
     }
@@ -96,9 +96,9 @@ fn test_struct_optional_field() {
 #[test]
 fn test_struct_vec() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"child", flatten)]
+        #[xml(rename = "child", flatten)]
         children: Vec<Child>,
     }
 
@@ -124,9 +124,9 @@ fn test_struct_vec() {
 #[test]
 fn test_struct_set() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"child", flatten)]
+        #[xml(rename = "child", flatten)]
         children: HashSet<Child>,
     }
 
@@ -154,7 +154,7 @@ fn test_struct_ns() {
     const NS_HELLO: Namespace = Namespace(b"hello");
 
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ns = "NS_HELLO")]
         child: (),
@@ -169,7 +169,7 @@ fn test_struct_attr() {
     const NS_HELLO: Namespace = Namespace(b"hello");
 
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ns = "NS_HELLO")]
         child: (),
@@ -196,7 +196,7 @@ fn test_struct_attr() {
 #[test]
 fn test_struct_generics() {
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document<T: XmlDeserialize> {
         #[allow(dead_code)]
         child: T,
@@ -217,7 +217,7 @@ fn test_struct_generics() {
 #[test]
 fn test_struct_unparsed() {
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[allow(dead_code)]
         child: Unparsed,
@@ -238,7 +238,7 @@ fn test_struct_unparsed() {
 #[test]
 fn test_xml_values() {
     #[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         href: String,
     }
@@ -262,7 +262,7 @@ fn test_xml_values() {
 #[test]
 fn test_xml_cdata() {
     #[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "text")]
         hello: String,
@@ -293,7 +293,7 @@ fn test_xml_cdata() {
 #[test]
 fn test_struct_xml_decl() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -323,7 +323,7 @@ fn test_struct_xml_decl() {
 #[test]
 fn test_struct_tuple() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -348,7 +348,7 @@ fn test_struct_tuple() {
 #[test]
 fn test_struct_untagged_ns() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged")]
         child: Child,

crates/xml/tests/enum_variants.rs

@@ -29,7 +29,7 @@ enum CalendarProp {
     #[allow(dead_code)]
     Getcontenttype(&'static str),
 
-    #[xml(ns = "NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "NS_DAV", rename = "principal-URL")]
     #[allow(dead_code)]
     PrincipalUrl,
     #[allow(dead_code)]

crates/xml/tests/propertyupdate.rs

@@ -36,7 +36,7 @@ fn test_propertyupdate() {
     }
 
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"propertyupdate")]
+    #[xml(root = "propertyupdate")]
     struct PropertyupdateElement<T: XmlDeserialize> {
         #[xml(ty = "untagged", flatten)]
         #[allow(dead_code)]

crates/xml/tests/se_enum.rs

@@ -3,7 +3,7 @@ use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
 #[test]
 fn test_struct_value_tagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Document {
         prop: Prop,
     }

crates/xml/tests/se_struct.rs

@@ -7,7 +7,7 @@ use xml_derive::XmlDeserialize;
 #[test]
 fn test_struct_document() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -30,7 +30,7 @@ fn test_struct_document() {
 #[test]
 fn test_struct_untagged_attr() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "attr")]
         name: String,
@@ -57,7 +57,7 @@ fn test_struct_untagged_attr() {
 #[test]
 fn test_struct_value_tagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         href: String,
         num: usize,
@@ -82,7 +82,7 @@ fn test_struct_value_tagged() {
 #[test]
 fn test_struct_value_untagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged")]
         href: String,
@@ -103,7 +103,7 @@ fn test_struct_value_untagged() {
 #[test]
 fn test_struct_vec() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(flatten)]
         href: Vec<String>,
@@ -127,7 +127,7 @@ fn test_struct_vec() {
 #[test]
 fn test_struct_serialize_with() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(serialize_with = "serialize_href")]
         href: String,
@@ -136,8 +136,8 @@ fn test_struct_serialize_with() {
     fn serialize_href(
         val: &str,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         val.to_uppercase().serialize(ns, tag, namespaces, writer)
@@ -160,7 +160,7 @@ fn test_struct_serialize_with() {
 #[test]
 fn test_struct_tag_list() {
     #[derive(Debug, XmlRootTag, XmlSerialize, XmlDeserialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged", flatten)]
         tags: Vec<Tag>,
@@ -194,9 +194,9 @@ fn test_struct_ns() {
     const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
 
     #[derive(Debug, XmlRootTag, XmlSerialize)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(ns = "NS", rename = b"okay")]
+        #[xml(ns = "NS", rename = "okay")]
         child: String,
     }
 
@@ -210,7 +210,7 @@ fn test_struct_ns() {
 #[test]
 fn test_struct_tuple() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -230,8 +230,8 @@ fn test_tuple_struct() {
     const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
 
     #[derive(Debug, XmlRootTag, XmlSerialize)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
-    struct Document(#[xml(ns = "NS", rename = b"okay")] String);
+    struct Document(#[xml(ns = "NS", rename = "okay")] String);
 
     Document("hello!".to_string())
         .serialize_to_string()

src/app.rs

@@ -38,6 +38,7 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
     oidc_config: Option<OidcConfig>,
     nextcloud_login_config: NextcloudLoginConfig,
     dav_push_enabled: bool,
+    session_cookie_samesite_strict: bool,
 ) -> Router<()> {
     let combined_cal_store = Arc::new(CombinedCalendarStore::new(
         cal_store.clone(),
@@ -126,8 +127,13 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
     router
         .layer(
             SessionManagerLayer::new(session_store)
+                .with_name("rustical_session")
                 .with_secure(true)
-                .with_same_site(SameSite::Strict)
+                .with_same_site(if session_cookie_samesite_strict {
+                    SameSite::Strict
+                } else {
+                    SameSite::Lax
+                })
                 .with_expiry(Expiry::OnInactivity(
                     tower_sessions::cookie::time::Duration::hours(2),
                 )),

src/config.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 pub struct HttpConfig {
     pub host: String,
     pub port: u16,
+    pub session_cookie_samesite_strict: bool,
 }
 
 impl Default for HttpConfig {
@@ -14,6 +15,7 @@ impl Default for HttpConfig {
         Self {
             host: "0.0.0.0".to_owned(),
             port: 4000,
+            session_cookie_samesite_strict: false,
         }
     }
 }

src/main.rs

@@ -116,6 +116,7 @@ async fn main() -> Result<()> {
                 config.oidc.clone(),
                 config.nextcloud_login.clone(),
                 config.dav_push.enabled,
+                config.http.session_cookie_samesite_strict,
             );
             let app = ServiceExt::<Request>::into_make_service(
                 NormalizePathLayer::trim_trailing_slash().layer(app),