version 0.9.1

fixes #112

.editorconfig

@@ -2,3 +2,5 @@
 indent_style = space
 indent_size = 4
 
+[docs/**/*.md]
+indent_size = 4

.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
+  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
   "describe": {
     "columns": [
       {
@@ -14,68 +14,63 @@
         "type_info": "Text"
       },
       {
-        "name": "synctoken",
+        "name": "displayname",
         "ordinal": 2,
-        "type_info": "Integer"
+        "type_info": "Text"
       },
       {
-        "name": "displayname",
+        "name": "order",
         "ordinal": 3,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
         "name": "description",
         "ordinal": 4,
         "type_info": "Text"
       },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
       {
         "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
+        "ordinal": 5,
         "type_info": "Text"
       },
       {
         "name": "timezone_id",
-        "ordinal": 8,
+        "ordinal": 6,
         "type_info": "Text"
       },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 7,
         "type_info": "Datetime"
       },
+      {
+        "name": "synctoken",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -85,14 +80,13 @@
     "nullable": [
       false,
       false,
-      false,
-      true,
       true,
       false,
       true,
       true,
       true,
       true,
+      false,
       true,
       false,
       false,
@@ -100,5 +94,5 @@
       false
     ]
   },
-  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
+  "hash": "27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd"
 }

.sqlx/query-2f043f62a7c0eae1023e319f0bc8f35dfdcf6a8247e03b1de3e2cabb2d3ab8ae.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            REPLACE INTO principals\n            (id, displayname, principal_type, password_hash)\n            VALUES (?, ?, ?, ?)\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "2f043f62a7c0eae1023e319f0bc8f35dfdcf6a8247e03b1de3e2cabb2d3ab8ae"
-}

.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3"
+}

.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9"
-}

.sqlx/query-5c09c2a3c052188435409d4ff076575394e625dd19f00dea2d4c71a9f34a5952.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO principals\n            (id, displayname, principal_type, password_hash) VALUES (?, ?, ?, ?)\n            ON CONFLICT(id) DO UPDATE SET\n                (displayname, principal_type, password_hash)\n                = (excluded.displayname, excluded.principal_type, excluded.password_hash)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "5c09c2a3c052188435409d4ff076575394e625dd19f00dea2d4c71a9f34a5952"
+}

.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113"
+}

.sqlx/query-660833e0505d3bbcd6dd736cce06b1bf14263d0e0e87b27d89d376d422e4e474.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT length(vcf) AS 'length!: u64', deleted_at AS 'deleted!: bool' FROM addressobjects WHERE principal = ? AND addressbook_id = ?",
+  "describe": {
+    "columns": [
+      {
+        "name": "length!: u64",
+        "ordinal": 0,
+        "type_info": "Null"
+      },
+      {
+        "name": "deleted!: bool",
+        "ordinal": 1,
+        "type_info": "Datetime"
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      null,
+      true
+    ]
+  },
+  "hash": "660833e0505d3bbcd6dd736cce06b1bf14263d0e0e87b27d89d376d422e4e474"
+}

.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json

@@ -39,43 +39,38 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone",
+        "name": "timezone_id",
         "ordinal": 7,
         "type_info": "Text"
       },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -93,7 +88,6 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,

.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json

@@ -39,43 +39,38 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone",
+        "name": "timezone_id",
         "ordinal": 7,
         "type_info": "Text"
       },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -93,7 +88,6 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,

.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7"
-}

.sqlx/query-d9f14260a46a7ccd137d462c35d350a7fe338a074131776596c5d803fcda1f48.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT length(ics) AS 'length!: u64', deleted_at AS 'deleted!: bool' FROM calendarobjects WHERE principal = ? AND cal_id = ?",
+  "describe": {
+    "columns": [
+      {
+        "name": "length!: u64",
+        "ordinal": 0,
+        "type_info": "Null"
+      },
+      {
+        "name": "deleted!: bool",
+        "ordinal": 1,
+        "type_info": "Datetime"
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      null,
+      true
+    ]
+  },
+  "hash": "d9f14260a46a7ccd137d462c35d350a7fe338a074131776596c5d803fcda1f48"
+}

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.4.4"
+version = "0.9.1"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"
@@ -95,8 +95,12 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { version = "0.11", features = ["generator", "serde"] }
-toml = "0.8"
+ical = { git = "https://github.com/lennart-k/ical-rs", features = [
+  "generator",
+  "serde",
+  "chrono-tz",
+] }
+toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
   "trace",
@@ -126,7 +130,7 @@ syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.5"
-darling = "0.20"
+darling = "0.21"
 reqwest = { version = "0.12", features = [
   "rustls-tls",
   "charset",
@@ -135,10 +139,12 @@ reqwest = { version = "0.12", features = [
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
 matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" }
+vtimezones-rs = "0.2"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }
 openssl = { version = "0.10", features = ["vendored"] }
+async-std = { version = "1.13", features = ["attributes"] }
 
 [dependencies]
 rustical_store = { workspace = true }

Dockerfile

@@ -1,11 +1,11 @@
-FROM --platform=$BUILDPLATFORM rust:1.86-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
 # the compiler will otherwise ask for aarch64-linux-musl-gcc
 ENV CC_aarch64_unknown_linux_musl="clang"
-ENV AR_aarch64_unknown_linux_musl="llvm-ar"
+ENV AR_aarch64_unknown_linux_musl="llvm20-ar"
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"
 
 # Stupid workaound with tempfiles since environment variables
@@ -16,7 +16,7 @@ RUN case $TARGETPLATFORM in \
   *) echo "Unsupported platform ${TARGETPLATFORM}"; exit 1;;  \
   esac
 
-RUN apk add --no-cache musl-dev llvm19 clang perl pkgconf make \
+RUN apk add --no-cache musl-dev llvm20 clang perl pkgconf make \
   && rustup target add "$(cat /tmp/rust_target)" \
   && cargo install cargo-chef --locked \
   && rm -rf "$CARGO_HOME/registry"

Justfile

@@ -1,2 +1,14 @@
 licenses:
   cargo about generate about.hbs > crates/frontend/public/assets/licenses.html
+
+frontend-dev:
+  cd crates/frontend/js-components && deno task dev
+
+frontend-build:
+  cd crates/frontend/js-components && deno task build
+
+docs:
+  mkdocs build
+
+docs-dev:
+  mkdocs serve

README.md

@@ -3,22 +3,23 @@
 a CalDAV/CardDAV server
 
 > [!WARNING]
-  RustiCal is **not production-ready!**
-  I've been using RustiCal for the last few weeks and I'm slowly becoming more confident,
-  however you'd be one of the first testers so expect bugs and rough edges.
+  RustiCal is under **active development**!
+  While I've been successfully using RustiCal productively for a few weeks now,
+  you'd still be one of the first testers so expect bugs and rough edges.
   If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
-- [WebDAV Push](https://github.com/bitfireAT/webdav-push/) support, so near-instant synchronisation to DAVx5
+- **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)
 - deleted calendars are recoverable
 - Nextcloud login flow (In DAVx5 you can login through the Nextcloud flow and automatically generate an app token)
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
-- OpenID Connect support (with option to disable password login)
+- **OpenID Connect** support (with option to disable password login)
+- Group-based **sharing**
 
 ## Getting Started
 
@@ -31,3 +32,4 @@ a CalDAV/CardDAV server
 - Evolution
 - Apple Calendar
 - Home Assistant integration
+- Thunderbird

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

compose.oidc.yml

@@ -0,0 +1,22 @@
+services:
+  rustical:
+    image: ghcr.io/lennart-k/rustical:latest
+    restart: unless-stopped
+    environment:
+      RUSTICAL_FRONTEND__ALLOW_PASSWORD_LOGIN: "false"
+      RUSTICAL_OIDC__NAME: "Authelia"
+      RUSTICAL_OIDC__ISSUER: "https://auth.example.com"
+      RUSTICAL_OIDC__CLIENT_ID: "{{ rustical_oidc_client_id }}"
+      RUSTICAL_OIDC__CLIENT_SECRET: "{{ rustical_oidc_client_secret }}"
+      RUSTICAL_OIDC__CLAIM_USERID: "preferred_username"
+      RUSTICAL_OIDC__SCOPES: '["openid", "profile", "groups"]'
+      RUSTICAL_OIDC__REQUIRE_GROUP: "app:rustical" # optional
+      RUSTICAL_OIDC__ALLOW_SIGN_UP: "true"
+    volumes:
+      - data:/var/lib/rustical
+    # Here you probably want to you expose instead
+    ports:
+      - 4000:4000
+
+volumes:
+  data:

crates/caldav/Cargo.toml

@@ -7,6 +7,12 @@ repository.workspace = true
 license.workspace = true
 publish = false
 
+[dev-dependencies]
+rustical_store_sqlite = { workspace = true, features = ["test"] }
+rstest.workspace = true
+async-std.workspace = true
+serde_json.workspace = true
+
 [dependencies]
 axum.workspace = true
 axum-extra.workspace = true
@@ -37,3 +43,4 @@ headers.workspace = true
 tower-http.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
+vtimezones-rs.workspace = true

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

@@ -4,7 +4,7 @@ use axum::body::Body;
 use axum::extract::State;
 use axum::{extract::Path, response::Response};
 use headers::{ContentType, HeaderMapExt};
-use http::{HeaderValue, StatusCode, header};
+use http::{HeaderValue, Method, StatusCode, header};
 use ical::generator::{Emitter, IcalCalendarBuilder};
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
@@ -19,6 +19,7 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, calendar_id)): Path<(String, String)>,
     State(CalendarResourceService { cal_store, .. }): State<CalendarResourceService<C, S>>,
     user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(crate::Error::Unauthorized);
@@ -36,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")
@@ -62,9 +64,9 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
             params: None,
         });
     }
-    let mut ical_calendar = ical_calendar_builder.build();
 
     for object in &objects {
+        vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
             CalendarObjectComponent::Event(EventObject {
                 event,
@@ -72,17 +74,25 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
                 ..
             }) => {
                 timezones.extend(object_timezones);
-                ical_calendar.events.push(event.clone());
+                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
             }
-            CalendarObjectComponent::Todo(TodoObject { todo, .. }) => {
-                ical_calendar.todos.push(todo.clone());
+            CalendarObjectComponent::Todo(TodoObject(todo)) => {
+                ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
             }
-            CalendarObjectComponent::Journal(JournalObject { journal, .. }) => {
-                ical_calendar.journals.push(journal.clone());
+            CalendarObjectComponent::Journal(JournalObject(journal)) => {
+                ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
             }
         }
     }
 
+    for vtimezone in vtimezones.into_values() {
+        ical_calendar_builder = ical_calendar_builder.add_tz(vtimezone.to_owned());
+    }
+
+    let ical_calendar = ical_calendar_builder
+        .build()
+        .map_err(|parser_error| Error::IcalError(parser_error.into()))?;
+
     let mut resp = Response::builder().status(StatusCode::OK);
     let hdrs = resp.headers_mut().unwrap();
     hdrs.typed_insert(ContentType::from_str("text/calendar").unwrap());
@@ -96,5 +106,9 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         ))
         .unwrap(),
     );
-    Ok(resp.body(Body::new(ical_calendar.generate())).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(ical_calendar.generate())).unwrap())
+    }
 }

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

@@ -4,6 +4,7 @@ use crate::calendar::prop::SupportedCalendarComponentSet;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use http::{Method, StatusCode};
+use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
@@ -82,13 +83,38 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         request.displayname = None
     }
 
+    let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
+        Some(tzid)
+    } else if let Some(tz) = request.calendar_timezone {
+        // TODO: Proper error (calendar-timezone precondition)
+        let calendar = IcalParser::new(tz.as_bytes())
+            .next()
+            .ok_or(rustical_dav::Error::BadRequest(
+                "No timezone data provided".to_owned(),
+            ))?
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        let timezone = calendar
+            .timezones
+            .first()
+            .ok_or(rustical_dav::Error::BadRequest(
+                "No timezone data provided".to_owned(),
+            ))?;
+        let timezone: chrono_tz::Tz = timezone
+            .try_into()
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        Some(timezone.name().to_owned())
+    } else {
+        None
+    };
+
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
         order: request.calendar_order.unwrap_or(0),
         displayname: request.displayname,
-        timezone: request.calendar_timezone,
-        timezone_id: request.calendar_timezone_id,
+        timezone_id,
         color: request.calendar_color,
         description: request.calendar_description,
         deleted_at: None,

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

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

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

@@ -16,6 +16,7 @@ pub(crate) struct TimeRangeElement {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
 struct ParamFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     is_not_defined: Option<()>,
@@ -32,11 +33,13 @@ struct TextMatchElement {
     #[xml(ty = "attr")]
     collation: String,
     #[xml(ty = "attr")]
-    negate_collation: String,
+    // "yes" or "no", default: "no"
+    negate_condition: Option<String>,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
 pub(crate) struct PropFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     is_not_defined: Option<()>,
@@ -46,6 +49,9 @@ pub(crate) struct PropFilterElement {
     text_match: Option<TextMatchElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     param_filter: Vec<ParamFilterElement>,
+
+    #[xml(ty = "attr")]
+    name: String,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -61,7 +67,7 @@ pub(crate) struct CompFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub(crate) comp_filter: Vec<CompFilterElement>,
 
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", ty = "attr")]
+    #[xml(ty = "attr")]
     pub(crate) name: String,
 }
 
@@ -203,3 +209,102 @@ pub async fn get_objects_calendar_query<C: CalendarStore>(
     }
     Ok(objects)
 }
+
+#[cfg(test)]
+mod tests {
+    use rustical_dav::xml::PropElement;
+    use rustical_xml::XmlDocument;
+
+    use crate::{
+        calendar::methods::report::{
+            ReportRequest,
+            calendar_query::{
+                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
+                PropFilterElement, TextMatchElement,
+            },
+        },
+        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
+    };
+
+    #[test]
+    fn calendar_query_7_8_7() {
+        const INPUT: &str = r#"
+            <?xml version="1.0" encoding="utf-8" ?>
+            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
+                <D:prop xmlns:D="DAV:">
+                    <D:getetag/>
+                    <C:calendar-data/>
+                </D:prop>
+                <C:filter>
+                <C:comp-filter name="VCALENDAR">
+                    <C:comp-filter name="VEVENT">
+                        <C:prop-filter name="ATTENDEE">
+                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
+                            <C:param-filter name="PARTSTAT">
+                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
+                            </C:param-filter>
+                        </C:prop-filter>
+                    </C:comp-filter>
+                </C:comp-filter>
+                </C:filter>
+            </C:calendar-query>
+        "#;
+
+        let report = ReportRequest::parse_str(INPUT).unwrap();
+        let calendar_query: CalendarQueryRequest =
+            if let ReportRequest::CalendarQuery(query) = report {
+                query
+            } else {
+                panic!()
+            };
+        assert_eq!(
+            calendar_query,
+            CalendarQueryRequest {
+                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
+                    vec![
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::Getetag,
+                        ),
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::CalendarData(Default::default())
+                        ),
+                    ],
+                    vec![]
+                )),
+                filter: Some(FilterElement {
+                    comp_filter: CompFilterElement {
+                        is_not_defined: None,
+                        time_range: None,
+                        prop_filter: vec![],
+                        comp_filter: vec![CompFilterElement {
+                            prop_filter: vec![PropFilterElement {
+                                name: "ATTENDEE".to_owned(),
+                                text_match: Some(TextMatchElement {
+                                    collation: "i;ascii-casemap".to_owned(),
+                                    negate_condition: None
+                                }),
+                                is_not_defined: None,
+                                param_filter: vec![ParamFilterElement {
+                                    is_not_defined: None,
+                                    name: "PARTSTAT".to_owned(),
+                                    text_match: Some(TextMatchElement {
+                                        collation: "i;ascii-casemap".to_owned(),
+                                        negate_condition: None
+                                    }),
+                                }],
+                                time_range: None
+                            }],
+                            comp_filter: vec![],
+                            is_not_defined: None,
+                            name: "VEVENT".to_owned(),
+                            time_range: None
+                        }],
+                        name: "VCALENDAR".to_owned()
+                    }
+                }),
+                timezone: None,
+                timezone_id: None
+            }
+        )
+    }
+}

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

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

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

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

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

@@ -3,6 +3,7 @@ use crate::Error;
 use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
+use ical::IcalParser;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -15,7 +16,7 @@ use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
-use std::str::FromStr;
+use serde::Deserialize;
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
@@ -34,7 +35,7 @@ pub enum CalendarProp {
     CalendarTimezoneId(Option<String>),
     #[xml(ns = "rustical_dav::namespace::NS_ICAL")]
     CalendarOrder(Option<i64>),
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     SupportedCalendarComponentSet(SupportedCalendarComponentSet),
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCalendarData(SupportedCalendarData),
@@ -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,
@@ -133,7 +134,9 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarDescription(self.cal.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
-                    CalendarProp::CalendarTimezone(self.cal.timezone.clone())
+                    CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
+                        vtimezones_rs::VTIMEZONES.get(tzid).map(|tz| tz.to_string())
+                    }))
                 }
                 // chrono_tz uses the IANA database
                 CalendarPropName::TimezoneServiceSet => CalendarProp::TimezoneServiceSet(
@@ -192,21 +195,42 @@ impl Resource for CalendarResource {
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
-                    // TODO: Ensure that timezone-id is also updated
-                    self.cal.timezone = timezone;
+                    if let Some(tz) = timezone {
+                        // TODO: Proper error (calendar-timezone precondition)
+                        let calendar = IcalParser::new(tz.as_bytes())
+                            .next()
+                            .ok_or(rustical_dav::Error::BadRequest(
+                                "No timezone data provided".to_owned(),
+                            ))?
+                            .map_err(|_| {
+                                rustical_dav::Error::BadRequest(
+                                    "No timezone data provided".to_owned(),
+                                )
+                            })?;
+
+                        let timezone =
+                            calendar
+                                .timezones
+                                .first()
+                                .ok_or(rustical_dav::Error::BadRequest(
+                                    "No timezone data provided".to_owned(),
+                                ))?;
+                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+                        })?;
+
+                        self.cal.timezone_id = Some(timezone.name().to_owned());
+                    }
                     Ok(())
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
                     if let Some(tzid) = &timezone_id {
-                        // Validate timezone id
-                        chrono_tz::Tz::from_str(tzid).map_err(|_| {
-                            rustical_dav::Error::BadRequest(format!(
-                                "Invalid timezone-id: {}",
-                                tzid
-                            ))
-                        })?;
-                        // TODO: Ensure that timezone is also updated (For now hope that clients play nice)
+                        if !vtimezones_rs::VTIMEZONES.contains_key(tzid) {
+                            return Err(rustical_dav::Error::BadRequest(format!(
+                                "Invalid timezone-id: {tzid}"
+                            )));
+                        }
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
@@ -247,15 +271,11 @@ impl Resource for CalendarResource {
                     self.cal.description = None;
                     Ok(())
                 }
-                CalendarPropName::CalendarTimezone => {
-                    self.cal.timezone = None;
-                    Ok(())
-                }
-                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::CalendarTimezoneId => {
+                CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
                     self.cal.timezone_id = None;
                     Ok(())
                 }
+                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                 CalendarPropName::CalendarOrder => {
                     self.cal.order = 0;
                     Ok(())
@@ -308,3 +328,15 @@ impl Resource for CalendarResource {
         ))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_tzdb_version() {
+        // Ensure that both chrono_tz and vzic_rs use the same tzdb version
+        assert_eq!(
+            chrono_tz::IANA_TZDB_VERSION,
+            vtimezones_rs::IANA_TZDB_VERSION
+        );
+    }
+}

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;
@@ -51,7 +52,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy, webdav-push";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, webdav-push";
 
     async fn get_resource(
         &self,
@@ -138,6 +139,13 @@ impl<C: CalendarStore, S: SubscriptionStore> AxumMethods for CalendarResourceSer
         })
     }
 
+    fn import() -> Option<rustical_dav::resource::MethodFunction<Self>> {
+        Some(|state, req| {
+            let mut service = Handler::with_state(route_import::<C, S>, state);
+            Box::pin(Service::call(&mut service, req))
+        })
+    }
+
     fn mkcalendar() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>>
     {
         Some(|state, req| {

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

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

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

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

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

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

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

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

crates/caldav/src/calendar/tests.rs

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

crates/caldav/src/calendar_object/methods.rs

@@ -6,7 +6,7 @@ use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::TypedHeader;
 use headers::{ContentType, ETag, HeaderMapExt, IfNoneMatch};
-use http::{HeaderMap, StatusCode};
+use http::{HeaderMap, Method, StatusCode};
 use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
@@ -22,6 +22,7 @@ pub async fn get_event<C: CalendarStore>(
     }): Path<CalendarObjectPathComponents>,
     State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
     user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(crate::Error::Unauthorized);
@@ -42,7 +43,11 @@ pub async fn get_event<C: CalendarStore>(
     let hdrs = resp.headers_mut().unwrap();
     hdrs.typed_insert(ETag::from_str(&event.get_etag()).unwrap());
     hdrs.typed_insert(ContentType::from_str("text/calendar").unwrap());
-    Ok(resp.body(Body::new(event.get_ics().to_owned())).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(event.get_ics().to_owned())).unwrap())
+    }
 }
 
 #[instrument(skip(cal_store))]
@@ -73,12 +78,13 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(object_id, body) {
+    let object = match CalendarObject::from_ics(body) {
         Ok(obj) => obj,
         Err(_) => {
             return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
         }
     };
+    assert_eq!(object.get_id(), object_id);
     cal_store
         .put_object(principal, calendar_id, object, overwrite)
         .await?;

crates/caldav/src/calendar_object/resource.rs

@@ -69,7 +69,6 @@ impl Resource for CalendarObjectResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        // TODO: Extract summary from object
         None
     }
 

crates/caldav/src/lib.rs

@@ -1,5 +1,3 @@
-use axum::response::Redirect;
-use axum::routing::any;
 use axum::{Extension, Router};
 use derive_more::Constructor;
 use principal::PrincipalResourceService;
@@ -14,7 +12,6 @@ pub mod calendar;
 pub mod calendar_object;
 pub mod error;
 pub mod principal;
-
 pub use error::Error;
 
 #[derive(Debug, Clone, Constructor)]
@@ -34,23 +31,18 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
     auth_provider: Arc<AP>,
     store: Arc<C>,
     subscription_store: Arc<S>,
+    simplified_home_set: bool,
 ) -> Router {
-    let principal_service = PrincipalResourceService {
-        auth_provider: auth_provider.clone(),
-        sub_store: subscription_store.clone(),
-        cal_store: store.clone(),
-    };
-
-    Router::new()
-        .nest(
-            prefix,
-            RootResourceService::<_, Principal, CalDavPrincipalUri>::new(principal_service.clone())
-                .axum_router()
-                .layer(AuthenticationLayer::new(auth_provider))
-                .layer(Extension(CalDavPrincipalUri(prefix))),
-        )
-        .route(
-            "/.well-known/caldav",
-            any(async || Redirect::permanent(prefix)),
-        )
+    Router::new().nest(
+        prefix,
+        RootResourceService::<_, Principal, CalDavPrincipalUri>::new(PrincipalResourceService {
+            auth_provider: auth_provider.clone(),
+            sub_store: subscription_store.clone(),
+            cal_store: store.clone(),
+            simplified_home_set,
+        })
+        .axum_router()
+        .layer(AuthenticationLayer::new(auth_provider))
+        .layer(Extension(CalDavPrincipalUri(prefix))),
+    )
 }

crates/caldav/src/principal/mod.rs

@@ -11,11 +11,15 @@ mod service;
 pub use service::*;
 mod prop;
 pub use prop::*;
+#[cfg(test)]
+pub mod tests;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct PrincipalResource {
     principal: Principal,
     members: Vec<String>,
+    // If true only return the principal as the calendar home set, otherwise also groups
+    simplified_home_set: bool,
 }
 
 impl ResourceName for PrincipalResource {
@@ -37,11 +41,6 @@ impl Resource for PrincipalResource {
         Resourcetype(&[
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "principal"),
-            // https://github.com/apple/ccs-calendarserver/blob/13c706b985fb728b9aab42dc0fef85aae21921c3/doc/Extensions/caldav-proxy.txt
-            // ResourcetypeInner(
-            //     Some(rustical_dav::namespace::NS_CALENDARSERVER),
-            //     "calendar-proxy-write",
-            // ),
         ])
     }
 
@@ -62,9 +61,17 @@ impl Resource for PrincipalResource {
                     PrincipalPropName::PrincipalUrl => {
                         PrincipalProp::PrincipalUrl(principal_url.into())
                     }
-                    PrincipalPropName::CalendarHomeSet => {
-                        PrincipalProp::CalendarHomeSet(principal_url.into())
-                    }
+                    PrincipalPropName::CalendarHomeSet => PrincipalProp::CalendarHomeSet(
+                        CalendarHomeSet(if self.simplified_home_set {
+                            vec![principal_url.into()]
+                        } else {
+                            self.principal
+                                .memberships()
+                                .iter()
+                                .map(|principal| puri.principal_uri(principal).into())
+                                .collect()
+                        }),
+                    ),
                     PrincipalPropName::CalendarUserAddressSet => {
                         PrincipalProp::CalendarUserAddressSet(principal_url.into())
                     }
@@ -114,7 +121,7 @@ impl Resource for PrincipalResource {
     }
 
     fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
-        Ok(UserPrivilegeSet::owner_read(
+        Ok(UserPrivilegeSet::owner_only(
             user.is_principal(&self.principal.id),
         ))
     }

crates/caldav/src/principal/prop.rs

@@ -31,9 +31,12 @@ pub enum PrincipalProp {
 
     // CalDAV (RFC 4791)
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    CalendarHomeSet(HrefElement),
+    CalendarHomeSet(CalendarHomeSet),
 }
 
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
+
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {

crates/caldav/src/principal/service.rs

@@ -18,6 +18,8 @@ pub struct PrincipalResourceService<
     pub(crate) auth_provider: Arc<AP>,
     pub(crate) sub_store: Arc<S>,
     pub(crate) cal_store: Arc<CS>,
+    // If true only return the principal as the calendar home set, otherwise also groups
+    pub(crate) simplified_home_set: bool,
 }
 
 impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
@@ -28,6 +30,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
             auth_provider: self.auth_provider.clone(),
             sub_store: self.sub_store.clone(),
             cal_store: self.cal_store.clone(),
+            simplified_home_set: self.simplified_home_set,
         }
     }
 }
@@ -43,7 +46,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
     type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
 
     async fn get_resource(
         &self,
@@ -58,6 +61,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
         Ok(PrincipalResource {
             members: self.auth_provider.list_members(&user.id).await?,
             principal: user,
+            simplified_home_set: self.simplified_home_set,
         })
     }
 

crates/caldav/src/principal/tests.rs

@@ -0,0 +1,83 @@
+use std::sync::Arc;
+
+use crate::{
+    CalDavPrincipalUri,
+    principal::{PrincipalResource, PrincipalResourceService},
+};
+use rstest::rstest;
+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]
+async fn test_principal_resource(
+    #[from(get_test_calendar_store)]
+    #[future]
+    cal_store: SqliteCalendarStore,
+    #[from(get_test_principal_store)]
+    #[future]
+    auth_provider: SqlitePrincipalStore,
+    #[from(get_test_subscription_store)]
+    #[future]
+    sub_store: SqliteStore,
+) {
+    let service = PrincipalResourceService {
+        cal_store: Arc::new(cal_store.await),
+        sub_store: Arc::new(sub_store.await),
+        auth_provider: Arc::new(auth_provider.await),
+        simplified_home_set: false,
+    };
+
+    assert!(matches!(
+        service
+            .get_resource(&("invalid-user".to_owned(),), true)
+            .await,
+        Err(crate::Error::NotFound)
+    ));
+
+    let _principal_resource = service
+        .get_resource(&("user".to_owned(),), true)
+        .await
+        .unwrap();
+}
+
+#[tokio::test]
+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/address_object/methods.rs

@@ -7,6 +7,7 @@ use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::TypedHeader;
 use axum_extra::headers::{ContentType, ETag, HeaderMapExt, IfNoneMatch};
+use http::Method;
 use http::{HeaderMap, StatusCode};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
@@ -25,6 +26,7 @@ pub async fn get_object<AS: AddressbookStore>(
     }): Path<AddressObjectPathComponents>,
     State(AddressObjectResourceService { addr_store }): State<AddressObjectResourceService<AS>>,
     user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(Error::Unauthorized);
@@ -49,7 +51,11 @@ pub async fn get_object<AS: AddressbookStore>(
     let hdrs = resp.headers_mut().unwrap();
     hdrs.typed_insert(ETag::from_str(&object.get_etag()).unwrap());
     hdrs.typed_insert(ContentType::from_str("text/vcard").unwrap());
-    Ok(resp.body(Body::new(object.get_vcf().to_owned())).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(object.get_vcf().to_owned())).unwrap())
+    }
 }
 
 #[instrument(skip(addr_store, body))]

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

@@ -5,7 +5,7 @@ use axum::body::Body;
 use axum::extract::{Path, State};
 use axum::response::Response;
 use axum_extra::headers::{ContentType, HeaderMapExt};
-use http::{HeaderValue, StatusCode, header};
+use http::{HeaderValue, Method, StatusCode, header};
 use percent_encoding::{CONTROLS, utf8_percent_encode};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
@@ -20,6 +20,7 @@ pub async fn route_get<AS: AddressbookStore, S: SubscriptionStore>(
     Path((principal, addressbook_id)): Path<(String, String)>,
     State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
     user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(Error::Unauthorized);
@@ -46,7 +47,7 @@ pub async fn route_get<AS: AddressbookStore, S: SubscriptionStore>(
     let mut resp = Response::builder().status(StatusCode::OK);
     let hdrs = resp.headers_mut().unwrap();
     hdrs.typed_insert(ContentType::from_str("text/vcard").unwrap());
-    let filename = format!("{}_{}.vcf", principal, addressbook_id);
+    let filename = format!("{principal}_{addressbook_id}.vcf");
     let filename = utf8_percent_encode(&filename, CONTROLS);
     hdrs.insert(
         header::CONTENT_DISPOSITION,
@@ -55,5 +56,9 @@ pub async fn route_get<AS: AddressbookStore, S: SubscriptionStore>(
         ))
         .unwrap(),
     );
-    Ok(resp.body(Body::new(vcf)).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(vcf)).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

@@ -88,15 +88,8 @@ pub async fn route_mkcol<AS: AddressbookStore, S: SubscriptionStore>(
         }
     }
 
-    match addr_store.insert_addressbook(addressbook).await {
-        // TODO: The spec says we should return a mkcol-response.
-        // However, it works without one but breaks on iPadOS when using an empty one :)
-        Ok(()) => Ok(StatusCode::CREATED.into_response()),
-        Err(err) => {
-            dbg!(err.to_string());
-            Err(err.into())
-        }
-    }
+    addr_store.insert_addressbook(addressbook).await?;
+    Ok(StatusCode::CREATED.into_response())
 }
 
 #[cfg(test)]

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/methods/report/addressbook_multiget.rs

@@ -58,6 +58,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
     Ok((result, not_found))
 }
 
+#[allow(clippy::too_many_arguments)]
 pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
     addr_multiget: &AddressbookMultigetRequest,
     prop: &PropfindType<AddressObjectPropWrapperName>,
@@ -80,7 +81,7 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
                 object,
                 principal: principal.to_owned(),
             }
-            .propfind(&path, prop, puri, user)?,
+            .propfind(&path, prop, None, puri, user)?,
         );
     }
 

crates/carddav/src/addressbook/methods/report/sync_collection.rs

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

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

@@ -53,7 +53,13 @@ impl Resource for PrincipalResource {
                 PrincipalPropWrapper::Principal(match prop {
                     PrincipalPropName::PrincipalUrl => PrincipalProp::PrincipalUrl(principal_href),
                     PrincipalPropName::AddressbookHomeSet => {
-                        PrincipalProp::AddressbookHomeSet(principal_href)
+                        PrincipalProp::AddressbookHomeSet(AddressbookHomeSet(
+                            self.principal
+                                .memberships()
+                                .iter()
+                                .map(|principal| puri.principal_uri(principal).into())
+                                .collect(),
+                        ))
                     }
                     PrincipalPropName::PrincipalAddress => PrincipalProp::PrincipalAddress(None),
                     PrincipalPropName::GroupMembership => {

crates/carddav/src/principal/prop.rs

@@ -22,11 +22,14 @@ pub enum PrincipalProp {
 
     // CardDAV (RFC 6352)
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
-    AddressbookHomeSet(HrefElement),
+    AddressbookHomeSet(AddressbookHomeSet),
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     PrincipalAddress(Option<HrefElement>),
 }
 
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
+
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {

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,
@@ -16,12 +17,12 @@ pub enum UserPrivilege {
 }
 
 impl XmlSerialize for UserPrivilegeSet {
-    fn serialize<W: std::io::Write>(
+    fn serialize(
         &self,
         ns: Option<Namespace>,
         tag: Option<&[u8]>,
         namespaces: &HashMap<Namespace, &[u8]>,
-        writer: &mut quick_xml::Writer<W>,
+        writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
@@ -30,12 +31,11 @@ impl XmlSerialize for UserPrivilegeSet {
         }
 
         FakeUserPrivilegeSet {
-            privileges: self.privileges.iter().cloned().collect(),
+            privileges: self.privileges.iter().cloned().sorted().collect(),
         }
         .serialize(ns, tag, namespaces, writer)
     }
 
-    #[allow(refining_impl_trait)]
     fn attributes<'a>(&self) -> Option<Vec<quick_xml::events::attributes::Attribute<'a>>> {
         None
     }

crates/dav/src/resource/axum_methods.rs

@@ -18,11 +18,6 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         None
     }
 
-    #[inline]
-    fn head() -> Option<MethodFunction<Self>> {
-        None
-    }
-
     #[inline]
     fn post() -> Option<MethodFunction<Self>> {
         None
@@ -43,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![
@@ -58,8 +58,6 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         }
         if Self::get().is_some() {
             allow.push(Method::GET);
-        }
-        if Self::head().is_some() {
             allow.push(Method::HEAD);
         }
         if Self::post().is_some() {
@@ -74,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

@@ -72,16 +72,11 @@ where
                     return svc(self.resource_service.clone(), req);
                 }
             }
-            "GET" => {
+            "GET" | "HEAD" => {
                 if let Some(svc) = RS::get() {
                     return svc(self.resource_service.clone(), req);
                 }
             }
-            "HEAD" => {
-                if let Some(svc) = RS::head() {
-                    return svc(self.resource_service.clone(), req);
-                }
-            }
             "POST" => {
                 if let Some(svc) = RS::post() {
                     return svc(self.resource_service.clone(), req);
@@ -102,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/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,36 +54,30 @@ 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> =
-        if !body.is_empty() {
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-            }
-        };
-    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,
-            }
-        };
+    let propfind_self = R::Resource::parse_propfind(body).map_err(Error::XmlError)?;
+    let propfind_member = R::MemberType::parse_propfind(body).map_err(Error::XmlError)?;
 
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {
+        // TODO: authorization check for member resources
         for member in resource_service.get_members(path_components).await? {
             member_responses.push(member.propfind(
                 &format!("{}/{}", path.trim_end_matches('/'), member.get_name()),
                 &propfind_member.prop,
+                propfind_member.include.as_ref(),
                 puri,
                 principal,
             )?);
         }
     }
 
-    let response = resource.propfind(path, &propfind_self.prop, puri, principal)?;
+    let response = resource.propfind(
+        path,
+        &propfind_self.prop,
+        propfind_self.include.as_ref(),
+        puri,
+        principal,
+    )?;
 
     Ok(MultistatusElement {
         responses: vec![response],

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

@@ -26,21 +26,21 @@ enum SetPropertyPropWrapper<T: XmlDeserialize> {
 // We are <prop>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyPropWrapperWrapper<T: XmlDeserialize>(
-    #[xml(ty = "untagged")] SetPropertyPropWrapper<T>,
+    #[xml(ty = "untagged", flatten)] Vec<SetPropertyPropWrapper<T>>,
 );
 
 // We are <set>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyElement<T: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
-    prop: T,
+    prop: SetPropertyPropWrapperWrapper<T>,
 }
 
 #[derive(XmlDeserialize, Clone, Debug)]
 struct TagName(#[xml(ty = "tag_name")] String);
 
 #[derive(XmlDeserialize, Clone, Debug)]
-struct PropertyElement(#[xml(ty = "untagged")] TagName);
+struct PropertyElement(#[xml(ty = "untagged", flatten)] Vec<TagName>);
 
 #[derive(XmlDeserialize, Clone, Debug)]
 struct RemovePropertyElement {
@@ -81,9 +81,8 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     let href = path.to_owned();
 
     // Extract operations
-    let PropertyupdateElement::<SetPropertyPropWrapperWrapper<<R::Resource as Resource>::Prop>>(
-        operations,
-    ) = XmlDocument::parse_str(body).map_err(Error::XmlError)?;
+    let PropertyupdateElement::<<R::Resource as Resource>::Prop>(operations) =
+        XmlDocument::parse_str(body).map_err(Error::XmlError)?;
 
     let mut resource = resource_service
         .get_resource(path_components, false)
@@ -100,59 +99,63 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     for operation in operations.into_iter() {
         match operation {
             Operation::Set(SetPropertyElement {
-                prop: SetPropertyPropWrapperWrapper(property),
+                prop: SetPropertyPropWrapperWrapper(properties),
             }) => {
-                match property {
-                    SetPropertyPropWrapper::Valid(prop) => {
-                        let propname: <<R::Resource as Resource>::Prop as PropName>::Names =
-                            prop.clone().into();
-                        let (ns, propname): (Option<Namespace>, &str) = propname.into();
-                        match resource.set_prop(prop) {
-                            Ok(()) => {
-                                props_ok.push((ns.map(NamespaceOwned::from), propname.to_owned()))
-                            }
-                            Err(Error::PropReadOnly) => props_conflict
-                                .push((ns.map(NamespaceOwned::from), propname.to_owned())),
-                            Err(err) => return Err(err.into()),
-                        };
-                    }
-                    SetPropertyPropWrapper::Invalid(invalid) => {
-                        let propname = invalid.tag_name();
+                for property in properties {
+                    match property {
+                        SetPropertyPropWrapper::Valid(prop) => {
+                            let propname: <<R::Resource as Resource>::Prop as PropName>::Names =
+                                prop.clone().into();
+                            let (ns, propname): (Option<Namespace>, &str) = propname.into();
+                            match resource.set_prop(prop) {
+                                Ok(()) => props_ok
+                                    .push((ns.map(NamespaceOwned::from), propname.to_owned())),
+                                Err(Error::PropReadOnly) => props_conflict
+                                    .push((ns.map(NamespaceOwned::from), propname.to_owned())),
+                                Err(err) => return Err(err.into()),
+                            };
+                        }
+                        SetPropertyPropWrapper::Invalid(invalid) => {
+                            let propname = invalid.tag_name();
 
-                        if let Some(full_propname) = <R::Resource as Resource>::list_props()
-                            .into_iter()
-                            .find_map(|(ns, tag)| {
-                                if tag == propname.as_str() {
-                                    Some((ns.map(NamespaceOwned::from), tag.to_owned()))
-                                } else {
-                                    None
-                                }
-                            })
-                        {
-                            // This happens in following cases:
-                            // - read-only properties with #[serde(skip_deserializing)]
-                            // - internal properties
-                            props_conflict.push(full_propname)
-                        } else {
-                            props_not_found.push((None, propname));
+                            if let Some(full_propname) = <R::Resource as Resource>::list_props()
+                                .into_iter()
+                                .find_map(|(ns, tag)| {
+                                    if tag == propname.as_str() {
+                                        Some((ns.map(NamespaceOwned::from), tag.to_owned()))
+                                    } else {
+                                        None
+                                    }
+                                })
+                            {
+                                // This happens in following cases:
+                                // - read-only properties with #[serde(skip_deserializing)]
+                                // - internal properties
+                                props_conflict.push(full_propname)
+                            } else {
+                                props_not_found.push((None, propname));
+                            }
                         }
                     }
                 }
             }
             Operation::Remove(remove_el) => {
-                let propname = remove_el.prop.0.0;
-                match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname) {
-                    Ok(prop) => match resource.remove_prop(&prop) {
-                        Ok(()) => props_ok.push((None, propname)),
-                        Err(Error::PropReadOnly) => props_conflict.push({
-                            let (ns, tag) = prop.into();
-                            (ns.map(NamespaceOwned::from), tag.to_owned())
-                        }),
-                        Err(err) => return Err(err.into()),
-                    },
-                    // I guess removing a nonexisting property should be successful :)
-                    Err(_) => props_ok.push((None, propname)),
-                };
+                for tagname in remove_el.prop.0 {
+                    let propname = tagname.0;
+                    match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname)
+                    {
+                        Ok(prop) => match resource.remove_prop(&prop) {
+                            Ok(()) => props_ok.push((None, propname)),
+                            Err(Error::PropReadOnly) => props_conflict.push({
+                                let (ns, tag) = prop.into();
+                                (ns.map(NamespaceOwned::from), tag.to_owned())
+                            }),
+                            Err(err) => return Err(err.into()),
+                        },
+                        // I guess removing a nonexisting property should be successful :)
+                        Err(_) => props_ok.push((None, propname)),
+                    };
+                }
             }
         }
     }

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 std::collections::HashSet;
+use rustical_xml::{
+    EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
+};
 use std::str::FromStr;
 
 mod axum_methods;
@@ -102,10 +103,24 @@ 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,
         prop: &PropfindType<<Self::Prop as PropName>::Names>,
+        include: Option<&PropElement<<Self::Prop as PropName>::Names>>,
         principal_uri: &impl PrincipalUri,
         principal: &Self::Principal,
     ) -> Result<ResponseElement<Self::Prop>, Self::Error> {
@@ -115,36 +130,40 @@ pub trait Resource: Clone + Send + 'static {
             path.push('/');
         }
 
-        // TODO: Support include element
-        let (props, invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) = match prop
-        {
-            PropfindType::Propname => {
-                let props = Self::list_props()
-                    .into_iter()
-                    .map(|(ns, tag)| (ns.map(NamespaceOwned::from), tag.to_string()))
-                    .collect_vec();
+        let (mut props, mut invalid_props): (Vec<<Self::Prop as PropName>::Names>, Vec<_>) =
+            match prop {
+                PropfindType::Propname => {
+                    let props = Self::list_props()
+                        .into_iter()
+                        .map(|(ns, tag)| (ns.map(NamespaceOwned::from), tag.to_string()))
+                        .collect_vec();
 
-                return Ok(ResponseElement {
-                    href: path.to_owned(),
-                    propstat: vec![PropstatWrapper::TagList(PropstatElement {
-                        prop: TagList::from(props),
-                        status: StatusCode::OK,
-                    })],
-                    ..Default::default()
-                });
-            }
-            PropfindType::Allprop => (
-                Self::list_props()
-                    .iter()
-                    .map(|(_ns, name)| <Self::Prop as PropName>::Names::from_str(name).unwrap())
-                    .collect(),
-                vec![],
-            ),
-            PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
-                valid_tags.iter().cloned().collect(),
-                invalid_tags.to_owned(),
-            ),
-        };
+                    return Ok(ResponseElement {
+                        href: path.to_owned(),
+                        propstat: vec![PropstatWrapper::TagList(PropstatElement {
+                            prop: TagList::from(props),
+                            status: StatusCode::OK,
+                        })],
+                        ..Default::default()
+                    });
+                }
+                PropfindType::Allprop => (
+                    Self::list_props()
+                        .iter()
+                        .map(|(_ns, name)| <Self::Prop as PropName>::Names::from_str(name).unwrap())
+                        .collect(),
+                    vec![],
+                ),
+                PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
+                    valid_tags.iter().unique().cloned().collect(),
+                    invalid_tags.to_owned(),
+                ),
+            };
+
+        if let Some(PropElement(valid_tags, invalid_tags)) = include {
+            props.extend(valid_tags.clone());
+            invalid_props.extend(invalid_tags.to_owned());
+        }
 
         let prop_responses = props
             .into_iter()

crates/dav/src/xml/multistatus.rs

@@ -19,12 +19,12 @@ pub struct PropstatElement<PropType: XmlSerialize> {
     pub status: StatusCode,
 }
 
-fn xml_serialize_status<W: ::std::io::Write>(
+fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
     tag: Option<&[u8]>,
     namespaces: &HashMap<Namespace, &[u8]>,
-    writer: &mut quick_xml::Writer<W>,
+    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)]
-#[xml(ns = "crate::namespace::NS_DAV")]
+#[derive(XmlSerialize, XmlRootTag)]
+#[xml(ns = "crate::namespace::NS_DAV", root = b"response")]
+#[xml(ns_prefix(
+    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_DAVPUSH = b"PUSH"
+))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
     #[xml(serialize_with = "xml_serialize_optional_status")]
@@ -49,12 +56,12 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub propstat: Vec<PropstatWrapper<PropstatType>>,
 }
 
-fn xml_serialize_optional_status<W: ::std::io::Write>(
+fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
     tag: Option<&[u8]>,
     namespaces: &HashMap<Namespace, &[u8]>,
-    writer: &mut quick_xml::Writer<W>,
+    writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
         &val.map(|status| format!("HTTP/1.1 {}", status)),
@@ -111,11 +118,10 @@ impl<T1: XmlSerialize, T2: XmlSerialize> axum::response::IntoResponse
     fn into_response(self) -> axum::response::Response {
         use axum::body::Body;
 
-        let mut output: Vec<_> = b"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".into();
-        let mut writer = quick_xml::Writer::new_with_indent(&mut output, b' ', 4);
-        if let Err(err) = self.serialize_root(&mut writer) {
-            return crate::Error::from(err).into_response();
-        }
+        let output = match self.serialize_to_string() {
+            Ok(out) => out,
+            Err(err) => return crate::Error::from(err).into_response(),
+        };
 
         let mut resp = axum::response::Response::builder().status(StatusCode::MULTI_STATUS);
         let hdrs = resp.headers_mut().unwrap();

crates/dav/src/xml/propfind.rs

@@ -11,10 +11,11 @@ use rustical_xml::XmlRootTag;
 pub struct PropfindElement<PN: XmlDeserialize> {
     #[xml(ty = "untagged")]
     pub prop: PropfindType<PN>,
+    #[xml(ns = "crate::namespace::NS_DAV")]
+    pub include: Option<PropElement<PN>>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
-// pub struct PropElement<PN: XmlDeserialize = Propname>(#[xml(ty = "untagged", flatten)] pub Vec<PN>);
 pub struct PropElement<PN: XmlDeserialize>(
     // valid
     pub Vec<PN>,

crates/dav/src/xml/resourcetype.rs

@@ -23,20 +23,23 @@ mod tests {
 
     #[test]
     fn test_serialize_resourcetype() {
-        let mut buf = Vec::new();
-        let mut writer = quick_xml::Writer::new(&mut buf);
-        Document {
+        let out = Document {
             resourcetype: Resourcetype(&[
                 ResourcetypeInner(Some(crate::namespace::NS_DAV), "displayname"),
                 ResourcetypeInner(Some(crate::namespace::NS_CALENDARSERVER), "calendar-color"),
             ]),
         }
-        .serialize_root(&mut writer)
+        .serialize_to_string()
         .unwrap();
-        let out = String::from_utf8(buf).unwrap();
         assert_eq!(
             out,
-            "<document><resourcetype><displayname xmlns=\"DAV:\"/><calendar-color xmlns=\"http://calendarserver.org/ns/\"/></resourcetype></document>"
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<document>
+    <resourcetype>
+        <displayname xmlns="DAV:"/>
+        <calendar-color xmlns="http://calendarserver.org/ns/"/>
+    </resourcetype>
+</document>"#
         )
     }
 }

crates/dav/src/xml/sync_collection.rs

@@ -1,4 +1,4 @@
-use rustical_xml::{ValueDeserialize, ValueSerialize, XmlDeserialize};
+use rustical_xml::{ValueDeserialize, ValueSerialize, XmlDeserialize, XmlRootTag};
 
 use super::PropfindType;
 
@@ -32,11 +32,35 @@ impl ValueSerialize for SyncLevel {
     }
 }
 
+// https://datatracker.ietf.org/doc/html/rfc5323#section-5.17
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+pub struct LimitElement {
+    #[xml(ns = "crate::namespace::NS_DAV")]
+    pub nresults: NresultsElement,
+}
+
+impl From<u64> for LimitElement {
+    fn from(value: u64) -> Self {
+        Self {
+            nresults: NresultsElement(value),
+        }
+    }
+}
+
+impl From<LimitElement> for u64 {
+    fn from(value: LimitElement) -> Self {
+        value.nresults.0
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+pub struct NresultsElement(#[xml(ty = "text")] u64);
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, XmlRootTag)]
 // <!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")]
+#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub sync_token: String,
@@ -45,5 +69,48 @@ pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV", ty = "untagged")]
     pub prop: PropfindType<PN>,
     #[xml(ns = "crate::namespace::NS_DAV")]
-    pub limit: Option<u64>,
+    pub limit: Option<LimitElement>,
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::xml::{
+        PropElement, PropfindType,
+        sync_collection::{SyncCollectionRequest, SyncLevel},
+    };
+    use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlDocument};
+
+    const SYNC_COLLECTION_REQUEST: &str = r#"<?xml version="1.0" encoding="UTF-8"?>
+    <sync-collection xmlns="DAV:">
+        <sync-token />
+        <sync-level>1</sync-level>
+        <limit>
+            <nresults>100</nresults>
+        </limit>
+        <prop>
+            <getetag />
+        </prop>
+    </sync-collection>
+    "#;
+
+    #[derive(XmlDeserialize, PropName, EnumVariants, PartialEq)]
+    #[xml(unit_variants_ident = "TestPropName")]
+    enum TestProp {
+        Getetag(String),
+    }
+
+    #[test]
+    fn test_parse_sync_collection_request() {
+        let request =
+            SyncCollectionRequest::<TestPropName>::parse_str(SYNC_COLLECTION_REQUEST).unwrap();
+        assert_eq!(
+            request,
+            SyncCollectionRequest {
+                sync_token: "".to_owned(),
+                sync_level: SyncLevel::One,
+                prop: PropfindType::Prop(PropElement(vec![TestPropName::Getetag], vec![])),
+                limit: Some(100.into())
+            }
+        )
+    }
 }

crates/dav/src/xml/tag_list.rs

@@ -10,12 +10,12 @@ use std::collections::HashMap;
 pub struct TagList(Vec<(Option<NamespaceOwned>, String)>);
 
 impl XmlSerialize for TagList {
-    fn serialize<W: std::io::Write>(
+    fn serialize(
         &self,
         ns: Option<Namespace>,
         tag: Option<&[u8]>,
         namespaces: &HashMap<Namespace, &[u8]>,
-        writer: &mut quick_xml::Writer<W>,
+        writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
             .map(|ns| namespaces.get(&ns))
@@ -57,7 +57,6 @@ impl XmlSerialize for TagList {
         Ok(())
     }
 
-    #[allow(refining_impl_trait)]
     fn attributes<'a>(&self) -> Option<Vec<quick_xml::events::attributes::Attribute<'a>>> {
         None
     }

crates/dav_push/Cargo.toml

@@ -24,7 +24,6 @@ rustical_dav.workspace = true
 rustical_store.workspace = true
 http.workspace = true
 base64.workspace = true
-rand.workspace = true
 ece.workspace = true
 axum.workspace = true
 openssl.workspace = true

crates/dav_push/src/lib.rs

@@ -99,13 +99,13 @@ impl<S: SubscriptionStore> DavPushController<S> {
             content_update,
         };
 
-        let mut output: Vec<_> = b"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".into();
-        let mut writer = quick_xml::Writer::new_with_indent(&mut output, b' ', 4);
-        if let Err(err) = push_message.serialize_root(&mut writer) {
-            error!("Could not serialize push message: {}", err);
-            return;
-        }
-        let payload = String::from_utf8(output).unwrap();
+        let payload = match push_message.serialize_to_string() {
+            Ok(payload) => payload,
+            Err(err) => {
+                error!("Could not serialize push message: {}", err);
+                return;
+            }
+        };
 
         for subsciption in subscriptions {
             if let Some(allowed_push_servers) = &self.allowed_push_servers {
@@ -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/frontend/js-components/lib/create-addressbook-form.ts

@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { createClient } from "webdav";
+import { escapeXml } from ".";
 
 @customElement("create-addressbook-form")
 export class CreateAddressbookForm extends LitElement {
@@ -14,16 +14,16 @@ export class CreateAddressbookForm extends LitElement {
     return this
   }
 
-  client = createClient("/carddav")
-
   @property()
-  user: String = ''
+  user: string = ''
   @property()
-  addr_id: String = ''
+  principal: string = ''
   @property()
-  displayname: String = ''
+  addr_id: string = self.crypto.randomUUID()
   @property()
-  description: String = ''
+  displayname: string = ''
+  @property()
+  description: string = ''
 
   dialog: Ref<HTMLDialogElement> = createRef()
   form: Ref<HTMLFormElement> = createRef()
@@ -34,9 +34,19 @@ export class CreateAddressbookForm extends LitElement {
       <dialog ${ref(this.dialog)}>
         <h3>Create addressbook</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            principal (for group addressbooks)
+            <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" @change=${e => this.addr_id = e.target.value} />
+            <input type="text" name="id" value=${this.addr_id} @change=${e => this.addr_id = e.target.value} />
           </label>
           <br>
           <label>
@@ -50,7 +60,7 @@ export class CreateAddressbookForm extends LitElement {
           </label>
           <br>
           <button type="submit">Create</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }}> Cancel </button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
         </form>
       </dialog>
     `
@@ -67,19 +77,29 @@ export class CreateAddressbookForm extends LitElement {
       alert("Empty displayname")
       return
     }
-    // TODO: Escape user input: There's not really a security risk here but would be nicer
-    await this.client.createDirectory(`/principal/${this.user}/${this.addr_id}`, {
-      data: `
+    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
+      method: 'MKCOL',
+      headers: {
+        'Content-Type': 'application/xml'
+      },
+      body: `
       <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
         <set>
           <prop>
-            <displayname>${this.displayname}</displayname>
-            ${this.description ? `<CARD:addressbook-description>${this.description}</CARD:addressbook-description>` : ''}
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ''}
           </prop>
         </set>
       </mkcol>
       `
+
     })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
     window.location.reload()
     return null
   }

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

@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { createClient } from "webdav";
+import { escapeXml } from ".";
 
 @customElement("create-calendar-form")
 export class CreateCalendarForm extends LitElement {
@@ -13,36 +13,49 @@ export class CreateCalendarForm extends LitElement {
     return this
   }
 
-  client = createClient("/caldav")
-
   @property()
-  user: String = ''
+  user: string = ''
   @property()
-  cal_id: String = ''
+  principal: string = ''
   @property()
-  displayname: String = ''
+  cal_id: string = self.crypto.randomUUID()
   @property()
-  description: String = ''
+  displayname: string = ''
   @property()
-  color: String = ''
+  description: string = ''
   @property()
-  subscriptionUrl: String = ''
+  timezone_id: string = ''
+  @property()
+  color: string = ''
+  @property()
+  isSubscription: boolean = false
+  @property()
+  subscriptionUrl: string = ''
   @property()
   components: Set<"VEVENT" | "VTODO" | "VJOURNAL"> = new Set()
 
   dialog: Ref<HTMLDialogElement> = createRef()
   form: Ref<HTMLFormElement> = createRef()
 
-
   override render() {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Create calendar</button>
       <dialog ${ref(this.dialog)}>
         <h3>Create 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" @change=${e => this.cal_id = e.target.value} />
+            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
           </label>
           <br>
           <label>
@@ -50,6 +63,11 @@ export class CreateCalendarForm extends LitElement {
             <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
+          <label>
+            Timezone (optional)
+            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
+          </label>
+          <br>
           <label>
             Description
             <input type="text" name="description" @change=${e => this.description = e.target.value} />
@@ -60,20 +78,30 @@ export class CreateCalendarForm extends LitElement {
             <input type="color" name="color"  @change=${e => this.color = e.target.value} />
           </label>
           <br>
+          <br>
           <label>
-            Subscription URL
-            <input type="text" name="subscription_url" @change=${e => this.subscriptionUrl = e.target.value}  />
+            Calendar is subscription to external calendar
+            <input type="checkbox" name="is_subscription" @change=${e => this.isSubscription = e.target.checked}  />
           </label>
           <br>
+          ${this.isSubscription ? html`
+            <label>
+              Subscription URL
+              <input type="text" name="subscription_url" @change=${e => this.subscriptionUrl = e.target.value}  />
+            </label>
+            <br>
+          `: html``}
+          <br>
           ${["VEVENT", "VTODO", "VJOURNAL"].map(comp => html`
             <label>
               Support ${comp}
               <input type="checkbox" value=${comp} @change=${e => e.target.checked ? this.components.add(e.target.value) : this.components.delete(e.target.value)} />
             </label>
+            <br>
           `)}
           <br>
           <button type="submit">Create</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }}> Cancel </button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
       </form>
       </dialog>
         `
@@ -94,23 +122,34 @@ export class CreateCalendarForm extends LitElement {
       alert("No calendar components selected")
       return
     }
-    await this.client.createDirectory(`/principal/${this.user}/${this.cal_id}`, {
-      data: `
+
+    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
+      method: 'MKCOL',
+      headers: {
+        'Content-Type': 'application/xml'
+      },
+      body: `
       <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
         <set>
           <prop>
-            <displayname>${this.displayname}</displayname>
-            ${this.description ? `<CAL:calendar-description>${this.description}</CAL:calendar-description>` : ''}
-            ${this.color ? `<ICAL:calendar-color>${this.color}</ICAL:calendar-color>` : ''}
-            ${this.subscriptionUrl ? `<CS:source><href>${this.subscriptionUrl}</href></CS:source>` : ''}
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
+            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
+            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
+            ${(this.isSubscription && this.subscriptionUrl) ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ''}
             <CAL:supported-calendar-component-set>
-              ${Array.from(this.components.keys()).map(comp => `<CAL:comp name="${comp}" />`).join('\n')}
+              ${Array.from(this.components.keys()).map(comp => `<CAL:comp name="${escapeXml(comp)}" />`).join('\n')}
             </CAL:supported-calendar-component-set>
           </prop>
         </set>
       </mkcol>
       `
     })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
     window.location.reload()
     return null
   }

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

@@ -1,6 +1,5 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { createClient } from "webdav";
 
 @customElement("delete-button")
 export class DeleteButton extends LitElement {

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

@@ -0,0 +1,103 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { escapeXml } from ".";
+
+@customElement("edit-addressbook-form")
+export class EditAddressbookForm extends LitElement {
+  constructor() {
+    super()
+
+  }
+
+  protected override createRenderRoot() {
+    return this
+  }
+
+  @property()
+  principal: string = ''
+  @property()
+  addr_id: string = ''
+  @property()
+  displayname: string = ''
+  @property()
+  description: string = ''
+
+  dialog: Ref<HTMLDialogElement> = createRef()
+  form: Ref<HTMLFormElement> = createRef()
+
+  override render() {
+    return html`
+      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <dialog ${ref(this.dialog)}>
+        <h3>Create addressbook</h3>
+        <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            Displayname
+            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+          </label>
+          <br>
+          <label>
+            Description
+            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
+          </label>
+          <br>
+          <button type="submit">Submit</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()
+    if (!this.principal) {
+      alert("Empty principal")
+      return
+    }
+    if (!this.addr_id) {
+      alert("Empty id")
+      return
+    }
+    if (!this.displayname) {
+      alert("Empty displayname")
+      return
+    }
+    let response = await fetch(`/carddav/principal/${this.principal}/${this.addr_id}`, {
+      method: 'PROPPATCH',
+      headers: {
+        'Content-Type': 'application/xml'
+      },
+      body: `
+      <propertyupdate xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
+        <set>
+          <prop>
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ''}
+          </prop>
+        </set>
+        <remove>
+          <prop>
+            ${!this.description ? '<CARD:calendar-description />' : ''}
+          </prop>
+        </remove>
+      </propertyupdate>
+      `
+
+    })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
+    window.location.reload()
+    return null
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'edit-addressbook-form': EditAddressbookForm
+  }
+}

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

@@ -0,0 +1,143 @@
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { escapeXml } from ".";
+
+@customElement("edit-calendar-form")
+export class EditCalendarForm extends LitElement {
+  constructor() {
+    super()
+  }
+
+  protected override createRenderRoot() {
+    return this
+  }
+
+  @property()
+  principal: string
+  @property()
+  cal_id: string
+
+  @property()
+  displayname: string = ''
+  @property()
+  description: string = ''
+  @property()
+  timezone_id: string = ''
+  @property()
+  color: string = ''
+  @property({
+    converter: {
+      fromAttribute: (value, _type) => new Set(value ? JSON.parse(value) : []),
+      toAttribute: (value, _type) => JSON.stringify(value)
+    }
+  })
+  components: Set<"VEVENT" | "VTODO" | "VJOURNAL"> = new Set()
+
+  dialog: Ref<HTMLDialogElement> = createRef()
+  form: Ref<HTMLFormElement> = createRef()
+
+
+  override render() {
+    return html`
+      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <dialog ${ref(this.dialog)}>
+        <h3>Create calendar</h3>
+        <form @submit=${this.submit} ${ref(this.form)}>
+          <label>
+            Displayname
+            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+          </label>
+          <br>
+          <label>
+            Timezone (optional)
+            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
+          </label>
+          <br>
+          <label>
+            Description
+            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
+          </label>
+          <br>
+          <label>
+            Color
+            <input type="color" name="color" .value=${this.color} @change=${e => this.color = e.target.value} />
+          </label>
+          <br>
+          ${["VEVENT", "VTODO", "VJOURNAL"].map(comp => html`
+            <label>
+              Support ${comp}
+              <input type="checkbox" value=${comp} ?checked=${this.components.has(comp)} @change=${e => e.target.checked ? this.components.add(e.target.value) : this.components.delete(e.target.value)} />
+            </label>
+            <br>
+          `)}
+          <br>
+          <button type="submit">Submit</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()
+    if (!this.principal) {
+      alert("Empty principal")
+      return
+    }
+    if (!this.cal_id) {
+      alert("Empty id")
+      return
+    }
+    if (!this.displayname) {
+      alert("Empty displayname")
+      return
+    }
+    if (!this.components.size) {
+      alert("No calendar components selected")
+      return
+    }
+    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
+      method: 'PROPPATCH',
+      headers: {
+        'Content-Type': 'application/xml'
+      },
+      body: `
+      <propertyupdate xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
+        <set>
+          <prop>
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
+            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
+            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
+            <CAL:supported-calendar-component-set>
+              ${Array.from(this.components.keys()).map(comp => `<CAL:comp name="${escapeXml(comp)}" />`).join('\n')}
+            </CAL:supported-calendar-component-set>
+          </prop>
+        </set>
+        <remove>
+          <prop>
+            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ''}
+            ${!this.description ? '<CAL:calendar-description />' : ''}
+            ${!this.color ? '<ICAL:calendar-color />' : ''}
+          </prop>
+        </remove>
+      </propertyupdate>
+      `
+    })
+
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`)
+      return null
+    }
+
+    window.location.reload()
+    return null
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'edit-calendar-form': EditCalendarForm
+  }
+}

crates/frontend/js-components/lib/global.d.ts

@@ -0,0 +1,9 @@
+interface Window {
+  rusticalUser: {
+    id: String,
+    displayname: String | null,
+    memberships: Array<String>,
+    principal_type: "individual" | "group" | "room" | String
+  }
+}
+

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/lib/index.ts

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

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

@@ -15,7 +15,11 @@ export default defineConfig({
     rollupOptions: {
       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: {
@@ -23,7 +27,7 @@ export default defineConfig({
         format: "es",
         manualChunks: {
           lit: ["lit"],
-          webdav: ["webdav"],
+          // webdav: ["webdav"],
         }
       }
     },

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

@@ -1,7 +1,7 @@
 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";
-import { a as an } from "./webdav-D0R7xCzX.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -15,9 +15,9 @@ var __decorateClass = (decorators, target, key, kind) => {
 let CreateAddressbookForm = class extends i {
   constructor() {
     super();
-    this.client = an("/carddav");
     this.user = "";
-    this.addr_id = "";
+    this.principal = "";
+    this.addr_id = self.crypto.randomUUID();
     this.displayname = "";
     this.description = "";
     this.dialog = e();
@@ -32,9 +32,19 @@ let CreateAddressbookForm = class extends i {
       <dialog ${n(this.dialog)}>
         <h3>Create addressbook</h3>
         <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            principal (for group addressbooks)
+            <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" @change=${(e2) => this.addr_id = e2.target.value} />
+            <input type="text" name="id" value=${this.addr_id} @change=${(e2) => this.addr_id = e2.target.value} />
           </label>
           <br>
           <label>
@@ -52,7 +62,7 @@ let CreateAddressbookForm = class extends i {
       event.preventDefault();
       this.dialog.value.close();
       this.form.value.reset();
-    }}> Cancel </button>
+    }} class="cancel">Cancel</button>
         </form>
       </dialog>
     `;
@@ -68,18 +78,26 @@ let CreateAddressbookForm = class extends i {
       alert("Empty displayname");
       return;
     }
-    await this.client.createDirectory(`/principal/${this.user}/${this.addr_id}`, {
-      data: `
+    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
+      method: "MKCOL",
+      headers: {
+        "Content-Type": "application/xml"
+      },
+      body: `
       <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
         <set>
           <prop>
-            <displayname>${this.displayname}</displayname>
-            ${this.description ? `<CARD:addressbook-description>${this.description}</CARD:addressbook-description>` : ""}
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ""}
           </prop>
         </set>
       </mkcol>
       `
     });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
     window.location.reload();
     return null;
   }
@@ -87,6 +105,9 @@ let CreateAddressbookForm = class extends i {
 __decorateClass([
   n$1()
 ], CreateAddressbookForm.prototype, "user", 2);
+__decorateClass([
+  n$1()
+], CreateAddressbookForm.prototype, "principal", 2);
 __decorateClass([
   n$1()
 ], CreateAddressbookForm.prototype, "addr_id", 2);

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

@@ -1,7 +1,7 @@
 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";
-import { a as an } from "./webdav-D0R7xCzX.mjs";
+import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -15,12 +15,14 @@ var __decorateClass = (decorators, target, key, kind) => {
 let CreateCalendarForm = class extends i {
   constructor() {
     super();
-    this.client = an("/caldav");
     this.user = "";
-    this.cal_id = "";
+    this.principal = "";
+    this.cal_id = self.crypto.randomUUID();
     this.displayname = "";
     this.description = "";
+    this.timezone_id = "";
     this.color = "";
+    this.isSubscription = false;
     this.subscriptionUrl = "";
     this.components = /* @__PURE__ */ new Set();
     this.dialog = e();
@@ -35,9 +37,19 @@ let CreateCalendarForm = class extends i {
       <dialog ${n(this.dialog)}>
         <h3>Create 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" @change=${(e2) => this.cal_id = e2.target.value} />
+            <input type="text" name="id" value=${this.cal_id} @change=${(e2) => this.cal_id = e2.target.value} />
           </label>
           <br>
           <label>
@@ -45,6 +57,11 @@ let CreateCalendarForm = class extends i {
             <input type="text" name="displayname" value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
           </label>
           <br>
+          <label>
+            Timezone (optional)
+            <input type="text" name="timezone" .value=${this.timezone_id} @change=${(e2) => this.timezone_id = e2.target.value} />
+          </label>
+          <br>
           <label>
             Description
             <input type="text" name="description" @change=${(e2) => this.description = e2.target.value} />
@@ -55,16 +72,26 @@ let CreateCalendarForm = class extends i {
             <input type="color" name="color"  @change=${(e2) => this.color = e2.target.value} />
           </label>
           <br>
+          <br>
           <label>
-            Subscription URL
-            <input type="text" name="subscription_url" @change=${(e2) => this.subscriptionUrl = e2.target.value}  />
+            Calendar is subscription to external calendar
+            <input type="checkbox" name="is_subscription" @change=${(e2) => this.isSubscription = e2.target.checked}  />
           </label>
           <br>
+          ${this.isSubscription ? x`
+            <label>
+              Subscription URL
+              <input type="text" name="subscription_url" @change=${(e2) => this.subscriptionUrl = e2.target.value}  />
+            </label>
+            <br>
+          ` : x``}
+          <br>
           ${["VEVENT", "VTODO", "VJOURNAL"].map((comp) => x`
             <label>
               Support ${comp}
               <input type="checkbox" value=${comp} @change=${(e2) => e2.target.checked ? this.components.add(e2.target.value) : this.components.delete(e2.target.value)} />
             </label>
+            <br>
           `)}
           <br>
           <button type="submit">Create</button>
@@ -72,7 +99,7 @@ let CreateCalendarForm = class extends i {
       event.preventDefault();
       this.dialog.value.close();
       this.form.value.reset();
-    }}> Cancel </button>
+    }} class="cancel">Cancel</button>
       </form>
       </dialog>
         `;
@@ -92,23 +119,32 @@ let CreateCalendarForm = class extends i {
       alert("No calendar components selected");
       return;
     }
-    await this.client.createDirectory(`/principal/${this.user}/${this.cal_id}`, {
-      data: `
+    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
+      method: "MKCOL",
+      headers: {
+        "Content-Type": "application/xml"
+      },
+      body: `
       <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
         <set>
           <prop>
-            <displayname>${this.displayname}</displayname>
-            ${this.description ? `<CAL:calendar-description>${this.description}</CAL:calendar-description>` : ""}
-            ${this.color ? `<ICAL:calendar-color>${this.color}</ICAL:calendar-color>` : ""}
-            ${this.subscriptionUrl ? `<CS:source><href>${this.subscriptionUrl}</href></CS:source>` : ""}
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ""}
+            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ""}
+            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ""}
+            ${this.isSubscription && this.subscriptionUrl ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ""}
             <CAL:supported-calendar-component-set>
-              ${Array.from(this.components.keys()).map((comp) => `<CAL:comp name="${comp}" />`).join("\n")}
+              ${Array.from(this.components.keys()).map((comp) => `<CAL:comp name="${escapeXml(comp)}" />`).join("\n")}
             </CAL:supported-calendar-component-set>
           </prop>
         </set>
       </mkcol>
       `
     });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
     window.location.reload();
     return null;
   }
@@ -116,6 +152,9 @@ let CreateCalendarForm = class extends i {
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "user", 2);
+__decorateClass([
+  n$1()
+], CreateCalendarForm.prototype, "principal", 2);
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "cal_id", 2);
@@ -125,9 +164,15 @@ __decorateClass([
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "description", 2);
+__decorateClass([
+  n$1()
+], CreateCalendarForm.prototype, "timezone_id", 2);
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "color", 2);
+__decorateClass([
+  n$1()
+], CreateCalendarForm.prototype, "isSubscription", 2);
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "subscriptionUrl", 2);

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

@@ -0,0 +1,114 @@
+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";
+import { e as escapeXml } from "./index-_IB1wMbZ.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 EditAddressbookForm = class extends i {
+  constructor() {
+    super();
+    this.principal = "";
+    this.addr_id = "";
+    this.displayname = "";
+    this.description = "";
+    this.dialog = e();
+    this.form = e();
+  }
+  createRenderRoot() {
+    return this;
+  }
+  render() {
+    return x`
+      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <dialog ${n(this.dialog)}>
+        <h3>Create addressbook</h3>
+        <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            Displayname
+            <input type="text" name="displayname" .value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            Description
+            <input type="text" name="description" .value=${this.description} @change=${(e2) => this.description = e2.target.value} />
+          </label>
+          <br>
+          <button type="submit">Submit</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();
+    if (!this.principal) {
+      alert("Empty principal");
+      return;
+    }
+    if (!this.addr_id) {
+      alert("Empty id");
+      return;
+    }
+    if (!this.displayname) {
+      alert("Empty displayname");
+      return;
+    }
+    let response = await fetch(`/carddav/principal/${this.principal}/${this.addr_id}`, {
+      method: "PROPPATCH",
+      headers: {
+        "Content-Type": "application/xml"
+      },
+      body: `
+      <propertyupdate xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
+        <set>
+          <prop>
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ""}
+          </prop>
+        </set>
+        <remove>
+          <prop>
+            ${!this.description ? "<CARD:calendar-description />" : ""}
+          </prop>
+        </remove>
+      </propertyupdate>
+      `
+    });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
+    window.location.reload();
+    return null;
+  }
+};
+__decorateClass([
+  n$1()
+], EditAddressbookForm.prototype, "principal", 2);
+__decorateClass([
+  n$1()
+], EditAddressbookForm.prototype, "addr_id", 2);
+__decorateClass([
+  n$1()
+], EditAddressbookForm.prototype, "displayname", 2);
+__decorateClass([
+  n$1()
+], EditAddressbookForm.prototype, "description", 2);
+EditAddressbookForm = __decorateClass([
+  t("edit-addressbook-form")
+], EditAddressbookForm);
+export {
+  EditAddressbookForm
+};

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

@@ -0,0 +1,158 @@
+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";
+import { e as escapeXml } from "./index-_IB1wMbZ.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 EditCalendarForm = class extends i {
+  constructor() {
+    super();
+    this.displayname = "";
+    this.description = "";
+    this.timezone_id = "";
+    this.color = "";
+    this.components = /* @__PURE__ */ new Set();
+    this.dialog = e();
+    this.form = e();
+  }
+  createRenderRoot() {
+    return this;
+  }
+  render() {
+    return x`
+      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <dialog ${n(this.dialog)}>
+        <h3>Create calendar</h3>
+        <form @submit=${this.submit} ${n(this.form)}>
+          <label>
+            Displayname
+            <input type="text" name="displayname" .value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            Timezone (optional)
+            <input type="text" name="timezone" .value=${this.timezone_id} @change=${(e2) => this.timezone_id = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            Description
+            <input type="text" name="description" .value=${this.description} @change=${(e2) => this.description = e2.target.value} />
+          </label>
+          <br>
+          <label>
+            Color
+            <input type="color" name="color" .value=${this.color} @change=${(e2) => this.color = e2.target.value} />
+          </label>
+          <br>
+          ${["VEVENT", "VTODO", "VJOURNAL"].map((comp) => x`
+            <label>
+              Support ${comp}
+              <input type="checkbox" value=${comp} ?checked=${this.components.has(comp)} @change=${(e2) => e2.target.checked ? this.components.add(e2.target.value) : this.components.delete(e2.target.value)} />
+            </label>
+            <br>
+          `)}
+          <br>
+          <button type="submit">Submit</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();
+    if (!this.principal) {
+      alert("Empty principal");
+      return;
+    }
+    if (!this.cal_id) {
+      alert("Empty id");
+      return;
+    }
+    if (!this.displayname) {
+      alert("Empty displayname");
+      return;
+    }
+    if (!this.components.size) {
+      alert("No calendar components selected");
+      return;
+    }
+    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
+      method: "PROPPATCH",
+      headers: {
+        "Content-Type": "application/xml"
+      },
+      body: `
+      <propertyupdate xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
+        <set>
+          <prop>
+            <displayname>${escapeXml(this.displayname)}</displayname>
+            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ""}
+            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ""}
+            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ""}
+            <CAL:supported-calendar-component-set>
+              ${Array.from(this.components.keys()).map((comp) => `<CAL:comp name="${escapeXml(comp)}" />`).join("\n")}
+            </CAL:supported-calendar-component-set>
+          </prop>
+        </set>
+        <remove>
+          <prop>
+            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ""}
+            ${!this.description ? "<CAL:calendar-description />" : ""}
+            ${!this.color ? "<ICAL:calendar-color />" : ""}
+          </prop>
+        </remove>
+      </propertyupdate>
+      `
+    });
+    if (response.status >= 400) {
+      alert(`Error ${response.status}: ${await response.text()}`);
+      return null;
+    }
+    window.location.reload();
+    return null;
+  }
+};
+__decorateClass([
+  n$1()
+], EditCalendarForm.prototype, "principal", 2);
+__decorateClass([
+  n$1()
+], EditCalendarForm.prototype, "cal_id", 2);
+__decorateClass([
+  n$1()
+], EditCalendarForm.prototype, "displayname", 2);
+__decorateClass([
+  n$1()
+], EditCalendarForm.prototype, "description", 2);
+__decorateClass([
+  n$1()
+], EditCalendarForm.prototype, "timezone_id", 2);
+__decorateClass([
+  n$1()
+], EditCalendarForm.prototype, "color", 2);
+__decorateClass([
+  n$1({
+    converter: {
+      fromAttribute: (value, _type) => new Set(value ? JSON.parse(value) : []),
+      toAttribute: (value, _type) => JSON.stringify(value)
+    }
+  })
+], EditCalendarForm.prototype, "components", 2);
+EditCalendarForm = __decorateClass([
+  t("edit-calendar-form")
+], EditCalendarForm);
+export {
+  EditCalendarForm
+};

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/style.css

@@ -1,7 +1,44 @@
+:root {
+  --background-color: #FFF;
+  --background-darker: #EEE;
+  --text-on-background-color: #111;
+  --primary-color: #2F2FE1;
+  --primary-color-dark: color-mix(in srgb, var(--primary-color), #000000 80%);
+  --text-on-primary-color: #FFF;
+  /* --color-red: #FE2060; */
+  /* --color-red: #EE1D59; */
+  --color-red: #E31B39;
+  --dilute-color: black;
+  --border-color: black;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --background-color: #222;
+    --background-darker: #292929;
+    --text-on-background-color: #CACACA;
+    --primary-color: color-mix(in srgb, #2F2FE1, white 15%);
+    --primary-color-dark: color-mix(in srgb, var(--primary-color), #000000 80%);
+    --text-on-primary-color: #FFF;
+    /* --color-red: #FE2060; */
+    --color-red: #EE1D59;
+    --dilute-color: white;
+    --border-color: color-mix(in srgb, var(--background-color), var(--dilute-color) 15%);
+  }
+}
+
+html,
+dialog {
+  background-color: var(--background-color);
+  color: var(--text-on-background-color);
+}
+
 body {
-  font-family: sans-serif;
+  /* position: relative; */
+  font-family: 'Noto Sans', Helvetica, Arial, sans-serif;
   margin: 0 auto;
   max-width: 1200px;
+  min-height: 100%;
 }
 
 * {
@@ -12,32 +49,65 @@ body {
   padding: 12px;
 }
 
+a {
+  color: var(--text-on-background-color);
+}
+
 header {
   background: var(--background-darker);
-  height: 60px;
+  min-height: 60px;
   font-weight: bold;
   display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
   align-items: center;
-  padding: 12px;
+  padding: 4px 12px;
 
-  border: 2px solid black;
+  border: 2px solid var(--border-color);
   border-radius: 12px;
   margin: 12px;
   box-shadow: 4px 2px 12px -5px black;
 
-  a {
+  display: flex;
+  justify-content: space-between;
+
+  a.logo {
     font-size: 2em;
     text-decoration: none;
-    color: black;
+  }
+
+  nav {
+    display: flex;
+
+    border-radius: 12px;
+    background: color-mix(in srgb, var(--background-darker), var(--dilute-color) 5%);
+
+    a {
+      text-decoration: none;
+      margin: 4px 8px;
+      padding: 8px 12px;
+      border-radius: 12px;
+      background: color-mix(in srgb, var(--background-darker), var(--dilute-color) 2%);
+
+      &:hover {
+        background: color-mix(in srgb, var(--background-darker), var(--dilute-color) 20%);
+      }
+
+      &.active {
+        background: color-mix(in srgb, var(--background-darker), var(--dilute-color) 15%);
+      }
+
+      svg.icon {
+        width: 1.3em;
+        vertical-align: bottom;
+        margin-right: 6px;
+      }
+    }
   }
 
 
   .logout_form {
     display: contents;
-
-    button {
-      margin-left: auto;
-    }
   }
 }
 
@@ -48,25 +118,11 @@ header {
   align-items: center;
 }
 
-:root {
-  --background-color: #FFF;
-  --background-darker: #EEE;
-  --primary-color: #2F2FE1;
-  --primary-color-dark: color-mix(in srgb, var(--primary-color), #000000 80%);
-  --text-on-primary-color: #FFF;
-  /* --color-red: #FE2060; */
-  --color-red: #EE1D59;
-}
-
-html {
-  background-color: var(--background-color);
-}
-
 button,
 .button {
   border: none;
   background: var(--primary-color);
-  padding: 8px 12px;
+  padding: 8px 16px;
   border-radius: 8px;
   color: var(--text-on-primary-color);
   font-size: 0.9em;
@@ -75,7 +131,8 @@ button,
     filter: brightness(90%);
   }
 
-  &.delete {
+  &.delete,
+  &.cancel {
     background: var(--color-red);
   }
 }
@@ -93,7 +150,7 @@ input[type="password"] {
 }
 
 section {
-  border: 1px solid black;
+  border: 1px solid var(--border-color);
   border-radius: 12px;
   box-shadow: 4px 2px 12px -8px black;
   border-collapse: collapse;
@@ -104,30 +161,26 @@ section {
 }
 
 table {
-  border: 1px solid black;
+  border: 1px solid var(--border-color);
   border-radius: 12px;
   box-shadow: 4px 2px 12px -6px black;
   border-collapse: collapse;
   overflow-x: scroll;
-  display: block;
-  width: fit-content;
+  width: 100%;
 
   td,
   th {
     padding: 8px;
-    border: 1px solid black;
+    border: 1px solid var(--border-color);
+    width: max-content;
   }
 
   th {
     height: 40px;
   }
 
-  /* tr:nth-of-type(2n+1) { */
-  /*   background: var(--background-darker); */
-  /* } */
-
   tr:hover {
-    background: #DDD;
+    background: color-mix(in srgb, var(--background-color), var(--dilute-color) 10%);
   }
 
   tr:first-child th {
@@ -147,88 +200,109 @@ table {
   }
 }
 
-#page-user {
-  ul {
-    padding-left: 0;
+ul.collection-list {
+  padding-left: 0;
 
-    li.collection-list-item {
-      list-style: none;
-      display: contents;
+  li.collection-list-item {
+    list-style: none;
+    display: block;
+    position: relative;
+    background: color-mix(in srgb, var(--background-color), var(--dilute-color) 5%);
+    border: 2px solid var(--border-color);
+    border-radius: 12px;
+    margin: 12px 0;
+    box-shadow: 4px 2px 12px -6px black;
+    overflow: hidden;
 
-      a {
-        background: #EEE;
-        display: grid;
-        min-height: 80px;
-        grid-template-areas:
-          ".                .                 color-chip"
-          "title            comps             color-chip"
-          "description      description       color-chip"
-          "subscription-url subscription-url  color-chip"
-          "actions          actions           color-chip"
-          ".                .                 color-chip";
-        grid-template-rows: 12px auto auto auto auto 12px;
-        grid-template-columns: min-content auto 80px;
-        row-gap: 4px;
-        color: inherit;
-        text-decoration: none;
-        padding-left: 12px;
+    a {
+      position: absolute;
+      inset: 2px;
+    }
 
-        border: 2px solid black;
-        border-radius: 12px;
-        margin: 12px;
-        box-shadow: 4px 2px 12px -6px black;
-        overflow: hidden;
+    .inner {
+      display: grid;
+      min-height: 80px;
+      height: fit-content;
+      grid-template-areas:
+        ".                color-chip"
+        "title            color-chip"
+        "description      color-chip"
+        "subscription-url color-chip"
+        "metadata         color-chip"
+        "actions          color-chip"
+        ".                color-chip";
+      grid-template-rows: 12px auto auto auto auto auto 12px;
+      grid-template-columns: auto 80px;
+      row-gap: 4px;
+      color: inherit;
+      text-decoration: none;
+      padding-left: 12px;
 
-        .title {
-          font-weight: bold;
-          grid-area: title;
-          margin-right: 12px;
-          white-space: nowrap;
-        }
+      position: relative;
+      z-index: 1;
+      pointer-events: none;
+
+      a,
+      button {
+        pointer-events: all;
+        cursor: pointer;
+      }
+
+      .title {
+        font-weight: bold;
+        grid-area: title;
+        margin-right: 12px;
+        white-space: nowrap;
+      }
+
+      span {
+        margin: 8px initial;
+      }
+
+      .comps {
+        display: inline;
 
         span {
-          margin: 8px initial;
-        }
-
-        .comps {
-          grid-area: comps;
-
-          span {
-            margin: 0 2px;
-            background: var(--primary-color);
-            color: var(--text-on-primary-color);
-            font-size: .8em;
-            padding: 3px 8px;
-            border-radius: 12px;
-          }
-        }
-
-        .description {
-          grid-area: description;
-          white-space: nowrap;
-        }
-
-        .subscription-url {
-          grid-area: subscription-url;
-          white-space: nowrap;
-        }
-
-        .color-chip {
-          background: var(--color);
-          grid-area: color-chip;
-        }
-
-        .actions {
-          grid-area: actions;
-          width: fit-content;
-          display: flex;
-          gap: 12px;
-        }
-
-        &:hover {
-          background: #DDD;
+          margin: 0 2px;
+          background: var(--primary-color);
+          color: var(--text-on-primary-color);
+          font-size: .8em;
+          padding: 3px 8px;
+          border-radius: 12px;
         }
       }
+
+      .description {
+        grid-area: description;
+        white-space: nowrap;
+      }
+
+      .metadata {
+        grid-area: metadata;
+        white-space: nowrap;
+      }
+
+      .subscription-url {
+        grid-area: subscription-url;
+        white-space: nowrap;
+      }
+
+      .color-chip {
+        background: var(--color);
+        grid-area: color-chip;
+      }
+
+      .actions {
+        pointer-events: all;
+        grid-area: actions;
+        width: fit-content;
+        display: flex;
+        gap: 12px;
+      }
+    }
+
+    &:hover {
+      background: color-mix(in srgb, var(--background-color), var(--dilute-color) 10%);
     }
   }
 }
@@ -236,3 +310,44 @@ table {
 textarea {
   width: 100%;
 }
+
+dialog {
+  border: 1px solid var(--border-color);
+  border-radius: 16px;
+  padding: 32px;
+}
+
+dialog::backdrop {
+  background: color-mix(in srgb, var(--background-color), transparent 50%);
+}
+
+footer {
+  display: flex;
+  justify-content: center;
+  margin-top: 32px;
+  gap: 24px;
+  bottom: 20px;
+}
+
+input[type="text"],
+input[type="password"],
+input[type="color"],
+select {
+  background: color-mix(in srgb, var(--background-color), var(--dilute-color) 10%);
+  border: 2px solid var(--border-color);
+  padding: 6px 6px;
+  color: var(--text-on-background-color);
+  margin: 2px;
+  border-radius: 8px;
+
+  &:hover,
+  &:focus {
+    background: color-mix(in srgb, var(--background-color), var(--dilute-color) 20%);
+  }
+}
+
+svg.icon {
+  stroke-width: 2px;
+  color: var(--text-on-background-color);
+  stroke: var(--text-on-background-color);
+}

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

@@ -0,0 +1,69 @@
+<h2>{{user.id }}'s Addressbooks</h2>
+<ul class="collection-list">
+  {% for (meta, addressbook) in addressbooks %}
+  <li class="collection-list-item">
+    <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}"></a>
+    <div class="inner">
+      <span class="title">
+        {%- if addressbook.principal != user.id -%}{{ addressbook.principal }}/{%- endif -%}
+        {{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}
+      </span>
+      <span class="description">
+        {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
+      </span>
+      <div class="actions">
+        <form action="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}" target="_blank"
+          method="GET">
+          <button type="submit">Download</button>
+        </form>
+        <edit-addressbook-form
+          principal="{{ addressbook.principal }}"
+          addr_id="{{ addressbook.id }}"
+          displayname="{{ addressbook.displayname.as_deref().unwrap_or_default() }}"
+          description="{{ addressbook.description.as_deref().unwrap_or_default() }}"
+        ></edit-addressbook-form>
+        <delete-button trash
+          href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
+      </div>
+      <div class="metadata">
+        {{ meta.len }} ({{ meta.size | filesizeformat }}) objects, {{ meta.deleted_len }} ({{ meta.deleted_size | filesizeformat }}) deleted objects
+      </div>
+    </div>
+  </li>
+  {% else %}
+  You do not have any addressbooks yet
+  {% endfor %}
+</ul>
+{%if !deleted_addressbooks.is_empty() %}
+<h3>Deleted Addressbooks</h3>
+<ul class="collection-list">
+  {% for (meta, addressbook) in deleted_addressbooks %}
+  <li class="collection-list-item">
+    <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}"></a>
+    <div class="inner">
+      <span class="title">
+        {%- if addressbook.principal != user.id -%}{{ addressbook.principal }}/{%- endif -%}
+        {{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}
+      </span>
+      <span class="description">
+        {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
+      </span>
+      <div class="actions">
+        <form action="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}/restore"
+          method="POST" class="restore-form">
+          <button type="submit">Restore</button>
+        </form>
+        <delete-button href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
+      </div>
+      <div class="metadata">
+        {{ meta.len }} ({{ meta.size | filesizeformat }}) objects, {{ meta.deleted_len }} ({{ meta.deleted_size | filesizeformat }}) deleted objects
+      </div>
+    </div>
+  </li>
+  {% endfor %}
+</ul>
+{% 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

@@ -0,0 +1,88 @@
+<h2>{{ user.id }}'s Calendars</h2>
+<ul class="collection-list">
+  {% for (meta, calendar) in calendars %}
+  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  <li class="collection-list-item" style="--color: {{ color }}">
+    <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}"></a>
+    <div class="inner">
+      <span class="title">
+        {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
+        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        <div class="comps">
+          {% for comp in calendar.components %}
+          <span>{{ comp }}</span>
+          {% endfor %}
+        </div>
+      </span>
+      <span class="description">
+        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+      </span>
+      {% if let Some(subscription_url) = calendar.subscription_url %}
+      <span class="subscription-url">{{ subscription_url }}</span>
+      {% endif %}
+      <div class="actions">
+        <form action="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}" target="_blank" method="GET">
+          <button type="submit">Download</button>
+        </form>
+        {% if !calendar.id.starts_with("_birthdays_") %}
+        <edit-calendar-form
+          principal="{{ calendar.principal }}"
+          cal_id="{{ calendar.id }}"
+          timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
+          displayname="{{ calendar.displayname.as_deref().unwrap_or_default() }}"
+          description="{{ calendar.description.as_deref().unwrap_or_default() }}"
+          color="{{ calendar.color.as_deref().unwrap_or_default() }}"
+          components="{{ calendar.components | json }}"
+        ></edit-calendar-form>
+        <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
+        {% endif %}
+      </div>
+      <div class="metadata">
+        {{ meta.len }} ({{ meta.size | filesizeformat }}) objects, {{ meta.deleted_len }} ({{ meta.deleted_size | filesizeformat }}) deleted objects
+      </div>
+      <div class="color-chip"></div>
+    </div>
+  </li>
+  {% else %}
+  You do not have any calendars yet
+  {% endfor %}
+</ul>
+{%if !deleted_calendars.is_empty() %}
+<h3>Deleted Calendars</h3>
+<ul class="collection-list">
+  {% for (meta, calendar) in deleted_calendars %}
+  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  <li class="collection-list-item" style="--color: {{ color }}">
+    <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}"></a>
+    <div class="inner">
+      <span class="title">
+        {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
+        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        <div class="comps">
+          {% for comp in calendar.components %}
+          <span>{{ comp }}</span>
+          {% endfor %}
+        </div>
+      </span>
+      <span class="description">
+        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+      </span>
+      <div class="actions">
+        <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"
+          class="restore-form">
+          <button type="submit">Restore</button>
+        </form>
+        <delete-button href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
+      </div>
+      <div class="metadata">
+        {{ meta.len }} ({{ meta.size | filesizeformat }}) objects, {{ meta.deleted_len }} ({{ meta.deleted_size | filesizeformat }}) deleted objects
+      </div>
+      <div class="color-chip"></div>
+    </div>
+  </li>
+  {% endfor %}
+</ul>
+{% endif %}
+<create-calendar-form user="{{ user.id }}"></create-calendar-form>
+<import-calendar-form user="{{ user.id }}"></import-calendar-form>
+

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

@@ -0,0 +1,56 @@
+<h2>{{ user.id }}'s Profile</h2>
+
+{% let groups = user.memberships_without_self() %}
+{% if groups.len() > 0 %}
+<h3>Groups</h3>
+<ul>
+  {% for group in groups %}
+  <li>{{ group }}</li>
+  {% endfor %}
+</ul>
+{% endif %}
+
+<h3>App tokens</h3>
+<table id="app-tokens">
+  <tr>
+    <th>Name</th>
+    <th>Created at</th>
+    <th></th>
+  </tr>
+  {% for app_token in app_tokens %}
+  <tr>
+    <td>{{ app_token.name }}</td>
+    <td>
+      {% if let Some(created_at) = app_token.created_at %}
+      {{ chrono_humanize::HumanTime::from(created_at.to_owned()) }}
+      {% endif %}
+    </td>
+    <td>
+      <form action="/frontend/user/{{ user.id }}/app_token/{{ app_token.id }}/delete" method="POST">
+        <button type="submit" class="delete">Delete</button>
+      </form>
+    </td>
+  </tr>
+  {% endfor %}
+  <tr class="generate">
+    <td>
+      <form action="/frontend/user/{{ user.id }}/app_token" method="POST" id="form_generate_app_token">
+        <label class="font_bold" for="generate_app_token_name">App name</label>
+        <input type="text" name="name" id="generate_app_token_name" />
+      </form>
+    </td>
+    <td></td>
+    <td>
+      <button type="submit" form="form_generate_app_token">Generate</button>
+      {% if is_apple %}
+      <button type="submit" form="form_generate_app_token" name="apple" value="true">Apple Configuration Profile
+        (contains token)</button>
+      {% endif %}
+    </td>
+  </tr>
+</table>
+{% if let Some(hostname) = davx5_hostname %}
+<a
+  href="intent://{{ hostname | urlencode }}#Intent;action=android.intent.action.VIEW;component=at.bitfire.davdroid.ui.setup.LoginActivity;scheme=davx5;package=at.bitfire.davdroid;S.loginFlow=1;end">Configure
+  in DAVx5</a>
+{% endif %}

crates/frontend/public/templates/icons/calendar.svg

@@ -0,0 +1,7 @@
+<!-- Adapted from https://iconoir.com/ -->
+<svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
+  <path d="M15 4V2M15 4V6M15 4H10.5M3 10V19C3 20.1046 3.89543 21 5 21H19C20.1046 21 21 20.1046 21 19V10H3Z" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M3 10V6C3 4.89543 3.89543 4 5 4H7" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M7 2V6" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M21 10V6C21 4.89543 20.1046 4 19 4H18.5" stroke-linecap="round" stroke-linejoin="round"></path>
+</svg>

crates/frontend/public/templates/icons/group.svg

@@ -0,0 +1,7 @@
+<!-- Adapted from https://iconoir.com/ -->
+<svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
+  <path d="M1 20V19C1 15.134 4.13401 12 8 12V12C11.866 12 15 15.134 15 19V20" stroke-linecap="round"></path>
+  <path d="M13 14V14C13 11.2386 15.2386 9 18 9V9C20.7614 9 23 11.2386 23 14V14.5" stroke-linecap="round"></path>
+  <path d="M8 12C10.2091 12 12 10.2091 12 8C12 5.79086 10.2091 4 8 4C5.79086 4 4 5.79086 4 8C4 10.2091 5.79086 12 8 12Z" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M18 9C19.6569 9 21 7.65685 21 6C21 4.34315 19.6569 3 18 3C16.3431 3 15 4.34315 15 6C15 7.65685 16.3431 9 18 9Z" stroke-linecap="round" stroke-linejoin="round"></path>
+</svg>

crates/frontend/public/templates/icons/user.svg

@@ -0,0 +1,5 @@
+<!-- Adapted from https://iconoir.com/ -->
+<svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
+  <path d="M5 20V19C5 15.134 8.13401 12 12 12V12C15.866 12 19 15.134 19 19V20" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M12 12C14.2091 12 16 10.2091 16 8C16 5.79086 14.2091 4 12 4C9.79086 4 8 5.79086 8 8C8 10.2091 9.79086 12 12 12Z" stroke-linecap="round" stroke-linejoin="round"></path>
+</svg>

crates/frontend/public/templates/layouts/default.html

@@ -12,7 +12,8 @@
 <body>
   {% block header %}
   <header>
-      <a href="/frontend/user">RustiCal</a>
+      <a class="logo" href="/frontend/user">RustiCal</a>
+      {% block header_center %}{% endblock %}
       <form method="POST" action="/frontend/logout" class="logout_form">
         <button type="submit">Log out</button>
       </form>
@@ -21,8 +22,9 @@
   <div id="app">
     {% block content %}<p>Placeholder</p>{% endblock %}
   </div>
+  <footer>
+      <a href="{{ env!("CARGO_PKG_REPOSITORY") }}" target="_blank">RustiCal {{ env!("CARGO_PKG_VERSION") }}</a>
+      <a href="/frontend/assets/licenses.html" target="_blank">Open Source Licenses</a>
+  </footer>
 </body>
-<footer>
-    <a href="/frontend/assets/licenses.html" target="_blank">Open Source Licenses</a>
-</footer>
 </html>

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

@@ -25,7 +25,7 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
-{% if let Some(timezone) = calendar.timezone %}
+{% if let Some(timezone) = calendar.get_vtimezone() %}
 <textarea rows="16" readonly>{{ timezone }}</textarea>
 {% endif %}
 

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

@@ -1,181 +1,27 @@
 {% extends "layouts/default.html" %}
 
 {% block imports %}
+<template id="data-rustical-user">{{ user|json }}</template>
+<script>
+window.rusticalUser = JSON.parse(document.querySelector('#data-rustical-user').innerHTML)
+</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 %}
+<nav class="header-center">
+  <a href="/frontend/user/{{ user.id }}" {% if S::name() == "profile" %}class="active"{% endif %}>{% include "icons/user.svg" %}Profile</a>
+  <a href="/frontend/user/{{ user.id }}/calendar" {% if S::name() == "calendars" %}class="active"{% endif %}>{% include "icons/calendar.svg" %}Calendars</a>
+  <a href="/frontend/user/{{ user.id }}/addressbook" {% if S::name() == "addressbooks" %}class="active"{% endif %}>{% include "icons/group.svg" %}Addressbooks</a>
+</nav>
+{% endblock %}
 
 {% block content %}
-<div id="page-user">
-
-<h1>Welcome {{ user.id }}!</h1>
-
-<section>
-  <h2>Profile</h2>
-
-  <h3>Groups</h3>
-  <ul>
-    {% for group in user.memberships() %}
-      <li>{{ group }}</li>
-    {% endfor %}
-  </ul>
-
-  <h3>App tokens</h3>
-  <table id="app-tokens">
-    <tr>
-      <th>Name</th>
-      <th>Created at</th>
-      <th></th>
-    </tr>
-    {% for app_token in app_tokens %}
-    <tr>
-      <td>{{ app_token.name }}</td>
-      <td>
-        {% if let Some(created_at) = app_token.created_at %}
-          {{ chrono_humanize::HumanTime::from(created_at.to_owned()) }}
-        {% endif %}
-      </td>
-      <td>
-        <form action="/frontend/user/{{ user.id }}/app_token/{{ app_token.id }}/delete" method="POST">
-          <button type="submit" class="delete">Delete</button>
-        </form>
-      </td>
-    </tr>
-    {% endfor %}
-    <tr class="generate">
-        <td>
-          <form action="/frontend/user/{{ user.id }}/app_token" method="POST" id="form_generate_app_token">
-            <label class="font_bold" for="generate_app_token_name">App name</label>
-            <input type="text" name="name" id="generate_app_token_name" />
-          </form>
-        </td>
-        <td></td>
-        <td>
-          <button type="submit" form="form_generate_app_token">Generate</button>
-          {% if is_apple %}
-          <button type="submit" form="form_generate_app_token" name="apple" value="true">Apple Configuration Profile (contains token)</button>
-          {% endif %}
-        </td>
-    </tr>
-  </table>
-  {% if let Some(hostname) = davx5_hostname %}
-  <a href="intent://{{ hostname | urlencode }}#Intent;action=android.intent.action.VIEW;component=at.bitfire.davdroid.ui.setup.LoginActivity;scheme=davx5;package=at.bitfire.davdroid;S.loginFlow=1;end">Configure in DAVx5</a>
-  {% endif %}
-</section>
-
-<section>
-<h2>Calendars</h2>
-<ul>
-  {% for calendar in calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
-  <li class="collection-list-item" style="--color: {{ color }}">
-    <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}">
-      <span class="title">{{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}</span>
-      <div class="comps">
-        {% for comp in calendar.components %}
-        <span>{{ comp }}</span>
-        {% endfor %}
-      </div>
-      <span class="description">
-      {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
-      </span>
-      {% if let Some(subscription_url) = calendar.subscription_url %}
-      <span class="subscription-url">{{ subscription_url }}</span>
-      {% endif %}
-      <div class="actions">
-        <form action="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}" target="_blank" method="GET">
-          <button type="submit">Download</button>
-        </form>
-        {% if !calendar.id.starts_with("_birthdays_") %}
-        <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
-        {% endif %}
-      </div>
-      <div class="color-chip"></div>
-    </a>
-  </li>
-  {% else %}
-  You do not have any calendars yet
-  {% endfor %}
-</ul>
-{%if !deleted_calendars.is_empty() %}
-<h3>Deleted Calendars</h3>
-<ul>
-  {% for calendar in deleted_calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
-  <li class="collection-list-item" style="--color: {{ color }}">
-    <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}">
-      <span class="title">{{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}</span>
-      <div class="comps">
-        {% for comp in calendar.components %}
-        <span>{{ comp }}</span>
-        {% endfor %}
-      </div>
-      <span class="description">
-      {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
-      </span>
-      <div class="actions">
-        <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST" class="restore-form">
-          <button type="submit">Restore</button>
-        </form>
-        <delete-button href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
-      </div>
-      <div class="color-chip"></div>
-    </a>
-  </li>
-  {% endfor %}
-</ul>
-{% endif %}
-<create-calendar-form user="{{ user.id }}"></create-calendar-form>
-
-</section>
-
-<section>
-<h2>Addressbooks</h2>
-<ul>
-  {% for addressbook in addressbooks %}
-  <li class="collection-list-item">
-    <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}">
-      <span class="title">{{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}</span>
-      <span class="description">
-      {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
-      </span>
-      <div class="actions">
-        <form action="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}" target="_blank" method="GET">
-          <button type="submit">Download</button>
-        </form>
-        <delete-button trash href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
-      </div>
-    </a>
-  </li>
-  {% else %}
-  You do not have any addressbooks yet
-  {% endfor %}
-</ul>
-{%if !deleted_addressbooks.is_empty() %}
-<h3>Deleted Addressbooks</h3>
-<ul>
-  {% for addressbook in deleted_addressbooks %}
-  <li class="collection-list-item">
-    <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}">
-      <span class="title">{{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}</span>
-      <span class="description">
-      {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
-      </span>
-      <div class="actions">
-        <form action="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}/restore" method="POST" class="restore-form">
-          <button type="submit">Restore</button>
-        </form>
-        <delete-button href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
-      </div>
-    </a>
-  </li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-<create-addressbook-form user="{{ user.id }}"></create-addressbook-form>
-
-</section>
+{{ section|safe }}
 {% endblock %}
 

crates/frontend/src/lib.rs

@@ -8,6 +8,7 @@ use axum::{
 };
 use headers::{ContentType, HeaderMapExt};
 use http::{Method, StatusCode};
+use routes::{addressbooks::route_addressbooks, calendars::route_calendars};
 use rustical_oidc::{OidcConfig, OidcServiceConfig, route_get_oidc_callback, route_post_oidc};
 use rustical_store::{
     AddressbookStore, CalendarStore,
@@ -20,6 +21,7 @@ mod assets;
 mod config;
 pub mod nextcloud_login;
 mod oidc_user_store;
+pub(crate) mod pages;
 mod routes;
 
 pub use config::FrontendConfig;
@@ -43,36 +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();
-    router = router
-        .route("/", get(route_root))
-        .route("/user", get(route_get_home))
-        .route("/user/{user}", get(route_user_named::<CS, AS, AP>))
+    let user_router = Router::new()
+        .route("/", get(route_get_home))
+        .route("/{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}/calendar", get(route_calendars::<CS>))
+        .route("/{user}/calendar/{calendar}", get(route_calendar::<CS>))
         .route(
-            "/user/{user}/calendar/{calendar}",
-            get(route_calendar::<CS>),
-        )
-        .route(
-            "/user/{user}/calendar/{calendar}/restore",
+            "/{user}/calendar/{calendar}/restore",
             post(route_calendar_restore::<CS>),
         )
         // Addressbook
+        .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));
 
@@ -105,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(middleware::from_fn(unauthorized_handler));
+        .layer(Extension(oidc_config.clone()));
 
     Router::new()
         .nest(prefix, router)
@@ -137,15 +140,14 @@ async fn unauthorized_handler(mut request: Request, next: Next) -> Response {
         return resp
             .body(Body::new(format!(
                 r#"<!Doctype html>
-                <html>
-                    <head>
-                        <meta http-equiv="refresh" content="1; url={login_url}" />
-                    </head>
-                    <body>
-                        Unauthorized, redirecting to <a href="{login_url}">login page</a>
-                    </body>
-                <html>
-            "#,
+<html>
+    <head>
+        <meta http-equiv="refresh" content="1; url={login_url}" />
+    </head>
+    <body>
+        Unauthorized, redirecting to <a href="{login_url}">login page</a>
+    </body>
+</html>"#,
             )))
             .unwrap();
     }

crates/frontend/src/pages/mod.rs

@@ -0,0 +1 @@
+pub mod user;

crates/frontend/src/pages/user.rs

@@ -0,0 +1,14 @@
+use askama::Template;
+use askama_web::WebTemplate;
+use rustical_store::auth::Principal;
+
+pub trait Section: Template {
+    fn name() -> &'static str;
+}
+
+#[derive(Template, WebTemplate)]
+#[template(path = "pages/user.html")]
+pub struct UserPage<S: Section> {
+    pub user: Principal,
+    pub section: S,
+}

crates/frontend/src/routes/addressbooks.rs

@@ -0,0 +1,75 @@
+use std::sync::Arc;
+
+use askama::Template;
+use askama_web::WebTemplate;
+use axum::{Extension, extract::Path, response::IntoResponse};
+use http::StatusCode;
+use rustical_store::{Addressbook, AddressbookStore, CollectionMetadata, auth::Principal};
+
+use crate::pages::user::{Section, UserPage};
+
+impl Section for AddressbooksSection {
+    fn name() -> &'static str {
+        "addressbooks"
+    }
+}
+
+#[derive(Template, WebTemplate)]
+#[template(path = "components/sections/addressbooks_section.html")]
+pub struct AddressbooksSection {
+    pub user: Principal,
+    pub addressbooks: Vec<(CollectionMetadata, Addressbook)>,
+    pub deleted_addressbooks: Vec<(CollectionMetadata, Addressbook)>,
+}
+
+pub async fn route_addressbooks<AS: AddressbookStore>(
+    Path(user_id): Path<String>,
+    Extension(addr_store): Extension<Arc<AS>>,
+    user: Principal,
+) -> impl IntoResponse {
+    if user_id != user.id {
+        return StatusCode::UNAUTHORIZED.into_response();
+    }
+
+    let mut addressbooks = vec![];
+    for group in user.memberships() {
+        addressbooks.extend(addr_store.get_addressbooks(group).await.unwrap());
+    }
+
+    let mut deleted_addressbooks = vec![];
+    for group in user.memberships() {
+        deleted_addressbooks.extend(addr_store.get_deleted_addressbooks(group).await.unwrap());
+    }
+
+    let mut addressbook_infos = vec![];
+    for addressbook in addressbooks {
+        addressbook_infos.push((
+            addr_store
+                .addressbook_metadata(&addressbook.principal, &addressbook.id)
+                .await
+                .unwrap(),
+            addressbook,
+        ));
+    }
+
+    let mut deleted_addressbook_infos = vec![];
+    for addressbook in deleted_addressbooks {
+        deleted_addressbook_infos.push((
+            addr_store
+                .addressbook_metadata(&addressbook.principal, &addressbook.id)
+                .await
+                .unwrap(),
+            addressbook,
+        ));
+    }
+
+    UserPage {
+        section: AddressbooksSection {
+            user: user.clone(),
+            addressbooks: addressbook_infos,
+            deleted_addressbooks: deleted_addressbook_infos,
+        },
+        user,
+    }
+    .into_response()
+}

crates/frontend/src/routes/app_token.rs

@@ -56,15 +56,19 @@ pub async fn route_post_app_token<AP: AuthenticationProvider>(
     assert!(!name.is_empty());
     assert_eq!(user_id, user.id);
     let token = generate_app_token();
-    auth_provider
+    let mut token_id = auth_provider
         .add_app_token(&user.id, name.to_owned(), token.clone())
         .await?;
+    // Get first 4 characters of token identifier
+    token_id.truncate(4);
+    // This will be a hint for the token validator which app token hash to verify against
+    let token = format!("{token_id}_{token}");
     if apple {
         let profile = AppleConfig {
             token_name: name,
             account_description: format!("{}@{}", &user.id, &hostname),
             hostname: hostname.clone(),
-            caldav_principal_url: format!("https://{hostname}/caldav/principal/{user_id}"),
+            caldav_principal_url: format!("https://{hostname}/caldav-compat/principal/{user_id}"),
             carddav_principal_url: format!("https://{hostname}/carddav/principal/{user_id}"),
             user: user.id.to_owned(),
             token,
@@ -79,13 +83,12 @@ pub async fn route_post_app_token<AP: AuthenticationProvider>(
         hdrs.typed_insert(
             ContentType::from_str("application/x-apple-aspen-config; charset=utf-8").unwrap(),
         );
-        let filename = format!("rustical-{}.mobileconfig", user_id);
+        let filename = format!("rustical-{user_id}.mobileconfig");
         let filename = utf8_percent_encode(&filename, CONTROLS);
         hdrs.insert(
             header::CONTENT_DISPOSITION,
             HeaderValue::from_str(&format!(
-                "attachement; filename*=UTF-8''{} filename={}",
-                filename, filename
+                "attachement; filename*=UTF-8''{filename} filename={filename}",
             ))
             .unwrap(),
         );