Add test for uploading invalid calendar object and fix precondition

addresses #157

.github/workflows/cicd.yml

@@ -5,6 +5,7 @@ permissions:
   pull-requests: write
 
 env:
+  RUST_VERSION: "1.92"
   CARGO_TERM_COLOR: always
 
 jobs:
@@ -12,7 +13,9 @@ jobs:
     name: Check
     runs-on: ubuntu-latest
     steps:
-      - run: rustup update
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
       - name: Checkout sources
         uses: actions/checkout@v4
       - run: cargo check
@@ -21,7 +24,9 @@ jobs:
     name: Test Suite
     runs-on: ubuntu-latest
     steps:
-      - run: rustup update
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
       - name: Checkout sources
         uses: actions/checkout@v4
       - run: cargo test --all-features --verbose --workspace
@@ -30,7 +35,9 @@ jobs:
     name: Test Coverage
     runs-on: ubuntu-latest
     steps:
-      - run: rustup update
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
       - name: Install tarpaulin
         run: cargo install cargo-tarpaulin
 
@@ -44,8 +51,10 @@ jobs:
     name: Lints
     runs-on: ubuntu-latest
     steps:
-      - run: rustup update
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - run: rustup component add rustfmt clippy
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+          components: rustfmt, clippy
 
       - name: Checkout sources
         uses: actions/checkout@v4

.github/workflows/docker-publish.yml

@@ -2,7 +2,10 @@ name: Docker
 
 on:
   push:
-    branches: ["main"]
+    branches:
+      - main
+      - dev
+      - feat/*
   release:
     types: ["published"]
 
@@ -26,12 +29,12 @@ jobs:
 
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: docker/setup-buildx-action@v3
 
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -45,7 +48,8 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
+            ${{ github.ref_name == 'main' && 'type=ref,event=branch' || '' }}
+            type=ref,event=branch,prefix=br-
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -54,7 +58,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/arm64,linux/amd64

.gitignore

@@ -16,3 +16,5 @@ site
 # Frontend
 **/node_modules
 **/.vite
+
+**/*.snap.new

.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "DELETE FROM calendarobjectchangelog WHERE (principal, cal_id, object_id) = (?, ?, ?);",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9"
+}

.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendarobjects SET ics = ? WHERE (principal, cal_id, id) = (?, ?, ?);",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3"
+}

.sqlx/query-583069cbeba5285c63c2b95e989669d3faed66a75fbfc7cd93e5f64b778f45ab.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "REPLACE INTO davpush_subscriptions (id, topic, expiration, push_resource, public_key, public_key_type, auth_secret) VALUES (?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "583069cbeba5285c63c2b95e989669d3faed66a75fbfc7cd93e5f64b778f45ab"
+}

.sqlx/query-6d08d3a014743da9b445ab012437ec11f81fd86d3b02fc1df07a036c6b47ace2.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT OR REPLACE INTO davpush_subscriptions (id, topic, expiration, push_resource, public_key, public_key_type, auth_secret) VALUES (?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "6d08d3a014743da9b445ab012437ec11f81fd86d3b02fc1df07a036c6b47ace2"
-}

.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json

@@ -0,0 +1,38 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT principal, cal_id, id, ics FROM calendarobjects WHERE ics LIKE '%VERSION:4.0%';",
+  "describe": {
+    "columns": [
+      {
+        "name": "principal",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "cal_id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "ics",
+        "ordinal": 3,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23"
+}

Cargo.toml

@@ -2,8 +2,8 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.11.1"
+version = "0.11.17"
-rust-version = "1.91"
+rust-version = "1.92"
 edition = "2024"
 description = "A CalDAV server"
 documentation = "https://lennart-k.github.io/rustical/"
@@ -32,12 +32,11 @@ opentelemetry = [
   "dep:tracing-opentelemetry",
 ]
 
-
 [profile.dev]
 debug = 0
 
 [workspace.dependencies]
-rustical_dav = { path = "./crates/dav/" }
+rustical_dav = { path = "./crates/dav/", features = ["ical"] }
 rustical_dav_push = { path = "./crates/dav_push/" }
 rustical_store = { path = "./crates/store/" }
 rustical_store_sqlite = { path = "./crates/store_sqlite/" }
@@ -49,7 +48,7 @@ rustical_oidc = { path = "./crates/oidc/" }
 rustical_ical = { path = "./crates/ical/" }
 
 matchit = "0.9"
-uuid = { version = "1.11", features = ["v4", "fast-rng"] }
+uuid = { version = "1.19", features = ["v4", "fast-rng"] }
 async-trait = "0.1"
 axum = "0.8"
 tracing = { version = "0.1", features = ["async-await"] }
@@ -60,11 +59,11 @@ password-auth = { version = "1.0", features = ["argon2", "pbkdf2"] }
 pbkdf2 = { version = "0.12", features = ["simple"] }
 rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
-regex = "1.10"
+regex = "1.12"
 rstest = "0.26"
 rstest_reuse = "0.7"
 sha2 = "0.10"
-tokio = { version = "1", features = [
+tokio = { version = "1.48", features = [
   "net",
   "tracing",
   "macros",
@@ -74,15 +73,15 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.38" }
+quick-xml = { version = "0.39" }
-rust-embed = "8.5"
+rust-embed = "8.9"
 tower-sessions = "0.14"
-futures-core = "0.3.31"
+futures-core = "0.3"
-hex = { version = "0.4.3", features = ["serde"] }
+hex = { version = "0.4", features = ["serde"] }
 mime_guess = "2.0"
 itertools = "0.14"
 log = "0.4"
-derive_more = { version = "2.0", features = [
+derive_more = { version = "2.1", features = [
   "from",
   "try_into",
   "into",
@@ -90,8 +89,8 @@ derive_more = { version = "2.0", features = [
   "constructor",
   "display",
 ] }
-askama = { version = "0.14", features = ["serde_json"] }
+askama = { version = "0.15", features = ["serde_json"] }
-askama_web = { version = "0.14.0", features = ["axum-0.8"] }
+askama_web = { version = "0.15", features = ["axum-0.8"] }
 sqlx = { version = "0.8", default-features = false, features = [
   "sqlx-sqlite",
   "uuid",
@@ -102,15 +101,13 @@ sqlx = { version = "0.8", default-features = false, features = [
   "migrate",
   "json",
 ] }
-http = "1.3"
+http = "1.4"
 headers = "0.4"
 strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { git = "https://github.com/lennart-k/ical-rs", features = [
+ical = { git = "https://github.com/lennart-k/ical-rs", branch = "dev", features = [
-  "generator",
-  "serde",
   "chrono-tz",
 ] }
 toml = "0.9"
@@ -127,7 +124,7 @@ rand = "0.9"
 axum-extra = { version = "0.12", features = ["typed-header"] }
 rrule = "0.14"
 argon2 = "0.5"
-rpassword = "7.3"
+rpassword = "7.4"
 password-hash = { version = "0.5" }
 syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
@@ -149,6 +146,14 @@ ece = { version = "2.3", default-features = false, features = [
 openssl = { version = "0.10", features = ["vendored"] }
 async-std = { version = "1.13", features = ["attributes"] }
 similar-asserts = "1.7"
+insta = { version = "1.44", features = ["filters"] }
+criterion = { version = "0.8", features = ["async_tokio"] }
+
+[dev-dependencies]
+rstest.workspace = true
+rustical_store_sqlite = { workspace = true, features = ["test"] }
+insta.workspace = true
+similar-asserts.workspace = true
 
 [dependencies]
 rustical_store.workspace = true
@@ -156,6 +161,7 @@ rustical_store_sqlite.workspace = true
 rustical_caldav.workspace = true
 rustical_carddav.workspace = true
 rustical_frontend.workspace = true
+ical.workspace = true
 toml.workspace = true
 serde.workspace = true
 tokio.workspace = true

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.91-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.92-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -36,7 +36,7 @@ COPY --from=planner /rustical/recipe.json recipe.json
 RUN cargo chef cook --release --target "$(cat /tmp/rust_target)"
 
 COPY . .
-RUN cargo install --target "$(cat /tmp/rust_target)" --path .
+RUN cargo install --locked --target "$(cat /tmp/rust_target)" --path .
 
 FROM scratch
 COPY --from=builder /usr/local/cargo/bin/rustical /usr/local/bin/rustical

README.md

@@ -1,3 +1,6 @@
+[![license](https://img.shields.io/github/license/lennart-k/rustical)](https://raw.githubusercontent.com/lennart-k/rustical/main/LICENSE)
+[![Coverage Status](https://coveralls.io/repos/github/lennart-k/rustical/badge.svg?branch=main)](https://coveralls.io/github/lennart-k/rustical?branch=main)
+
 # RustiCal
 
 a CalDAV/CardDAV server

about.toml

@@ -9,5 +9,7 @@ accepted = [
   "AGPL-3.0",
   "GPL-3.0",
   "MPL-2.0",
+  "AGPL-3.0-or-later",
+  "GPL-3.0-or-later",
 ]
 workarounds = ["ring", "chrono", "rustls"]

crates/caldav/Cargo.toml

@@ -13,6 +13,7 @@ rustical_store_sqlite = { workspace = true, features = ["test"] }
 rstest.workspace = true
 async-std.workspace = true
 serde_json.workspace = true
+insta.workspace = true
 
 [dependencies]
 axum.workspace = true
@@ -28,7 +29,7 @@ base64.workspace = true
 serde.workspace = true
 tokio.workspace = true
 url.workspace = true
-rustical_dav.workspace = true
+rustical_dav = { workspace = true, features = ["ical"] }
 rustical_store.workspace = true
 chrono.workspace = true
 chrono-tz.workspace = true

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

@@ -5,12 +5,11 @@ use axum::extract::State;
 use axum::{extract::Path, response::Response};
 use headers::{ContentType, HeaderMapExt};
 use http::{HeaderValue, Method, StatusCode, header};
-use ical::generator::{Emitter, IcalCalendarBuilder};
+use ical::component::IcalCalendar;
-use ical::property::Property;
+use ical::generator::Emitter;
+use ical::property::ContentLine;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
-use std::collections::HashMap;
 use std::str::FromStr;
 use tracing::instrument;
 
@@ -32,70 +31,49 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         return Err(crate::Error::Unauthorized);
     }
 
-    let mut vtimezones = HashMap::new();
+    let objects = cal_store
-    let objects = cal_store.get_objects(&principal, &calendar_id).await?;
+        .get_objects(&principal, &calendar_id)
+        .await?
+        .into_iter()
+        .map(|(_, object)| object.into())
+        .collect();
+
+    let mut props = vec![];
 
-    let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
-        .gregorian()
-        .prodid("RustiCal");
     if let Some(displayname) = calendar.meta.displayname {
-        ical_calendar_builder = ical_calendar_builder.set(Property {
+        props.push(ContentLine {
             name: "X-WR-CALNAME".to_owned(),
             value: Some(displayname),
-            params: None,
+            params: vec![].into(),
         });
     }
     if let Some(description) = calendar.meta.description {
-        ical_calendar_builder = ical_calendar_builder.set(Property {
+        props.push(ContentLine {
             name: "X-WR-CALDESC".to_owned(),
             value: Some(description),
-            params: None,
+            params: vec![].into(),
+        });
+    }
+    if let Some(color) = calendar.meta.color {
+        props.push(ContentLine {
+            name: "X-WR-CALCOLOR".to_owned(),
+            value: Some(color),
+            params: vec![].into(),
         });
     }
     if let Some(timezone_id) = calendar.timezone_id {
-        ical_calendar_builder = ical_calendar_builder.set(Property {
+        props.push(ContentLine {
             name: "X-WR-TIMEZONE".to_owned(),
             value: Some(timezone_id),
-            params: None,
+            params: vec![].into(),
         });
     }
 
-    for object in &objects {
+    let export_calendar = IcalCalendar::from_objects("RustiCal Export".to_owned(), objects, props);
-        vtimezones.extend(object.get_vtimezones());
-        match object.get_data() {
-            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
-                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
-                for ev_override in overrides {
-                    ical_calendar_builder =
-                        ical_calendar_builder.add_event(ev_override.event.clone());
-                }
-            }
-            CalendarObjectComponent::Todo(todo, overrides) => {
-                ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
-                for ev_override in overrides {
-                    ical_calendar_builder = ical_calendar_builder.add_todo(ev_override.clone());
-                }
-            }
-            CalendarObjectComponent::Journal(journal, overrides) => {
-                ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
-                for ev_override in overrides {
-                    ical_calendar_builder = ical_calendar_builder.add_journal(ev_override.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());
+    hdrs.typed_insert(ContentType::from_str("text/calendar; charset=utf-8").unwrap());
 
     let filename = format!("{}_{}.ics", calendar.principal, calendar.id);
     let filename = utf8_percent_encode(&filename, CONTROLS);
@@ -109,6 +87,6 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     if matches!(method, Method::HEAD) {
         Ok(resp.body(Body::empty()).unwrap())
     } else {
-        Ok(resp.body(Body::new(ical_calendar.generate())).unwrap())
+        Ok(resp.body(Body::new(export_calendar.generate())).unwrap())
     }
 }

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

@@ -5,16 +5,12 @@ use axum::{
     response::{IntoResponse, Response},
 };
 use http::StatusCode;
-use ical::{
+use ical::parser::{Component, ComponentMut};
-    generator::Emitter,
-    parser::{Component, ComponentMut},
-};
 use rustical_dav::header::Overwrite;
-use rustical_ical::{CalendarObject, CalendarObjectType};
+use rustical_ical::CalendarObjectType;
 use rustical_store::{
     Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
 };
-use std::io::BufReader;
 use tracing::instrument;
 
 #[instrument(skip(resource_service))]
@@ -29,18 +25,11 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
         return Err(Error::Unauthorized);
     }
 
-    let mut parser = ical::IcalParser::new(BufReader::new(body.as_bytes()));
+    let parser = ical::IcalParser::from_slice(body.as_bytes());
-    let mut cal = parser
+    let mut cal = match parser.expect_one() {
-        .next()
+        Ok(cal) => cal.mutable(),
-        .expect("input must contain calendar")
+        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-        .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
@@ -49,14 +38,19 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     let description = cal
         .get_property("X-WR-CALDESC")
         .and_then(|prop| prop.value.clone());
+    let color = cal
+        .get_property("X-WR-CALCOLOR")
+        .and_then(|prop| prop.value.clone());
     let timezone_id = cal
         .get_property("X-WR-TIMEZONE")
         .and_then(|prop| prop.value.clone());
     // 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-CALCOLOR");
     cal.remove_property("X-WR-TIMEZONE");
-    let cal = cal.verify().unwrap();
+    let cal = cal.build(None).unwrap();
+
     // Make sure timezone is valid
     if let Some(timezone_id) = timezone_id.as_ref() {
         assert!(
@@ -64,8 +58,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
             "Invalid calendar timezone id"
         );
     }
-
+    // // Extract necessary component types
-    // Extract necessary component types
     let mut cal_components = vec![];
     if !cal.events.is_empty() {
         cal_components.push(CalendarObjectType::Event);
@@ -77,13 +70,10 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
         cal_components.push(CalendarObjectType::Todo);
     }
 
-    let expanded_cals = cal.expand_calendar();
+    let objects = match cal.into_objects() {
-    // Janky way to convert between IcalCalendar and CalendarObject
+        Ok(objects) => objects.into_iter().map(Into::into).collect(),
-    let objects = expanded_cals
+        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-        .into_iter()
+    };
-        .map(|cal| cal.generate())
-        .map(|ics| CalendarObject::from_ics(ics, None))
-        .collect::<Result<Vec<_>, _>>()?;
     let new_cal = Calendar {
         principal,
         id: cal_id,
@@ -91,7 +81,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
             displayname,
             order: 0,
             description,
-            color: None,
+            color,
         },
         timezone_id,
         deleted_at: None,

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

@@ -87,17 +87,18 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         Some(tzid)
     } else if let Some(tz) = request.calendar_timezone {
         // TODO: Proper error (calendar-timezone precondition)
-        let calendar = IcalParser::new(tz.as_bytes())
+        let calendar = IcalParser::from_slice(tz.as_bytes())
             .next()
             .ok_or_else(|| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?
-            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+            .map_err(|_| rustical_dav::Error::BadRequest("Error parsing timezone".to_owned()))?;
 
-        let timezone = calendar.timezones.first().ok_or_else(|| {
+        let timezone = calendar.vtimezones.values().next().ok_or_else(|| {
             rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
         })?;
-        let timezone: chrono_tz::Tz = timezone
+        let timezone: Option<chrono_tz::Tz> = timezone.into();
-            .try_into()
+        let timezone = timezone.ok_or_else(|| {
-            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+            rustical_dav::Error::BadRequest("Cannot translate VTIMEZONE into IANA TZID".to_owned())
+        })?;
 
         Some(timezone.name().to_owned())
     } else {

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

@@ -21,7 +21,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
     principal: &str,
     cal_id: &str,
     store: &C,
-) -> Result<(Vec<CalendarObject>, Vec<String>), Error> {
+) -> Result<(Vec<(String, CalendarObject)>, Vec<String>), Error> {
     let mut result = vec![];
     let mut not_found = vec![];
 
@@ -32,7 +32,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
             let filename = filename.trim_start_matches('/');
             if let Some(object_id) = filename.strip_suffix(".ics") {
                 match store.get_object(principal, cal_id, object_id, false).await {
-                    Ok(object) => result.push(object),
+                    Ok(object) => result.push((object_id.to_owned(), object)),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_string()),
                     Err(err) => return Err(err.into()),
                 }

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

@@ -2,8 +2,10 @@ use crate::calendar::methods::report::calendar_query::{
     TimeRangeElement,
     prop_filter::{PropFilterElement, PropFilterable},
 };
-use ical::parser::ical::component::IcalTimeZone;
+use ical::{
-use rustical_ical::{CalendarObject, CalendarObjectComponent, CalendarObjectType};
+    component::{CalendarInnerData, IcalAlarm, IcalCalendarObject, IcalEvent, IcalTodo},
+    parser::{Component, ical::component::IcalTimeZone},
+};
 use rustical_xml::XmlDeserialize;
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -16,6 +18,7 @@ pub struct CompFilterElement {
     pub(crate) time_range: Option<TimeRangeElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub(crate) prop_filter: Vec<PropFilterElement>,
+    #[allow(clippy::use_self)]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub(crate) comp_filter: Vec<CompFilterElement>,
 
@@ -67,9 +70,98 @@ pub trait CompFilterable: PropFilterable + Sized {
     }
 }
 
-impl CompFilterable for CalendarObject {
+impl CompFilterable for CalendarInnerData {
     fn get_comp_name(&self) -> &'static str {
-        "VCALENDAR"
+        match self {
+            Self::Event(main, _) => main.get_comp_name(),
+            Self::Journal(main, _) => main.get_comp_name(),
+            Self::Todo(main, _) => main.get_comp_name(),
+        }
+    }
+
+    fn match_time_range(&self, time_range: &TimeRangeElement) -> bool {
+        if let Some(start) = &time_range.start
+            && let Some(last_end) = self.get_last_occurence()
+            && start.to_utc() > last_end.utc()
+        {
+            return false;
+        }
+        if let Some(end) = &time_range.end
+            && let Some(first_start) = self.get_first_occurence()
+            && end.to_utc() < first_start.utc()
+        {
+            return false;
+        }
+        true
+    }
+
+    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
+        match self {
+            Self::Event(main, overrides) => std::iter::once(main)
+                .chain(overrides.iter())
+                .flat_map(IcalEvent::get_alarms)
+                .any(|alarm| alarm.matches(comp_filter)),
+            Self::Todo(main, overrides) => std::iter::once(main)
+                .chain(overrides.iter())
+                .flat_map(IcalTodo::get_alarms)
+                .any(|alarm| alarm.matches(comp_filter)),
+            // VJOURNAL has no subcomponents
+            Self::Journal(_, _) => comp_filter.is_not_defined.is_some(),
+        }
+    }
+}
+
+impl PropFilterable for IcalAlarm {
+    fn get_named_properties<'a>(
+        &'a self,
+        name: &'a str,
+    ) -> impl Iterator<Item = &'a ical::property::ContentLine> {
+        Component::get_named_properties(self, name)
+    }
+}
+
+impl CompFilterable for IcalAlarm {
+    fn get_comp_name(&self) -> &'static str {
+        Component::get_comp_name(self)
+    }
+
+    fn match_time_range(&self, _time_range: &TimeRangeElement) -> bool {
+        true
+    }
+
+    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
+        comp_filter.is_not_defined.is_some()
+    }
+}
+
+impl PropFilterable for CalendarInnerData {
+    #[allow(refining_impl_trait)]
+    fn get_named_properties<'a>(
+        &'a self,
+        name: &'a str,
+    ) -> Box<dyn Iterator<Item = &'a ical::property::ContentLine> + 'a> {
+        // TODO: If we were pedantic, we would have to do recurrence expansion first
+        // and take into account the overrides :(
+        match self {
+            Self::Event(main, _) => Box::new(main.get_named_properties(name)),
+            Self::Todo(main, _) => Box::new(main.get_named_properties(name)),
+            Self::Journal(main, _) => Box::new(main.get_named_properties(name)),
+        }
+    }
+}
+
+impl PropFilterable for IcalCalendarObject {
+    fn get_named_properties<'a>(
+        &'a self,
+        name: &'a str,
+    ) -> impl Iterator<Item = &'a ical::property::ContentLine> {
+        Component::get_named_properties(self, name)
+    }
+}
+
+impl CompFilterable for IcalCalendarObject {
+    fn get_comp_name(&self) -> &'static str {
+        Component::get_comp_name(self)
     }
 
     fn match_time_range(&self, _time_range: &TimeRangeElement) -> bool {
@@ -82,72 +174,53 @@ impl CompFilterable for CalendarObject {
             .get_vtimezones()
             .values()
             .map(|tz| tz.matches(comp_filter))
-            .chain([self.get_data().matches(comp_filter)]);
+            .chain([self.get_inner().matches(comp_filter)]);
 
         if comp_filter.is_not_defined.is_some() {
-            matches.all(|x| x)
+            matches.all(|x| !x)
         } else {
             matches.any(|x| x)
         }
     }
 }
 
+impl PropFilterable for IcalTimeZone {
+    fn get_named_properties<'a>(
+        &'a self,
+        name: &'a str,
+    ) -> impl Iterator<Item = &'a ical::property::ContentLine> {
+        Component::get_named_properties(self, name)
+    }
+}
+
 impl CompFilterable for IcalTimeZone {
     fn get_comp_name(&self) -> &'static str {
-        "VTIMEZONE"
+        Component::get_comp_name(self)
     }
-
     fn match_time_range(&self, _time_range: &TimeRangeElement) -> bool {
         false
     }
 
-    fn match_subcomponents(&self, _comp_filter: &CompFilterElement) -> bool {
+    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
-        true
+        // VTIMEZONE has no subcomponents
-    }
+        comp_filter.is_not_defined.is_some()
-}
-
-impl CompFilterable for CalendarObjectComponent {
-    fn get_comp_name(&self) -> &'static str {
-        CalendarObjectType::from(self).as_str()
-    }
-
-    fn match_time_range(&self, time_range: &TimeRangeElement) -> bool {
-        if let Some(start) = &time_range.start
-            && let Some(last_occurence) = self.get_last_occurence().unwrap_or(None)
-            && **start > last_occurence.utc()
-        {
-            return false;
-        }
-        if let Some(end) = &time_range.end
-            && let Some(first_occurence) = self.get_first_occurence().unwrap_or(None)
-            && **end < first_occurence.utc()
-        {
-            return false;
-        }
-        true
-    }
-
-    fn match_subcomponents(&self, _comp_filter: &CompFilterElement) -> bool {
-        // TODO: Properly check subcomponents
-        true
     }
 }
 
 #[cfg(test)]
 mod tests {
     use chrono::{TimeZone, Utc};
+    use rustical_dav::xml::{MatchType, NegateCondition, TextCollation, TextMatchElement};
     use rustical_ical::{CalendarObject, UtcDateTime};
 
     use crate::calendar::methods::report::calendar_query::{
-        CompFilterable, TextMatchElement, TimeRangeElement,
+        CompFilterElement, CompFilterable, PropFilterElement, TimeRangeElement,
-        comp_filter::CompFilterElement,
-        prop_filter::PropFilterElement,
-        text_match::{NegateCondition, TextCollation},
     };
 
     const ICS: &str = r"BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 VERSION:2.0
+PRODID:me
 BEGIN:VTIMEZONE
 TZID:Europe/Berlin
 X-LIC-LOCATION:Europe/Berlin
@@ -167,7 +240,7 @@ END:VCALENDAR";
 
     #[test]
     fn test_comp_filter_matching() {
-        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
 
         let comp_filter = CompFilterElement {
             is_not_defined: Some(()),
@@ -176,7 +249,10 @@ END:VCALENDAR";
             prop_filter: vec![],
             comp_filter: vec![],
         };
-        assert!(!object.matches(&comp_filter), "filter: wants no VCALENDAR");
+        assert!(
+            !object.get_inner().matches(&comp_filter),
+            "filter: wants no VCALENDAR"
+        );
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -191,7 +267,10 @@ END:VCALENDAR";
                 comp_filter: vec![],
             }],
         };
-        assert!(!object.matches(&comp_filter), "filter matches VTODO");
+        assert!(
+            !object.get_inner().matches(&comp_filter),
+            "filter matches VTODO"
+        );
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -206,7 +285,10 @@ END:VCALENDAR";
                 comp_filter: vec![],
             }],
         };
-        assert!(object.matches(&comp_filter), "filter matches VEVENT");
+        assert!(
+            object.get_inner().matches(&comp_filter),
+            "filter matches VEVENT"
+        );
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -218,6 +300,7 @@ END:VCALENDAR";
                     name: "VERSION".to_string(),
                     time_range: None,
                     text_match: Some(TextMatchElement {
+                        match_type: MatchType::Contains,
                         needle: "2.0".to_string(),
                         collation: TextCollation::default(),
                         negate_condition: NegateCondition::default(),
@@ -241,6 +324,7 @@ END:VCALENDAR";
                     name: "SUMMARY".to_string(),
                     time_range: None,
                     text_match: Some(TextMatchElement {
+                        match_type: MatchType::Contains,
                         collation: TextCollation::default(),
                         negate_condition: NegateCondition(false),
                         needle: "weekly".to_string(),
@@ -251,13 +335,13 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            object.matches(&comp_filter),
+            object.get_inner().matches(&comp_filter),
             "Some prop filters on VCALENDAR and VEVENT"
         );
     }
     #[test]
     fn test_comp_filter_time_range() {
-        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -280,7 +364,7 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            object.matches(&comp_filter),
+            object.get_inner().matches(&comp_filter),
             "event should lie in time range"
         );
 
@@ -305,14 +389,14 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            !object.matches(&comp_filter),
+            !object.get_inner().matches(&comp_filter),
             "event should not lie in time range"
         );
     }
 
     #[test]
     fn test_match_timezone() {
-        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
 
         let comp_filter = CompFilterElement {
             is_not_defined: None,
@@ -328,6 +412,7 @@ END:VCALENDAR";
                     name: "TZID".to_string(),
                     time_range: None,
                     text_match: Some(TextMatchElement {
+                        match_type: MatchType::Contains,
                         collation: TextCollation::AsciiCasemap,
                         negate_condition: NegateCondition::default(),
                         needle: "Europe/Berlin".to_string(),
@@ -338,7 +423,7 @@ END:VCALENDAR";
             }],
         };
         assert!(
-            object.matches(&comp_filter),
+            object.get_inner().matches(&comp_filter),
             "Timezone should be Europe/Berlin"
         );
     }

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

@@ -1,14 +1,10 @@
-use crate::{
+use super::comp_filter::{CompFilterElement, CompFilterable};
-    calendar::methods::report::calendar_query::{
+use crate::calendar_object::CalendarObjectPropWrapperName;
-        TextMatchElement,
+use ical::{component::IcalCalendarObject, property::ContentLine};
-        comp_filter::{CompFilterElement, CompFilterable},
+use rustical_dav::xml::{PropfindType, TextMatchElement};
-    },
+use rustical_ical::UtcDateTime;
-    calendar_object::CalendarObjectPropWrapperName,
-};
-use rustical_dav::xml::PropfindType;
-use rustical_ical::{CalendarObject, UtcDateTime};
 use rustical_store::calendar_store::CalendarQuery;
-use rustical_xml::XmlDeserialize;
+use rustical_xml::{XmlDeserialize, XmlRootTag};
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
@@ -32,7 +28,25 @@ pub struct ParamFilterElement {
     pub(crate) name: String,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+impl ParamFilterElement {
+    #[must_use]
+    pub fn match_property(&self, prop: &ContentLine) -> bool {
+        let Some(param) = prop.params.get_param(&self.name) else {
+            return self.is_not_defined.is_some();
+        };
+        if self.is_not_defined.is_some() {
+            return false;
+        }
+
+        let Some(text_match) = self.text_match.as_ref() else {
+            return true;
+        };
+        text_match.match_text(param)
+    }
+}
+
+#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
+#[xml(root = "filter", ns = "rustical_dav::namespace::NS_CALDAV")]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
 pub struct FilterElement {
@@ -43,7 +57,7 @@ pub struct FilterElement {
 
 impl FilterElement {
     #[must_use]
-    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
+    pub fn matches(&self, cal_object: &IcalCalendarObject) -> bool {
         cal_object.matches(&self.comp_filter)
     }
 }

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

@@ -5,47 +5,43 @@ use rustical_store::CalendarStore;
 mod comp_filter;
 mod elements;
 mod prop_filter;
-pub mod text_match;
+#[cfg(test)]
+mod tests;
 #[allow(unused_imports)]
 pub use comp_filter::{CompFilterElement, CompFilterable};
 pub use elements::*;
 #[allow(unused_imports)]
-pub use prop_filter::{PropFilterElement, PropFilterable};
+pub use prop_filter::PropFilterElement;
-#[allow(unused_imports)]
-pub use text_match::TextMatchElement;
 
 pub async fn get_objects_calendar_query<C: CalendarStore>(
     cal_query: &CalendarQueryRequest,
     principal: &str,
     cal_id: &str,
     store: &C,
-) -> Result<Vec<CalendarObject>, Error> {
+) -> Result<Vec<(String, CalendarObject)>, Error> {
     let mut objects = store
         .calendar_query(principal, cal_id, cal_query.into())
         .await?;
     if let Some(filter) = &cal_query.filter {
-        objects.retain(|object| filter.matches(object));
+        objects.retain(|(_id, object)| filter.matches(object.get_inner()));
     }
     Ok(objects)
 }
 
 #[cfg(test)]
-mod tests {
+mod xml_tests {
-    use rustical_dav::xml::PropElement;
+    use super::{
-    use rustical_xml::XmlDocument;
+        CalendarQueryRequest, FilterElement, ParamFilterElement, comp_filter::CompFilterElement,
-
+        prop_filter::PropFilterElement,
+    };
     use crate::{
-        calendar::methods::report::{
+        calendar::methods::report::ReportRequest,
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, FilterElement, ParamFilterElement, TextMatchElement,
-                comp_filter::CompFilterElement,
-                prop_filter::PropFilterElement,
-                text_match::{NegateCondition, TextCollation},
-            },
-        },
         calendar_object::{CalendarData, CalendarObjectPropName, CalendarObjectPropWrapperName},
     };
+    use rustical_dav::xml::{
+        MatchType, NegateCondition, PropElement, TextCollation, TextMatchElement,
+    };
+    use rustical_xml::XmlDocument;
 
     #[test]
     fn calendar_query_7_8_7() {
@@ -57,16 +53,16 @@ mod tests {
                     <C:calendar-data/>
                 </D:prop>
                 <C:filter>
-                <C:comp-filter name="VCALENDAR">
+                    <C:comp-filter name="VCALENDAR">
-                    <C:comp-filter name="VEVENT">
+                        <C:comp-filter name="VEVENT">
-                        <C:prop-filter name="ATTENDEE">
+                            <C:prop-filter name="ATTENDEE">
-                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
+                                <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
-                            <C:param-filter name="PARTSTAT">
+                                <C:param-filter name="PARTSTAT">
-                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
+                                    <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
-                            </C:param-filter>
+                                </C:param-filter>
-                        </C:prop-filter>
+                            </C:prop-filter>
+                        </C:comp-filter>
                     </C:comp-filter>
-                </C:comp-filter>
                 </C:filter>
             </C:calendar-query>
         "#;
@@ -101,6 +97,7 @@ mod tests {
                             prop_filter: vec![PropFilterElement {
                                 name: "ATTENDEE".to_owned(),
                                 text_match: Some(TextMatchElement {
+                                    match_type: MatchType::Contains,
                                     collation: TextCollation::AsciiCasemap,
                                     negate_condition: NegateCondition(false),
                                     needle: "mailto:lisa@example.com".to_string()
@@ -110,6 +107,7 @@ mod tests {
                                     is_not_defined: None,
                                     name: "PARTSTAT".to_owned(),
                                     text_match: Some(TextMatchElement {
+                                        match_type: MatchType::Contains,
                                         collation: TextCollation::AsciiCasemap,
                                         negate_condition: NegateCondition(false),
                                         needle: "NEEDS-ACTION".to_string()

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

@@ -1,20 +1,9 @@
-use std::collections::HashMap;
+use super::{ParamFilterElement, TimeRangeElement};
-
+use ical::{property::ContentLine, types::CalDateTime};
-use ical::{
+use rustical_dav::xml::TextMatchElement;
-    generator::{IcalCalendar, IcalEvent},
+use rustical_ical::UtcDateTime;
-    parser::{
-        Component,
-        ical::component::{IcalJournal, IcalTimeZone, IcalTodo},
-    },
-    property::Property,
-};
-use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectComponent, UtcDateTime};
 use rustical_xml::XmlDeserialize;
 
-use crate::calendar::methods::report::calendar_query::{
-    ParamFilterElement, TextMatchElement, TimeRangeElement,
-};
-
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 // https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
@@ -32,22 +21,16 @@ pub struct PropFilterElement {
     pub(crate) name: String,
 }
 
-impl PropFilterElement {
+pub trait PropFilterable {
-    pub fn match_component(&self, comp: &impl PropFilterable) -> bool {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine>;
-        let property = comp.get_property(&self.name);
+}
-        let property = match (self.is_not_defined.is_some(), property) {
-            // We are the component that's not supposed to be defined
-            (true, Some(_))
-            // We don't match
-            | (false, None) => return false,
-            // We shall not be and indeed we aren't
-            (true, None) => return true,
-            (false, Some(property)) => property
-        };
 
+impl PropFilterElement {
+    #[must_use]
+    pub fn match_property(&self, property: &ContentLine) -> bool {
         if let Some(TimeRangeElement { start, end }) = &self.time_range {
             // TODO: Respect timezones
-            let Ok(timestamp) = CalDateTime::parse_prop(property, &HashMap::default()) else {
+            let Ok(timestamp) = CalDateTime::parse_prop(property, None) else {
                 return false;
             };
             let timestamp = timestamp.utc();
@@ -70,58 +53,25 @@ impl PropFilterElement {
             return false;
         }
 
-        // TODO: param-filter
+        if !self
+            .param_filter
+            .iter()
+            .all(|param_filter| param_filter.match_property(property))
+        {
+            return false;
+        }
 
         true
     }
-}
 
-pub trait PropFilterable {
+    pub fn match_component(&self, comp: &impl PropFilterable) -> bool {
-    fn get_property(&self, name: &str) -> Option<&Property>;
+        let mut properties = comp.get_named_properties(&self.name);
-}
+        if self.is_not_defined.is_some() {
-
+            return properties.next().is_none();
-impl PropFilterable for CalendarObject {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        Self::get_property(self, name)
-    }
-}
-
-impl PropFilterable for IcalEvent {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        Component::get_property(self, name)
-    }
-}
-
-impl PropFilterable for IcalTodo {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        Component::get_property(self, name)
-    }
-}
-
-impl PropFilterable for IcalJournal {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        Component::get_property(self, name)
-    }
-}
-
-impl PropFilterable for IcalCalendar {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        Component::get_property(self, name)
-    }
-}
-
-impl PropFilterable for IcalTimeZone {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        Component::get_property(self, name)
-    }
-}
-
-impl PropFilterable for CalendarObjectComponent {
-    fn get_property(&self, name: &str) -> Option<&Property> {
-        match self {
-            Self::Event(event, _) => PropFilterable::get_property(&event.event, name),
-            Self::Todo(todo, _) => PropFilterable::get_property(todo, name),
-            Self::Journal(journal, _) => PropFilterable::get_property(journal, name),
         }
+
+        // The filter matches when one property instance matches
+        // Example where this matters: We have multiple attendees and want to match one
+        properties.any(|prop| self.match_property(prop))
     }
 }

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

@@ -0,0 +1,83 @@
+use super::FilterElement;
+use rstest::rstest;
+use rustical_ical::CalendarObject;
+use rustical_xml::XmlDocument;
+
+const ICS_1: &str = r"BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Corp.//CalDAV Client//EN
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
+ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
+DTSTAMP:20060206T001220Z
+DTSTART;TZID=US/Eastern:20060104T100000
+DURATION:PT1H
+LAST-MODIFIED:20060206T001330Z
+ORGANIZER:mailto:cyrus@example.com
+SEQUENCE:1
+STATUS:TENTATIVE
+SUMMARY:Event #3
+UID:DC6C50A017428C5216A2F1CD@example.com
+X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
+END:VEVENT
+END:VCALENDAR
+";
+
+const FILTER_1: &str = r#"
+<?xml version="1.0" encoding="utf-8" ?>
+<C:filter xmlns:C="urn:ietf:params:xml:ns:caldav">
+    <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>
+"#;
+
+const FILTER_2: &str = r#"
+<?xml version="1.0" encoding="utf-8" ?>
+<C:filter xmlns:C="urn:ietf:params:xml:ns:caldav">
+    <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">ACCEPTED</C:text-match>
+                </C:param-filter>
+            </C:prop-filter>
+        </C:comp-filter>
+    </C:comp-filter>
+</C:filter>
+"#;
+
+#[rstest]
+#[case(ICS_1, FILTER_1, true)]
+#[case(ICS_1, FILTER_2, false)]
+fn yeet(#[case] ics: &str, #[case] filter: &str, #[case] matches: bool) {
+    let obj = CalendarObject::from_ics(ics.to_owned()).unwrap();
+    let filter = FilterElement::parse_str(filter).unwrap();
+    assert_eq!(matches, filter.matches(obj.get_inner()));
+}

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

@@ -1,103 +0,0 @@
-use ical::property::Property;
-use rustical_xml::{ValueDeserialize, XmlDeserialize};
-
-#[derive(Clone, Debug, PartialEq, Eq, Default)]
-pub enum TextCollation {
-    #[default]
-    AsciiCasemap,
-    Octet,
-}
-
-impl TextCollation {
-    // Check whether a haystack contains a needle respecting the collation
-    #[must_use]
-    pub fn match_text(&self, needle: &str, haystack: &str) -> bool {
-        match self {
-            // https://datatracker.ietf.org/doc/html/rfc4790#section-9.2
-            Self::AsciiCasemap => haystack
-                .to_ascii_uppercase()
-                .contains(&needle.to_ascii_uppercase()),
-            Self::Octet => haystack.contains(needle),
-        }
-    }
-}
-
-impl AsRef<str> for TextCollation {
-    fn as_ref(&self) -> &str {
-        match self {
-            Self::AsciiCasemap => "i;ascii-casemap",
-            Self::Octet => "i;octet",
-        }
-    }
-}
-
-impl ValueDeserialize for TextCollation {
-    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlError> {
-        match val {
-            "i;ascii-casemap" => Ok(Self::AsciiCasemap),
-            "i;octet" => Ok(Self::Octet),
-            _ => Err(rustical_xml::XmlError::InvalidVariant(format!(
-                "Invalid collation: {val}"
-            ))),
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Default)]
-pub struct NegateCondition(pub bool);
-
-impl ValueDeserialize for NegateCondition {
-    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlError> {
-        match val {
-            "yes" => Ok(Self(true)),
-            "no" => Ok(Self(false)),
-            _ => Err(rustical_xml::XmlError::InvalidVariant(format!(
-                "Invalid negate-condition parameter: {val}"
-            ))),
-        }
-    }
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
-#[allow(dead_code)]
-pub struct TextMatchElement {
-    #[xml(ty = "attr", default = "Default::default")]
-    pub collation: TextCollation,
-    #[xml(ty = "attr", default = "Default::default")]
-    pub(crate) negate_condition: NegateCondition,
-    #[xml(ty = "text")]
-    pub(crate) needle: String,
-}
-
-impl TextMatchElement {
-    #[must_use]
-    pub fn match_property(&self, property: &Property) -> bool {
-        let Self {
-            collation,
-            negate_condition,
-            needle,
-        } = self;
-
-        let matches = property
-            .value
-            .as_ref()
-            .is_some_and(|haystack| collation.match_text(needle, haystack));
-
-        // XOR
-        negate_condition.0 ^ matches
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::calendar::methods::report::calendar_query::text_match::TextCollation;
-
-    #[test]
-    fn test_collation() {
-        assert!(TextCollation::AsciiCasemap.match_text("GrüN", "grün"));
-        assert!(!TextCollation::AsciiCasemap.match_text("GrÜN", "grün"));
-        assert!(!TextCollation::Octet.match_text("GrÜN", "grün"));
-        assert!(TextCollation::Octet.match_text("hallo", "hallo"));
-        assert!(TextCollation::AsciiCasemap.match_text("HaLlo", "hAllo"));
-    }
-}

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

@@ -51,7 +51,7 @@ impl ReportRequest {
 }
 
 fn objects_response(
-    objects: Vec<CalendarObject>,
+    objects: Vec<(String, CalendarObject)>,
     not_found: Vec<String>,
     path: &str,
     principal: &str,
@@ -60,11 +60,12 @@ fn objects_response(
     prop: &PropfindType<CalendarObjectPropWrapperName>,
 ) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
     let mut responses = Vec::new();
-    for object in objects {
+    for (object_id, object) in objects {
-        let path = format!("{}/{}.ics", path, object.get_id());
+        let path = format!("{path}/{object_id}.ics");
         responses.push(
             CalendarObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, prop, None, puri, user)?,
@@ -174,7 +175,7 @@ mod tests {
                 prop: rustical_dav::xml::PropfindType::Prop(PropElement(vec![
                     CalendarObjectPropWrapperName::CalendarObject(CalendarObjectPropName::Getetag),
                     CalendarObjectPropWrapperName::CalendarObject(CalendarObjectPropName::CalendarData(
-                        CalendarData { comp: None, expand: Some(ExpandElement {
+                        CalendarData { comp: None, prop: None, expand: Some(ExpandElement {
                         start: <UtcDateTime as ValueDeserialize>::deserialize("20250426T220000Z").unwrap(),
                         end: <UtcDateTime as ValueDeserialize>::deserialize("20250503T220000Z").unwrap(),
                     }), limit_recurrence_set: None, limit_freebusy_set: None }

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

@@ -32,11 +32,12 @@ pub async fn handle_sync_collection<C: CalendarStore>(
         .await?;
 
     let mut responses = Vec::new();
-    for object in new_objects {
+    for (object_id, object) in new_objects {
-        let path = format!("{}/{}.ics", path, object.get_id());
+        let path = format!("{}/{}.ics", path, &object_id);
         responses.push(
             CalendarObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, &sync_collection.prop, None, puri, user)?,

crates/caldav/src/calendar/prop.rs

@@ -1,10 +1,9 @@
 use derive_more::derive::{From, Into};
+use rustical_dav::xml::TextCollation;
 use rustical_ical::CalendarObjectType;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-use crate::calendar::methods::report::calendar_query::text_match::TextCollation;
-
 #[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
 pub struct SupportedCalendarComponent {
     #[xml(ty = "attr")]
@@ -55,6 +54,7 @@ impl Default for SupportedCollationSet {
     fn default() -> Self {
         Self(vec![
             SupportedCollation(TextCollation::AsciiCasemap),
+            SupportedCollation(TextCollation::UnicodeCasemap),
             SupportedCollation(TextCollation::Octet),
         ])
     }

crates/caldav/src/calendar/resource.rs

@@ -4,6 +4,7 @@ use crate::calendar::prop::{ReportMethod, SupportedCollationSet};
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
 use ical::IcalParser;
+use ical::types::CalDateTime;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -11,12 +12,12 @@ use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
-use rustical_ical::CalDateTime;
 use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use serde::Deserialize;
+use std::borrow::Cow;
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
@@ -41,7 +42,7 @@ pub enum CalendarProp {
     SupportedCalendarData(SupportedCalendarData),
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCollationSet(SupportedCollationSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     MaxResourceSize(i64),
     #[xml(skip_deserializing)]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -72,8 +73,8 @@ pub struct CalendarResource {
 }
 
 impl ResourceName for CalendarResource {
-    fn get_name(&self) -> String {
+    fn get_name(&self) -> Cow<'_, str> {
-        self.cal.id.clone()
+        Cow::from(&self.cal.id)
     }
 }
 
@@ -201,7 +202,7 @@ impl Resource for CalendarResource {
                 CalendarProp::CalendarTimezone(timezone) => {
                     if let Some(tz) = timezone {
                         // TODO: Proper error (calendar-timezone precondition)
-                        let calendar = IcalParser::new(tz.as_bytes())
+                        let calendar = IcalParser::from_slice(tz.as_bytes())
                             .next()
                             .ok_or_else(|| {
                                 rustical_dav::Error::BadRequest(
@@ -214,13 +215,13 @@ impl Resource for CalendarResource {
                                 )
                             })?;
 
-                        let timezone = calendar.timezones.first().ok_or_else(|| {
+                        let timezone = calendar.vtimezones.values().next().ok_or_else(|| {
                             rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
                         })?;
-                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+                        let timezone: Option<chrono_tz::Tz> = timezone.into();
+                        let timezone = timezone.ok_or_else(|| {
                             rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
                         })?;
-
                         self.cal.timezone_id = Some(timezone.name().to_owned());
                     }
                     Ok(())

crates/caldav/src/calendar/service.rs

@@ -78,8 +78,9 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
             .get_objects(principal, cal_id)
             .await?
             .into_iter()
-            .map(|object| CalendarObjectResource {
+            .map(|(object_id, object)| CalendarObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             })
             .collect())
@@ -91,7 +92,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
         file: Self::Resource,
     ) -> Result<(), Self::Error> {
         self.cal_store
-            .update_calendar(principal.to_owned(), cal_id.to_owned(), file.into())
+            .update_calendar(principal, cal_id, file.into())
             .await?;
         Ok(())
     }

crates/caldav/src/calendar/snapshots/rustical_caldav__calendar__tests__propfind-2.snap

@@ -0,0 +1,200 @@
+---
+source: crates/caldav/src/calendar/tests.rs
+expression: output
+---
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns="DAV:">
+    <href>/caldav/principal/user/calendar/</href>
+    <propstat>
+        <prop xmlns="DAV:">
+            <calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav">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
+</calendar-timezone>
+            <timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav">
+                <href xmlns="DAV:">https://www.iana.org/time-zones</href>
+            </timezone-service-set>
+            <calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav">Europe/Berlin</calendar-timezone-id>
+            <calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
+            <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav">
+                <comp xmlns="urn:ietf:params:xml:ns:caldav" name="VEVENT"/>
+                <comp xmlns="urn:ietf:params:xml:ns:caldav" name="VTODO"/>
+            </supported-calendar-component-set>
+            <supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav">
+                <calendar-data xmlns="urn:ietf:params:xml:ns:caldav" content-type="text/calendar" version="2.0"/>
+            </supported-calendar-data>
+            <supported-collation-set xmlns="urn:ietf:params:xml:ns:caldav">
+                <supported-collation xmlns="urn:ietf:params:xml:ns:caldav">i;ascii-casemap</supported-collation>
+                <supported-collation xmlns="urn:ietf:params:xml:ns:caldav">i;unicode-casemap</supported-collation>
+                <supported-collation xmlns="urn:ietf:params:xml:ns:caldav">i;octet</supported-collation>
+            </supported-collation-set>
+            <max-resource-size xmlns="urn:ietf:params:xml:ns:caldav">10000000</max-resource-size>
+            <supported-report-set xmlns="DAV:">
+                <supported-report xmlns="DAV:">
+                    <report xmlns="DAV:">
+                        <calendar-query xmlns="urn:ietf:params:xml:ns:caldav"/>
+                    </report>
+                </supported-report>
+                <supported-report xmlns="DAV:">
+                    <report xmlns="DAV:">
+                        <calendar-multiget xmlns="urn:ietf:params:xml:ns:caldav"/>
+                    </report>
+                </supported-report>
+                <supported-report xmlns="DAV:">
+                    <report xmlns="DAV:">
+                        <sync-collection xmlns="DAV:"/>
+                    </report>
+                </supported-report>
+            </supported-report-set>
+            <min-date-time xmlns="urn:ietf:params:xml:ns:caldav">-2621430101T000000Z</min-date-time>
+            <max-date-time xmlns="urn:ietf:params:xml:ns:caldav">+2621421231T235959Z</max-date-time>
+            <sync-token xmlns="DAV:">github.com/lennart-k/rustical/ns/12</sync-token>
+            <getctag xmlns="http://calendarserver.org/ns/">github.com/lennart-k/rustical/ns/12</getctag>
+            <transports xmlns="https://bitfire.at/webdav-push">
+                <web-push xmlns="https://bitfire.at/webdav-push"/>
+            </transports>
+            <topic xmlns="https://bitfire.at/webdav-push">b28b41e9-8801-4fc5-ae29-8efb5fadeb36</topic>
+            <supported-triggers xmlns="https://bitfire.at/webdav-push">
+                <content-update xmlns="https://bitfire.at/webdav-push">
+                    <depth xmlns="DAV:">1</depth>
+                </content-update>
+                <property-update xmlns="https://bitfire.at/webdav-push">
+                    <depth xmlns="DAV:">1</depth>
+                </property-update>
+            </supported-triggers>
+            <resourcetype xmlns="DAV:">
+                <collection xmlns="DAV:"/>
+                <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+            </resourcetype>
+            <displayname xmlns="DAV:">Calendar</displayname>
+            <current-user-principal xmlns="DAV:">
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set xmlns="DAV:">
+                <privilege>
+                    <read/>
+                </privilege>
+                <privilege>
+                    <write-properties/>
+                </privilege>
+                <privilege>
+                    <read-acl/>
+                </privilege>
+                <privilege>
+                    <read-current-user-privilege-set/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner xmlns="DAV:">
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </owner>
+        </prop>
+        <status xmlns="DAV:">HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

crates/caldav/src/calendar/snapshots/rustical_caldav__calendar__tests__propfind.snap

@@ -0,0 +1,37 @@
+---
+source: crates/caldav/src/calendar/tests.rs
+expression: output
+---
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns="DAV:">
+    <href>/caldav/principal/user/calendar/</href>
+    <propstat>
+        <prop xmlns="DAV:">
+            <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"/>
+            <supported-collation-set xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <max-resource-size xmlns="urn:ietf:params:xml:ns:caldav"/>
+            <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 xmlns="DAV:">HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

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

@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" 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"/>
-            <supported-collation-set 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="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" 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>
-            <CAL:supported-collation-set>
-                <CAL:supported-collation>i;ascii-casemap</CAL:supported-collation>
-                <CAL:supported-collation>i;octet</CAL:supported-collation>
-            </CAL:supported-collation-set>
-            <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>
-                    <write-properties/>
-                </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/tests.rs

@@ -14,14 +14,9 @@ async fn test_propfind() {
         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)
+        for (request, resource) in requests.iter().zip(&resources) {
-        {
             let propfind = CalendarResource::parse_propfind(request).unwrap();
 
             let response = resource
@@ -33,13 +28,12 @@ async fn test_propfind() {
                     &principal,
                 )
                 .unwrap();
-            let expected_output = expected_output.trim();
             let output = response
                 .serialize_to_string()
                 .unwrap()
                 .trim()
                 .replace("\r\n", "\n");
-            similar_asserts::assert_eq!(expected_output, output);
+            insta::assert_snapshot!(output);
         }
     }
 }

crates/caldav/src/calendar_object/methods.rs

@@ -6,12 +6,12 @@ use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::TypedHeader;
 use headers::{ContentType, ETag, HeaderMapExt, IfNoneMatch};
-use http::{HeaderMap, Method, StatusCode};
+use http::{HeaderMap, HeaderValue, Method, StatusCode};
 use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::{debug, instrument};
+use tracing::{instrument, warn};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -42,7 +42,7 @@ pub async fn get_event<C: CalendarStore>(
     let mut resp = Response::builder().status(StatusCode::OK);
     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());
+    hdrs.typed_insert(ContentType::from_str("text/calendar; charset=utf-8").unwrap());
     if matches!(method, Method::HEAD) {
         Ok(resp.body(Body::empty()).unwrap())
     } else {
@@ -73,18 +73,44 @@ pub async fn put_event<C: CalendarStore>(
     }
 
     let overwrite = if let Some(TypedHeader(if_none_match)) = if_none_match {
-        if_none_match == IfNoneMatch::any()
+        // TODO: Put into transaction?
+        let existing = match cal_store
+            .get_object(&principal, &calendar_id, &object_id, false)
+            .await
+        {
+            Ok(existing) => Some(existing),
+            Err(rustical_store::Error::NotFound) => None,
+            Err(err) => Err(err)?,
+        };
+        existing.is_none_or(|existing| {
+            if_none_match.precondition_passes(
+                &existing
+                    .get_etag()
+                    .parse()
+                    .expect("We only generate valid ETags"),
+            )
+        })
     } else {
         true
     };
 
-    let Ok(object) = CalendarObject::from_ics(body.clone(), Some(object_id)) else {
+    let object = match CalendarObject::from_ics(body.clone()) {
-        debug!("invalid calendar data:\n{body}");
+        Ok(object) => object,
-        return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
+        Err(err) => {
+            warn!("invalid calendar data:\n{body}");
+            warn!("{err:#?}");
+            return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
+        }
     };
+    let etag = object.get_etag();
     cal_store
-        .put_object(principal, calendar_id, object, overwrite)
+        .put_object(&principal, &calendar_id, &object_id, object, overwrite)
         .await?;
 
-    Ok(StatusCode::CREATED.into_response())
+    let mut headers = HeaderMap::new();
+    headers.insert(
+        "ETag",
+        HeaderValue::from_str(&etag).expect("Contains no invalid characters"),
+    );
+    Ok((StatusCode::CREATED, headers).into_response())
 }

crates/caldav/src/calendar_object/prop.rs

@@ -1,6 +1,6 @@
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_ical::UtcDateTime;
-use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
+use rustical_xml::{EnumVariants, PropName, Unparsed, XmlDeserialize, XmlSerialize};
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropName")]
@@ -35,7 +35,9 @@ pub struct ExpandElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Default, Eq, Hash)]
 pub struct CalendarData {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) comp: Option<()>,
+    pub(crate) comp: Option<Unparsed>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) prop: Option<Unparsed>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) expand: Option<ExpandElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]

crates/caldav/src/calendar_object/resource.rs

@@ -4,6 +4,7 @@ use super::prop::{
 };
 use crate::Error;
 use derive_more::derive::{From, Into};
+use ical::generator::Emitter;
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
     privileges::UserPrivilegeSet,
@@ -12,16 +13,18 @@ use rustical_dav::{
 };
 use rustical_ical::CalendarObject;
 use rustical_store::auth::Principal;
+use std::borrow::Cow;
 
 #[derive(Clone, From, Into)]
 pub struct CalendarObjectResource {
     pub object: CalendarObject,
+    pub object_id: String,
     pub principal: String,
 }
 
 impl ResourceName for CalendarObjectResource {
-    fn get_name(&self) -> String {
+    fn get_name(&self) -> Cow<'_, str> {
-        format!("{}.ics", self.object.get_id())
+        Cow::from(format!("{}.ics", self.object_id))
     }
 }
 
@@ -51,14 +54,18 @@ impl Resource for CalendarObjectResource {
                         CalendarObjectProp::Getetag(self.object.get_etag())
                     }
                     CalendarObjectPropName::CalendarData(CalendarData { expand, .. }) => {
-                        CalendarObjectProp::CalendarData(if let Some(expand) = expand.as_ref() {
+                        CalendarObjectProp::CalendarData(expand.as_ref().map_or_else(
-                            self.object.expand_recurrence(
+                            || self.object.get_ics().to_owned(),
-                                Some(expand.start.to_utc()),
+                            |expand| {
-                                Some(expand.end.to_utc()),
+                                self.object
-                            )?
+                                    .get_inner()
-                        } else {
+                                    .expand_recurrence(
-                            self.object.get_ics().to_owned()
+                                        Some(expand.start.to_utc()),
-                        })
+                                        Some(expand.end.to_utc()),
+                                    )
+                                    .generate()
+                            },
+                        ))
                     }
                     CalendarObjectPropName::Getcontenttype => {
                         CalendarObjectProp::Getcontenttype("text/calendar;charset=utf-8")

crates/caldav/src/calendar_object/service.rs

@@ -66,6 +66,7 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
             .await?;
         Ok(CalendarObjectResource {
             object,
+            object_id: object_id.to_owned(),
             principal: principal.to_owned(),
         })
     }

crates/caldav/src/error.rs

@@ -52,9 +52,6 @@ pub enum Error {
     #[error(transparent)]
     XmlDecodeError(#[from] rustical_xml::XmlError),
 
-    #[error(transparent)]
-    IcalError(#[from] rustical_ical::Error),
-
     #[error(transparent)]
     PreconditionFailed(Precondition),
 }
@@ -75,7 +72,6 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
-            Self::IcalError(err) => err.status_code(),
             Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
         }
     }
@@ -83,6 +79,9 @@ impl Error {
 
 impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
+        if let Self::PreconditionFailed(precondition) = self {
+            return precondition.into_response();
+        }
         if matches!(
             self.status_code(),
             StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED

crates/caldav/src/principal/mod.rs

@@ -6,6 +6,7 @@ use rustical_dav::xml::{
     GroupMemberSet, GroupMembership, Resourcetype, ResourcetypeInner, SupportedReportSet,
 };
 use rustical_store::auth::Principal;
+use std::borrow::Cow;
 
 mod service;
 pub use service::*;
@@ -23,8 +24,8 @@ pub struct PrincipalResource {
 }
 
 impl ResourceName for PrincipalResource {
-    fn get_name(&self) -> String {
+    fn get_name(&self) -> Cow<'_, str> {
-        self.principal.id.clone()
+        Cow::from(&self.principal.id)
     }
 }
 

crates/caldav/src/principal/prop.rs

@@ -6,7 +6,7 @@ use rustical_store::auth::PrincipalType;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName, Debug)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // Scheduling Extensions to CalDAV (RFC 6638)
@@ -34,17 +34,17 @@ pub enum PrincipalProp {
     CalendarHomeSet(CalendarHomeSet),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, Debug)]
 pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName, Debug)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
     Principal(PrincipalProp),
     Common(CommonPropertiesProp),
 }
 
-#[derive(XmlSerialize, PartialEq, Eq, Clone, VariantArray)]
+#[derive(XmlSerialize, PartialEq, Eq, Debug, Clone, VariantArray)]
 pub enum ReportMethod {
     // We don't actually support principal-match
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/caldav/src/principal/snapshots/rustical_caldav__principal__tests__propfind-2.snap

@@ -0,0 +1,136 @@
+---
+source: crates/caldav/src/principal/tests.rs
+expression: response
+---
+ResponseElement {
+    href: "/caldav/principal/user/",
+    status: None,
+    propstat: [
+        Normal(
+            PropstatElement {
+                prop: PropTagWrapper(
+                    [
+                        Principal(
+                            CalendarUserType(
+                                Individual,
+                            ),
+                        ),
+                        Principal(
+                            CalendarUserAddressSet(
+                                HrefElement {
+                                    href: "/caldav/principal/user/",
+                                },
+                            ),
+                        ),
+                        Principal(
+                            PrincipalUrl(
+                                HrefElement {
+                                    href: "/caldav/principal/user/",
+                                },
+                            ),
+                        ),
+                        Principal(
+                            GroupMembership(
+                                GroupMembership(
+                                    [
+                                        HrefElement {
+                                            href: "/caldav/principal/group/",
+                                        },
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Principal(
+                            GroupMemberSet(
+                                GroupMemberSet(
+                                    [],
+                                ),
+                            ),
+                        ),
+                        Principal(
+                            AlternateUriSet,
+                        ),
+                        Principal(
+                            SupportedReportSet(
+                                SupportedReportSet {
+                                    supported_report: [
+                                        ReportWrapper {
+                                            report: PrincipalMatch,
+                                        },
+                                    ],
+                                },
+                            ),
+                        ),
+                        Principal(
+                            CalendarHomeSet(
+                                CalendarHomeSet(
+                                    [
+                                        HrefElement {
+                                            href: "/caldav/principal/group/",
+                                        },
+                                        HrefElement {
+                                            href: "/caldav/principal/user/",
+                                        },
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Common(
+                            Resourcetype(
+                                Resourcetype(
+                                    [
+                                        ResourcetypeInner(
+                                            Some(
+                                                Namespace("DAV:"),
+                                            ),
+                                            "collection",
+                                        ),
+                                        ResourcetypeInner(
+                                            Some(
+                                                Namespace("DAV:"),
+                                            ),
+                                            "principal",
+                                        ),
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Common(
+                            Displayname(
+                                Some(
+                                    "user",
+                                ),
+                            ),
+                        ),
+                        Common(
+                            CurrentUserPrincipal(
+                                HrefElement {
+                                    href: "/caldav/principal/user/",
+                                },
+                            ),
+                        ),
+                        Common(
+                            CurrentUserPrivilegeSet(
+                                UserPrivilegeSet {
+                                    privileges: {
+                                        All,
+                                    },
+                                },
+                            ),
+                        ),
+                        Common(
+                            Owner(
+                                Some(
+                                    HrefElement {
+                                        href: "/caldav/principal/user/",
+                                    },
+                                ),
+                            ),
+                        ),
+                    ],
+                ),
+                status: 200,
+            },
+        ),
+    ],
+}

crates/caldav/src/principal/snapshots/rustical_caldav__principal__tests__propfind-3.snap

@@ -0,0 +1,53 @@
+---
+source: crates/caldav/src/principal/tests.rs
+expression: response.serialize_to_string().unwrap()
+---
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns="DAV:">
+    <href>/caldav/principal/user/</href>
+    <propstat>
+        <prop xmlns="DAV:">
+            <calendar-user-type xmlns="urn:ietf:params:xml:ns:caldav">INDIVIDUAL</calendar-user-type>
+            <calendar-user-address-set xmlns="urn:ietf:params:xml:ns:caldav">
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </calendar-user-address-set>
+            <principal-URL xmlns="DAV:">
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </principal-URL>
+            <group-membership xmlns="DAV:">
+                <href xmlns="DAV:">/caldav/principal/group/</href>
+            </group-membership>
+            <group-member-set xmlns="DAV:">
+            </group-member-set>
+            <alternate-URI-set xmlns="DAV:"/>
+            <supported-report-set xmlns="DAV:">
+                <supported-report xmlns="DAV:">
+                    <report xmlns="DAV:">
+                        <principal-match xmlns="DAV:"/>
+                    </report>
+                </supported-report>
+            </supported-report-set>
+            <calendar-home-set xmlns="urn:ietf:params:xml:ns:caldav">
+                <href xmlns="DAV:">/caldav/principal/group/</href>
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </calendar-home-set>
+            <resourcetype xmlns="DAV:">
+                <collection xmlns="DAV:"/>
+                <principal xmlns="DAV:"/>
+            </resourcetype>
+            <displayname xmlns="DAV:">user</displayname>
+            <current-user-principal xmlns="DAV:">
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set xmlns="DAV:">
+                <privilege>
+                    <all/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner xmlns="DAV:">
+                <href xmlns="DAV:">/caldav/principal/user/</href>
+            </owner>
+        </prop>
+        <status xmlns="DAV:">HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

crates/caldav/src/principal/snapshots/rustical_caldav__principal__tests__propfind.snap

@@ -0,0 +1,8 @@
+---
+source: crates/caldav/src/principal/tests.rs
+expression: propfind
+---
+PropfindElement {
+    prop: Allprop,
+    include: None,
+}

crates/caldav/src/principal/tests.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::{
     CalDavPrincipalUri,
     principal::{PrincipalResource, PrincipalResourceService},
@@ -7,31 +5,27 @@ use crate::{
 use rstest::rstest;
 use rustical_dav::resource::{Resource, ResourceService};
 use rustical_store::auth::{Principal, PrincipalType::Individual};
-use rustical_store_sqlite::{
+use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
-    SqliteStore,
-    calendar_store::SqliteCalendarStore,
-    principal_store::SqlitePrincipalStore,
-    tests::{get_test_calendar_store, get_test_principal_store, get_test_subscription_store},
-};
 use rustical_xml::XmlSerializeRoot;
+use std::sync::Arc;
 
 #[rstest]
 #[tokio::test]
 async fn test_principal_resource(
-    #[from(get_test_calendar_store)]
     #[future]
-    cal_store: SqliteCalendarStore,
+    #[from(test_store_context)]
-    #[from(get_test_principal_store)]
+    context: TestStoreContext,
-    #[future]
-    auth_provider: SqlitePrincipalStore,
-    #[from(get_test_subscription_store)]
-    #[future]
-    sub_store: SqliteStore,
 ) {
+    let TestStoreContext {
+        cal_store,
+        sub_store,
+        principal_store: auth_provider,
+        ..
+    } = context.await;
     let service = PrincipalResourceService {
-        cal_store: Arc::new(cal_store.await),
+        cal_store: Arc::new(cal_store),
-        sub_store: Arc::new(sub_store.await),
+        sub_store: Arc::new(sub_store),
-        auth_provider: Arc::new(auth_provider.await),
+        auth_provider: Arc::new(auth_provider),
         simplified_home_set: false,
     };
 
@@ -64,6 +58,8 @@ async fn test_propfind() {
     )
     .unwrap();
 
+    insta::assert_debug_snapshot!(propfind);
+
     let principal = Principal {
         id: "user".to_string(),
         displayname: None,
@@ -88,5 +84,6 @@ async fn test_propfind() {
         )
         .unwrap();
 
-    let _output = response.serialize_to_string().unwrap();
+    insta::assert_debug_snapshot!(response);
+    insta::assert_snapshot!(response.serialize_to_string().unwrap());
 }

crates/carddav/Cargo.toml

@@ -22,7 +22,7 @@ base64.workspace = true
 serde.workspace = true
 tokio.workspace = true
 url.workspace = true
-rustical_dav.workspace = true
+rustical_dav = { workspace = true, features = ["ical"] }
 rustical_store.workspace = true
 chrono.workspace = true
 rustical_xml.workspace = true
@@ -35,3 +35,7 @@ percent-encoding.workspace = true
 ical.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
+rstest.workspace = true
+
+[dev-dependencies]
+insta.workspace = true

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::HeaderValue;
 use http::Method;
 use http::{HeaderMap, StatusCode};
 use rustical_dav::privileges::UserPrivilege;
@@ -50,7 +51,7 @@ pub async fn get_object<AS: AddressbookStore>(
     let mut resp = Response::builder().status(StatusCode::OK);
     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());
+    hdrs.typed_insert(ContentType::from_str("text/vcard; charset=utf-8").unwrap());
     if matches!(method, Method::HEAD) {
         Ok(resp.body(Body::empty()).unwrap())
     } else {
@@ -81,15 +82,40 @@ pub async fn put_object<AS: AddressbookStore>(
     }
 
     let overwrite = if let Some(TypedHeader(if_none_match)) = if_none_match {
-        if_none_match == IfNoneMatch::any()
+        // TODO: Put into transaction?
+        let existing = match addr_store
+            .get_object(&principal, &addressbook_id, &object_id, false)
+            .await
+        {
+            Ok(existing) => Some(existing),
+            Err(rustical_store::Error::NotFound) => None,
+            Err(err) => Err(err)?,
+        };
+        existing.is_none_or(|existing| {
+            if_none_match.precondition_passes(
+                &existing
+                    .get_etag()
+                    .parse()
+                    .expect("We only generate valid ETags"),
+            )
+        })
     } else {
         true
     };
 
-    let object = AddressObject::from_vcf(object_id, body)?;
+    let object = match AddressObject::from_vcf(body) {
+        Ok(object) => object,
+        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
+    };
+    let etag = object.get_etag();
     addr_store
-        .put_object(principal, addressbook_id, object, overwrite)
+        .put_object(&principal, &addressbook_id, &object_id, object, overwrite)
         .await?;
 
-    Ok(StatusCode::CREATED.into_response())
+    let mut headers = HeaderMap::new();
+    headers.insert(
+        "ETag",
+        HeaderValue::from_str(&etag).expect("Contains no invalid characters"),
+    );
+    Ok((StatusCode::CREATED, headers).into_response())
 }

crates/carddav/src/address_object/resource.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use crate::{
     Error,
     address_object::{
@@ -6,6 +8,7 @@ use crate::{
     },
 };
 use derive_more::derive::{From, Into};
+use ical::parser::VcardFNProperty;
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
     privileges::UserPrivilegeSet,
@@ -19,11 +22,12 @@ use rustical_store::auth::Principal;
 pub struct AddressObjectResource {
     pub object: AddressObject,
     pub principal: String,
+    pub object_id: String,
 }
 
 impl ResourceName for AddressObjectResource {
-    fn get_name(&self) -> String {
+    fn get_name(&self) -> Cow<'_, str> {
-        format!("{}.vcf", self.object.get_id())
+        Cow::from(format!("{}.vcf", self.object_id))
     }
 }
 
@@ -67,7 +71,11 @@ impl Resource for AddressObjectResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.object.get_full_name()
+        self.object
+            .get_vcard()
+            .full_name
+            .first()
+            .map(|VcardFNProperty(name, _)| name.as_str())
     }
 
     fn get_owner(&self) -> Option<&str> {

crates/carddav/src/address_object/service.rs

@@ -57,6 +57,7 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
             .await?;
         Ok(AddressObjectResource {
             object,
+            object_id: object_id.to_owned(),
             principal: principal.to_owned(),
         })
     }

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

@@ -9,7 +9,6 @@ use http::{HeaderValue, Method, StatusCode, header};
 use percent_encoding::{CONTROLS, utf8_percent_encode};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
-use rustical_ical::AddressObject;
 use rustical_store::auth::Principal;
 use rustical_store::{AddressbookStore, SubscriptionStore};
 use std::str::FromStr;
@@ -40,13 +39,13 @@ pub async fn route_get<AS: AddressbookStore, S: SubscriptionStore>(
     let objects = addr_store.get_objects(&principal, &addressbook_id).await?;
     let vcf = objects
         .iter()
-        .map(AddressObject::get_vcf)
+        .map(|(_id, obj)| obj.get_vcf())
         .collect::<Vec<_>>()
         .join("\r\n");
 
     let mut resp = Response::builder().status(StatusCode::OK);
     let hdrs = resp.headers_mut().unwrap();
-    hdrs.typed_insert(ContentType::from_str("text/vcard").unwrap());
+    hdrs.typed_insert(ContentType::from_str("text/vcard; charset=utf-8").unwrap());
     let filename = format!("{principal}_{addressbook_id}.vcf");
     let filename = utf8_percent_encode(&filename, CONTROLS);
     hdrs.insert(

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

@@ -1,5 +1,3 @@
-use std::io::BufReader;
-
 use crate::Error;
 use crate::addressbook::AddressbookResourceService;
 use axum::{
@@ -9,7 +7,7 @@ use axum::{
 use http::StatusCode;
 use ical::{
     parser::{Component, ComponentMut, vcard},
-    property::Property,
+    property::ContentLine,
 };
 use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
 use tracing::instrument;
@@ -25,7 +23,7 @@ pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
         return Err(Error::Unauthorized);
     }
 
-    let parser = vcard::VcardParser::new(BufReader::new(body.as_bytes()));
+    let parser = vcard::VcardParser::from_slice(body.as_bytes());
 
     let mut objects = vec![];
     for res in parser {
@@ -33,15 +31,16 @@ pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
         let uid = card.get_uid();
         if uid.is_none() {
             let mut card_mut = card.mutable();
-            card_mut.set_property(Property {
+            card_mut.add_content_line(ContentLine {
                 name: "UID".to_owned(),
                 value: Some(uuid::Uuid::new_v4().to_string()),
-                params: None,
+                params: vec![].into(),
             });
-            card = card_mut.verify().unwrap();
+            card = card_mut.build(None).unwrap();
         }
-
+        // TODO: Make nicer
-        objects.push(card.try_into().unwrap());
+        let uid = card.get_uid().unwrap();
+        objects.push((uid.to_owned(), card.into()));
     }
 
     if objects.is_empty() {

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

@@ -29,7 +29,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
     principal: &str,
     addressbook_id: &str,
     store: &AS,
-) -> Result<(Vec<AddressObject>, Vec<String>), Error> {
+) -> Result<(Vec<(String, AddressObject)>, Vec<String>), Error> {
     let mut result = vec![];
     let mut not_found = vec![];
 
@@ -43,7 +43,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
                     .get_object(principal, addressbook_id, object_id, false)
                     .await
                 {
-                    Ok(object) => result.push(object),
+                    Ok(object) => result.push((object_id.to_owned(), object)),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_string()),
                     Err(err) => return Err(err.into()),
                 }
@@ -74,11 +74,12 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
             .await?;
 
     let mut responses = Vec::new();
-    for object in objects {
+    for (object_id, object) in objects {
-        let path = format!("{}/{}.vcf", path, object.get_id());
+        let path = format!("{path}/{object_id}.vcf");
         responses.push(
             AddressObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, prop, None, puri, user)?,

crates/carddav/src/addressbook/methods/report/addressbook_query/elements.rs

@@ -0,0 +1,139 @@
+use crate::{
+    address_object::AddressObjectPropWrapperName,
+    addressbook::methods::report::addressbook_query::PropFilterElement,
+};
+use derive_more::{From, Into};
+use ical::property::ContentLine;
+use rustical_dav::xml::{PropfindType, TextMatchElement};
+use rustical_ical::{AddressObject, UtcDateTime};
+use rustical_xml::{ValueDeserialize, XmlDeserialize, XmlRootTag};
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+pub struct TimeRangeElement {
+    #[xml(ty = "attr")]
+    pub(crate) start: Option<UtcDateTime>,
+    #[xml(ty = "attr")]
+    pub(crate) end: Option<UtcDateTime>,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
+pub struct ParamFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) text_match: Option<TextMatchElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+impl ParamFilterElement {
+    #[must_use]
+    pub fn match_property(&self, prop: &ContentLine) -> bool {
+        let Some(param) = prop.params.get_param(&self.name) else {
+            return self.is_not_defined.is_some();
+        };
+        if self.is_not_defined.is_some() {
+            return false;
+        }
+
+        let Some(text_match) = self.text_match.as_ref() else {
+            return true;
+        };
+        text_match.match_text(param)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Default, From, Into)]
+pub struct Allof(pub bool);
+
+impl ValueDeserialize for Allof {
+    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlError> {
+        Ok(Self(match val {
+            "allof" => true,
+            "anyof" => false,
+            _ => {
+                return Err(rustical_xml::XmlError::InvalidVariant(format!(
+                    "Invalid test parameter: {val}"
+                )));
+            }
+        }))
+    }
+}
+
+//  <!ELEMENT filter (prop-filter*)>
+//  <!ATTLIST filter test (anyof | allof) "anyof">
+//  <!-- test value:
+//              anyof logical OR for prop-filter matches
+//              allof logical AND for prop-filter matches -->
+#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq, Eq)]
+#[xml(root = "filter", ns = "rustical_dav::namespace::NS_CARDDAV")]
+#[allow(dead_code)]
+pub struct FilterElement {
+    #[xml(ty = "attr", default = "Default::default")]
+    pub test: Allof,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
+    pub(crate) prop_filter: Vec<PropFilterElement>,
+}
+
+impl FilterElement {
+    #[must_use]
+    pub fn matches(&self, addr_object: &AddressObject) -> bool {
+        if self.prop_filter.is_empty() {
+            // Filter empty
+            return true;
+        }
+
+        let Allof(allof) = self.test;
+        let mut results = self
+            .prop_filter
+            .iter()
+            .map(|prop_filter| prop_filter.match_component(addr_object));
+        if allof {
+            results.all(|x| x)
+        } else {
+            results.any(|x| x)
+        }
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+//  <!ELEMENT addressbook-query ((DAV:allprop |
+//                                  DAV:propname |
+//                                  DAV:prop)?, filter, limit?)>
+pub struct AddressbookQueryRequest {
+    #[xml(ty = "untagged")]
+    pub prop: PropfindType<AddressObjectPropWrapperName>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) filter: FilterElement,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) limit: Option<LimitElement>,
+}
+
+// https://datatracker.ietf.org/doc/html/rfc5323#section-5.17
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+pub struct LimitElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    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, Eq)]
+pub struct NresultsElement(#[xml(ty = "text")] pub u64);

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

@@ -0,0 +1,22 @@
+use crate::Error;
+mod elements;
+mod prop_filter;
+pub use elements::*;
+#[allow(unused_imports)]
+pub use prop_filter::{PropFilterElement, PropFilterable};
+use rustical_ical::AddressObject;
+use rustical_store::AddressbookStore;
+
+#[cfg(test)]
+mod tests;
+
+pub async fn get_objects_addressbook_query<AS: AddressbookStore>(
+    addr_query: &AddressbookQueryRequest,
+    principal: &str,
+    addressbook_id: &str,
+    store: &AS,
+) -> Result<Vec<(String, AddressObject)>, Error> {
+    let mut objects = store.get_objects(principal, addressbook_id).await?;
+    objects.retain(|(_id, object)| addr_query.filter.matches(object));
+    Ok(objects)
+}

crates/carddav/src/addressbook/methods/report/addressbook_query/prop_filter.rs

@@ -0,0 +1,77 @@
+use super::{Allof, ParamFilterElement};
+use ical::{parser::Component, property::ContentLine};
+use rustical_dav::xml::TextMatchElement;
+use rustical_ical::AddressObject;
+use rustical_xml::XmlDeserialize;
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+//  <!ELEMENT prop-filter (is-not-defined |
+//                          (text-match*, param-filter*))>
+//
+//  <!ATTLIST prop-filter name CDATA #REQUIRED
+//                          test (anyof | allof) "anyof">
+//  <!-- name value: a vCard property name (e.g., "NICKNAME")
+//      test value:
+//          anyof logical OR for text-match/param-filter matches
+//          allof logical AND for text-match/param-filter matches -->
+pub struct PropFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
+    pub(crate) text_match: Vec<TextMatchElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
+    pub(crate) param_filter: Vec<ParamFilterElement>,
+    #[xml(ty = "attr", default = "Default::default")]
+    pub test: Allof,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+impl PropFilterElement {
+    #[must_use]
+    pub fn match_property(&self, property: &ContentLine) -> bool {
+        if self.param_filter.is_empty() && self.text_match.is_empty() {
+            // Filter empty
+            return true;
+        }
+        let Allof(allof) = self.test;
+        let text_matches = self
+            .text_match
+            .iter()
+            .map(|text_match| text_match.match_property(property));
+
+        let param_matches = self
+            .param_filter
+            .iter()
+            .map(|param_filter| param_filter.match_property(property));
+        let mut matches = text_matches.chain(param_matches);
+
+        if allof {
+            matches.all(|a| a)
+        } else {
+            matches.any(|a| a)
+        }
+    }
+
+    pub fn match_component(&self, comp: &impl PropFilterable) -> bool {
+        let mut properties = comp.get_named_properties(&self.name);
+        if self.is_not_defined.is_some() {
+            return properties.next().is_none();
+        }
+
+        // The filter matches when one property instance matches
+        properties.any(|prop| self.match_property(prop))
+    }
+}
+
+pub trait PropFilterable {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine>;
+}
+
+impl PropFilterable for AddressObject {
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
+        self.get_vcard().get_named_properties(name)
+    }
+}

crates/carddav/src/addressbook/methods/report/addressbook_query/tests.rs

@@ -0,0 +1,70 @@
+use super::FilterElement;
+use rstest::rstest;
+use rustical_ical::AddressObject;
+use rustical_xml::XmlDocument;
+
+const VCF_1: &str = r"BEGIN:VCARD
+VERSION:4.0
+FN:Simon Perreault
+N:Perreault;Simon;;;ing. jr,M.Sc.
+BDAY:--0203
+GENDER:M
+EMAIL;TYPE=work:simon.perreault@viagenie.ca
+END:VCARD";
+
+const VCF_2: &str = r"BEGIN:VCARD
+VERSION:4.0
+N:Gump;Forrest;;Mr.;
+FN:Forrest Gump
+ORG:Bubba Gump Shrimp Co.
+TITLE:Shrimp Man
+PHOTO;MEDIATYPE=image/gif:http://www.example.com/dir_photos/my_photo.gif
+TEL;TYPE=work,voice;VALUE=uri:tel:+1-111-555-1212
+TEL;TYPE=home,voice;VALUE=uri:tel:+1-404-555-1212
+ADR;TYPE=WORK;PREF=1;LABEL=100 Waters Edge\\nBaytown\\, LA 30314\\nUnited S
+ tates of America:;;100 Waters Edge;Baytown;LA;30314;United States of Ameri
+ ca
+ADR;TYPE=HOME;LABEL=42 Plantation St.\\nBaytown\\, LA 30314\\nUnited States
+  of America:;;42 Plantation St.;Baytown;LA;30314;United States of America
+EMAIL:forrestgump@example.com
+REV:20080424T195243Z
+x-qq:21588891
+UID:890a9da4-bb6d-4afb-9f32-b5eff6494a53
+END:VCARD
+";
+
+const FILTER_1: &str = r#"
+<?xml version="1.0" encoding="utf-8" ?>
+<C:filter xmlns:C="urn:ietf:params:xml:ns:carddav">
+    <C:prop-filter name="EMAIL" test="allof">
+        <C:text-match collation="i;ascii-casemap">simon.perreault@viagenie.ca</C:text-match>
+        <C:param-filter name="TYPE">
+            <C:text-match match-type="equals" collation="i;unicode-casemap">WORK</C:text-match>
+        </C:param-filter>
+    </C:prop-filter>
+</C:filter>
+"#;
+
+const FILTER_2: &str = r#"
+<?xml version="1.0" encoding="utf-8" ?>
+<C:filter xmlns:C="urn:ietf:params:xml:ns:carddav">
+    <C:prop-filter name="EMAIL" test="anyof">
+        <C:text-match collation="i;ascii-casemap">forrestgump@example.com</C:text-match>
+        <C:param-filter name="TYPE">
+            <C:text-match match-type="equals" collation="i;ascii-casemap">WORK</C:text-match>
+        </C:param-filter>
+    </C:prop-filter>
+</C:filter>
+"#;
+
+#[rstest]
+#[case(VCF_1, FILTER_1, true)]
+#[case(VCF_2, FILTER_1, false)]
+#[case(VCF_1, FILTER_2, true)]
+#[case(VCF_2, FILTER_2, true)]
+fn test_filter(#[case] vcf: &str, #[case] filter: &str, #[case] matches: bool) {
+    dbg!(vcf);
+    let obj = AddressObject::from_vcf(vcf.to_owned()).unwrap();
+    let filter = FilterElement::parse_str(filter).unwrap();
+    assert_eq!(matches, filter.matches(&obj));
+}

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

@@ -1,6 +1,14 @@
 use crate::{
-    CardDavPrincipalUri, Error, address_object::AddressObjectPropWrapperName,
+    CardDavPrincipalUri, Error,
-    addressbook::AddressbookResourceService,
+    address_object::{
+        AddressObjectPropWrapper, AddressObjectPropWrapperName, resource::AddressObjectResource,
+    },
+    addressbook::{
+        AddressbookResourceService,
+        methods::report::addressbook_query::{
+            AddressbookQueryRequest, get_objects_addressbook_query,
+        },
+    },
 };
 use addressbook_multiget::{AddressbookMultigetRequest, handle_addressbook_multiget};
 use axum::{
@@ -8,19 +16,30 @@ use axum::{
     extract::{OriginalUri, Path, State},
     response::IntoResponse,
 };
-use rustical_dav::xml::{PropfindType, sync_collection::SyncCollectionRequest};
+use http::StatusCode;
+use rustical_dav::{
+    resource::{PrincipalUri, Resource},
+    xml::{
+        MultistatusElement, PropfindType, multistatus::ResponseElement,
+        sync_collection::SyncCollectionRequest,
+    },
+};
+use rustical_ical::AddressObject;
 use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
 use rustical_xml::{XmlDeserialize, XmlDocument};
 use sync_collection::handle_sync_collection;
 use tracing::instrument;
 
 mod addressbook_multiget;
+mod addressbook_query;
 mod sync_collection;
 
 #[derive(XmlDeserialize, XmlDocument, Clone, Debug, PartialEq)]
 pub(crate) enum ReportRequest {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     AddressbookMultiget(AddressbookMultigetRequest),
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
+    AddressbookQuery(AddressbookQueryRequest),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     SyncCollection(SyncCollectionRequest<AddressObjectPropWrapperName>),
 }
@@ -29,11 +48,50 @@ impl ReportRequest {
     const fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
         match self {
             Self::AddressbookMultiget(AddressbookMultigetRequest { prop, .. })
-            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            | Self::SyncCollection(SyncCollectionRequest { prop, .. })
+            | Self::AddressbookQuery(AddressbookQueryRequest { prop, .. }) => prop,
         }
     }
 }
 
+fn objects_response(
+    objects: Vec<(String, AddressObject)>,
+    not_found: Vec<String>,
+    path: &str,
+    principal: &str,
+    puri: &impl PrincipalUri,
+    user: &Principal,
+    prop: &PropfindType<AddressObjectPropWrapperName>,
+) -> Result<MultistatusElement<AddressObjectPropWrapper, String>, Error> {
+    let mut responses = Vec::new();
+    for (object_id, object) in objects {
+        let path = format!("{}/{}.vcf", path, &object_id);
+        responses.push(
+            AddressObjectResource {
+                object,
+                object_id,
+                principal: principal.to_owned(),
+            }
+            .propfind(&path, prop, None, puri, user)?,
+        );
+    }
+
+    let not_found_responses = not_found
+        .into_iter()
+        .map(|path| ResponseElement {
+            href: path,
+            status: Some(StatusCode::NOT_FOUND),
+            ..Default::default()
+        })
+        .collect();
+
+    Ok(MultistatusElement {
+        responses,
+        member_responses: not_found_responses,
+        ..Default::default()
+    })
+}
+
 #[instrument(skip(addr_store))]
 pub async fn route_report_addressbook<AS: AddressbookStore, S: SubscriptionStore>(
     Path((principal, addressbook_id)): Path<(String, String)>,
@@ -75,13 +133,36 @@ pub async fn route_report_addressbook<AS: AddressbookStore, S: SubscriptionStore
             )
             .await?
         }
+        ReportRequest::AddressbookQuery(addr_query) => {
+            let objects = get_objects_addressbook_query(
+                addr_query,
+                &principal,
+                &addressbook_id,
+                addr_store.as_ref(),
+            )
+            .await?;
+            objects_response(
+                objects,
+                vec![],
+                uri.path(),
+                &principal,
+                &puri,
+                &user,
+                &addr_query.prop,
+            )?
+        }
     })
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::address_object::AddressObjectPropName;
+    use crate::{
+        address_object::AddressObjectPropName,
+        addressbook::methods::report::addressbook_query::{
+            Allof, FilterElement, LimitElement, NresultsElement, PropFilterElement,
+        },
+    };
     use rustical_dav::xml::{PropElement, sync_collection::SyncLevel};
 
     #[test]
@@ -144,4 +225,50 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn test_xml_addressbook_query() {
+        let report_request = ReportRequest::parse_str(
+            r#"
+            <?xml version="1.0" encoding="utf-8"?>
+                <card:addressbook-query xmlns:card="urn:ietf:params:xml:ns:carddav" xmlns:d="DAV:">
+                <d:prop>
+                    <d:getetag/>
+                </d:prop>
+                <card:filter>
+                    <card:prop-filter name="FN"/>
+                </card:filter>
+                <card:limit>
+                    <card:nresults>100</card:nresults>
+                </card:limit>
+            </card:addressbook-query>
+        "#,
+        )
+        .unwrap();
+
+        assert_eq!(
+            report_request,
+            ReportRequest::AddressbookQuery(AddressbookQueryRequest {
+                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
+                    vec![AddressObjectPropWrapperName::AddressObject(
+                        AddressObjectPropName::Getetag
+                    ),],
+                    vec![]
+                )),
+                filter: FilterElement {
+                    test: Allof::default(),
+                    prop_filter: vec![PropFilterElement {
+                        name: "FN".to_owned(),
+                        is_not_defined: None,
+                        text_match: vec![],
+                        param_filter: vec![],
+                        test: Allof::default()
+                    }],
+                },
+                limit: Some(LimitElement {
+                    nresults: NresultsElement(100)
+                })
+            })
+        );
+    }
 }

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

@@ -32,11 +32,12 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
         .await?;
 
     let mut responses = Vec::new();
-    for object in new_objects {
+    for (object_id, object) in new_objects {
-        let path = format!("{}/{}.vcf", path.trim_end_matches('/'), object.get_id());
+        let path = format!("{}/{}.vcf", path.trim_end_matches('/'), object_id);
         responses.push(
             AddressObjectResource {
                 object,
+                object_id,
                 principal: principal.to_owned(),
             }
             .propfind(&path, &sync_collection.prop, None, puri, user)?,

crates/carddav/src/addressbook/mod.rs

@@ -3,3 +3,5 @@ pub mod prop;
 pub mod resource;
 mod service;
 pub use service::*;
+#[cfg(test)]
+pub mod tests;

crates/carddav/src/addressbook/prop.rs

@@ -1,12 +1,13 @@
+use derive_more::{From, Into};
 use rustical_dav::{
     extensions::{CommonPropertiesProp, SyncTokenExtensionProp},
-    xml::SupportedReportSet,
+    xml::{SupportedReportSet, TextCollation},
 };
 use rustical_dav_push::DavPushExtensionProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName, Debug)]
 #[xml(unit_variants_ident = "AddressbookPropName")]
 pub enum AddressbookProp {
     // CardDAV (RFC 6352)
@@ -14,13 +15,15 @@ pub enum AddressbookProp {
     AddressbookDescription(Option<String>),
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", skip_deserializing)]
     SupportedAddressData(SupportedAddressData),
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", skip_deserializing)]
+    SupportedCollationSet(SupportedCollationSet),
     #[xml(ns = "rustical_dav::namespace::NS_DAV", skip_deserializing)]
     SupportedReportSet(SupportedReportSet<ReportMethod>),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
+    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     MaxResourceSize(i64),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName, Debug)]
 #[xml(unit_variants_ident = "AddressbookPropWrapperName", untagged)]
 pub enum AddressbookPropWrapper {
     Addressbook(AddressbookProp),
@@ -60,6 +63,29 @@ impl Default for SupportedAddressData {
     }
 }
 
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
+pub struct SupportedCollation(#[xml(ty = "text")] pub TextCollation);
+
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq)]
+pub struct SupportedCollationSet(
+    #[xml(
+        ns = "rustical_dav::namespace::NS_CARDDAV",
+        flatten,
+        rename = "supported-collation"
+    )]
+    pub Vec<SupportedCollation>,
+);
+
+impl Default for SupportedCollationSet {
+    fn default() -> Self {
+        Self(vec![
+            SupportedCollation(TextCollation::AsciiCasemap),
+            SupportedCollation(TextCollation::UnicodeCasemap),
+            SupportedCollation(TextCollation::Octet),
+        ])
+    }
+}
+
 #[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
 pub enum ReportMethod {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]

crates/carddav/src/addressbook/resource.rs

@@ -2,6 +2,7 @@ use super::prop::SupportedAddressData;
 use crate::Error;
 use crate::addressbook::prop::{
     AddressbookProp, AddressbookPropName, AddressbookPropWrapper, AddressbookPropWrapperName,
+    SupportedCollationSet,
 };
 use derive_more::derive::{From, Into};
 use rustical_dav::extensions::{CommonPropertiesExtension, SyncTokenExtension};
@@ -11,13 +12,14 @@ use rustical_dav::xml::{Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::DavPushExtension;
 use rustical_store::Addressbook;
 use rustical_store::auth::Principal;
+use std::borrow::Cow;
 
 #[derive(Clone, Debug, From, Into)]
 pub struct AddressbookResource(pub(crate) Addressbook);
 
 impl ResourceName for AddressbookResource {
-    fn get_name(&self) -> String {
+    fn get_name(&self) -> Cow<'_, str> {
-        self.0.id.clone()
+        Cow::from(&self.0.id)
     }
 }
 
@@ -61,6 +63,9 @@ impl Resource for AddressbookResource {
                     AddressbookPropName::MaxResourceSize => {
                         AddressbookProp::MaxResourceSize(10_000_000)
                     }
+                    AddressbookPropName::SupportedCollationSet => {
+                        AddressbookProp::SupportedCollationSet(SupportedCollationSet::default())
+                    }
                     AddressbookPropName::SupportedReportSet => {
                         AddressbookProp::SupportedReportSet(SupportedReportSet::all())
                     }
@@ -93,6 +98,7 @@ impl Resource for AddressbookResource {
                     Ok(())
                 }
                 AddressbookProp::MaxResourceSize(_)
+                | AddressbookProp::SupportedCollationSet(_)
                 | AddressbookProp::SupportedReportSet(_)
                 | AddressbookProp::SupportedAddressData(_) => {
                     Err(rustical_dav::Error::PropReadOnly)
@@ -115,6 +121,7 @@ impl Resource for AddressbookResource {
                     Ok(())
                 }
                 AddressbookPropName::MaxResourceSize
+                | AddressbookPropName::SupportedCollationSet
                 | AddressbookPropName::SupportedReportSet
                 | AddressbookPropName::SupportedAddressData => {
                     Err(rustical_dav::Error::PropReadOnly)

crates/carddav/src/addressbook/service.rs

@@ -78,7 +78,8 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
             .get_objects(principal, addressbook_id)
             .await?
             .into_iter()
-            .map(|object| AddressObjectResource {
+            .map(|(object_id, object)| AddressObjectResource {
+                object_id,
                 object,
                 principal: principal.to_owned(),
             })
@@ -91,7 +92,7 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
         file: Self::Resource,
     ) -> Result<(), Self::Error> {
         self.addr_store
-            .update_addressbook(principal.to_owned(), addressbook_id.to_owned(), file.into())
+            .update_addressbook(principal, addressbook_id, file.into())
             .await?;
         Ok(())
     }

crates/carddav/src/addressbook/snapshots/rustical_carddav__addressbook__tests__propfind-2.snap

@@ -0,0 +1,168 @@
+---
+source: crates/carddav/src/addressbook/tests.rs
+expression: response
+---
+ResponseElement {
+    href: "/carddav/principal/user/yeet/",
+    status: None,
+    propstat: [
+        Normal(
+            PropstatElement {
+                prop: PropTagWrapper(
+                    [
+                        Addressbook(
+                            AddressbookDescription(
+                                None,
+                            ),
+                        ),
+                        Addressbook(
+                            SupportedAddressData(
+                                SupportedAddressData {
+                                    address_data_type: [
+                                        AddressDataType {
+                                            content_type: "text/vcard",
+                                            version: "3.0",
+                                        },
+                                        AddressDataType {
+                                            content_type: "text/vcard",
+                                            version: "4.0",
+                                        },
+                                    ],
+                                },
+                            ),
+                        ),
+                        Addressbook(
+                            SupportedCollationSet(
+                                SupportedCollationSet(
+                                    [
+                                        SupportedCollation(
+                                            AsciiCasemap,
+                                        ),
+                                        SupportedCollation(
+                                            UnicodeCasemap,
+                                        ),
+                                        SupportedCollation(
+                                            Octet,
+                                        ),
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Addressbook(
+                            SupportedReportSet(
+                                SupportedReportSet {
+                                    supported_report: [
+                                        ReportWrapper {
+                                            report: AddressbookMultiget,
+                                        },
+                                        ReportWrapper {
+                                            report: SyncCollection,
+                                        },
+                                    ],
+                                },
+                            ),
+                        ),
+                        Addressbook(
+                            MaxResourceSize(
+                                10000000,
+                            ),
+                        ),
+                        SyncToken(
+                            SyncToken(
+                                "github.com/lennart-k/rustical/ns/0",
+                            ),
+                        ),
+                        SyncToken(
+                            Getctag(
+                                "github.com/lennart-k/rustical/ns/0",
+                            ),
+                        ),
+                        DavPush(
+                            Transports(
+                                Transports {
+                                    transports: [
+                                        WebPush,
+                                    ],
+                                },
+                            ),
+                        ),
+                        DavPush(
+                            Topic(
+                                "asdasd",
+                            ),
+                        ),
+                        DavPush(
+                            SupportedTriggers(
+                                SupportedTriggers(
+                                    [
+                                        ContentUpdate(
+                                            ContentUpdate(
+                                                One,
+                                            ),
+                                        ),
+                                        PropertyUpdate(
+                                            PropertyUpdate(
+                                                One,
+                                            ),
+                                        ),
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Common(
+                            Resourcetype(
+                                Resourcetype(
+                                    [
+                                        ResourcetypeInner(
+                                            Some(
+                                                Namespace("DAV:"),
+                                            ),
+                                            "collection",
+                                        ),
+                                        ResourcetypeInner(
+                                            Some(
+                                                Namespace("urn:ietf:params:xml:ns:carddav"),
+                                            ),
+                                            "addressbook",
+                                        ),
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Common(
+                            Displayname(
+                                None,
+                            ),
+                        ),
+                        Common(
+                            CurrentUserPrincipal(
+                                HrefElement {
+                                    href: "/carddav/principal/user/",
+                                },
+                            ),
+                        ),
+                        Common(
+                            CurrentUserPrivilegeSet(
+                                UserPrivilegeSet {
+                                    privileges: {
+                                        All,
+                                    },
+                                },
+                            ),
+                        ),
+                        Common(
+                            Owner(
+                                Some(
+                                    HrefElement {
+                                        href: "/carddav/principal/user/",
+                                    },
+                                ),
+                            ),
+                        ),
+                    ],
+                ),
+                status: 200,
+            },
+        ),
+    ],
+}

crates/carddav/src/addressbook/snapshots/rustical_carddav__addressbook__tests__propfind-3.snap

@@ -0,0 +1,64 @@
+---
+source: crates/carddav/src/addressbook/tests.rs
+expression: response.serialize_to_string().unwrap()
+---
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns="DAV:">
+    <href>/carddav/principal/user/yeet/</href>
+    <propstat>
+        <prop xmlns="DAV:">
+            <supported-address-data xmlns="urn:ietf:params:xml:ns:carddav">
+                <address-data-type xmlns="urn:ietf:params:xml:ns:carddav" content-type="text/vcard" version="3.0"/>
+                <address-data-type xmlns="urn:ietf:params:xml:ns:carddav" content-type="text/vcard" version="4.0"/>
+            </supported-address-data>
+            <supported-collation-set xmlns="urn:ietf:params:xml:ns:carddav">
+                <supported-collation xmlns="urn:ietf:params:xml:ns:carddav">i;ascii-casemap</supported-collation>
+                <supported-collation xmlns="urn:ietf:params:xml:ns:carddav">i;unicode-casemap</supported-collation>
+                <supported-collation xmlns="urn:ietf:params:xml:ns:carddav">i;octet</supported-collation>
+            </supported-collation-set>
+            <supported-report-set xmlns="DAV:">
+                <supported-report xmlns="DAV:">
+                    <report xmlns="DAV:">
+                        <addressbook-multiget xmlns="urn:ietf:params:xml:ns:carddav"/>
+                    </report>
+                </supported-report>
+                <supported-report xmlns="DAV:">
+                    <report xmlns="DAV:">
+                        <sync-collection xmlns="DAV:"/>
+                    </report>
+                </supported-report>
+            </supported-report-set>
+            <max-resource-size xmlns="urn:ietf:params:xml:ns:carddav">10000000</max-resource-size>
+            <sync-token xmlns="DAV:">github.com/lennart-k/rustical/ns/0</sync-token>
+            <getctag xmlns="http://calendarserver.org/ns/">github.com/lennart-k/rustical/ns/0</getctag>
+            <transports xmlns="https://bitfire.at/webdav-push">
+                <web-push xmlns="https://bitfire.at/webdav-push"/>
+            </transports>
+            <topic xmlns="https://bitfire.at/webdav-push">asdasd</topic>
+            <supported-triggers xmlns="https://bitfire.at/webdav-push">
+                <content-update xmlns="https://bitfire.at/webdav-push">
+                    <depth xmlns="DAV:">1</depth>
+                </content-update>
+                <property-update xmlns="https://bitfire.at/webdav-push">
+                    <depth xmlns="DAV:">1</depth>
+                </property-update>
+            </supported-triggers>
+            <resourcetype xmlns="DAV:">
+                <collection xmlns="DAV:"/>
+                <addressbook xmlns="urn:ietf:params:xml:ns:carddav"/>
+            </resourcetype>
+            <current-user-principal xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set xmlns="DAV:">
+                <privilege>
+                    <all/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/user/</href>
+            </owner>
+        </prop>
+        <status xmlns="DAV:">HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

crates/carddav/src/addressbook/snapshots/rustical_carddav__addressbook__tests__propfind.snap

@@ -0,0 +1,8 @@
+---
+source: crates/carddav/src/addressbook/tests.rs
+expression: propfind
+---
+PropfindElement {
+    prop: Allprop,
+    include: None,
+}

crates/carddav/src/addressbook/tests.rs

@@ -0,0 +1,49 @@
+use crate::{CardDavPrincipalUri, addressbook::resource::AddressbookResource};
+use rustical_dav::resource::Resource;
+use rustical_store::{Addressbook, auth::Principal};
+use rustical_xml::XmlSerializeRoot;
+
+#[test]
+fn test_propfind() {
+    let propfind = AddressbookResource::parse_propfind(
+        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+    )
+    .unwrap();
+
+    insta::assert_debug_snapshot!(propfind);
+
+    let principal = Principal {
+        id: "user".to_string(),
+        displayname: None,
+        principal_type: rustical_store::auth::PrincipalType::Individual,
+        password: None,
+        memberships: vec!["group".to_string()],
+    };
+
+    let addressbook = Addressbook {
+        id: "yeet".to_string(),
+        principal: "user".to_string(),
+        displayname: None,
+        description: None,
+        deleted_at: None,
+        synctoken: 0,
+        push_topic: "asdasd".to_string(),
+    };
+
+    let resource = AddressbookResource(addressbook.clone());
+    let response = resource
+        .propfind(
+            &format!(
+                "/carddav/principal/{}/{}",
+                addressbook.principal, addressbook.id
+            ),
+            &propfind.prop,
+            propfind.include.as_ref(),
+            &CardDavPrincipalUri("/carddav"),
+            &principal,
+        )
+        .unwrap();
+
+    insta::assert_debug_snapshot!(response);
+    insta::assert_snapshot!(response.serialize_to_string().unwrap());
+}

crates/carddav/src/error.rs

@@ -1,6 +1,5 @@
 use axum::response::IntoResponse;
 use http::StatusCode;
-use tracing::error;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -24,9 +23,6 @@ pub enum Error {
 
     #[error(transparent)]
     XmlDecodeError(#[from] rustical_xml::XmlError),
-
-    #[error(transparent)]
-    IcalError(#[from] rustical_ical::Error),
 }
 
 impl Error {
@@ -44,7 +40,6 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
-            Self::IcalError(err) => err.status_code(),
         }
     }
 }

crates/carddav/src/principal/mod.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use crate::Error;
 use rustical_dav::extensions::CommonPropertiesExtension;
 use rustical_dav::privileges::UserPrivilegeSet;
@@ -11,16 +13,18 @@ mod service;
 pub use service::*;
 mod prop;
 pub use prop::*;
+#[cfg(test)]
+pub mod tests;
 
 #[derive(Debug, Clone)]
 pub struct PrincipalResource {
-    principal: Principal,
+    pub principal: Principal,
-    members: Vec<String>,
+    pub members: Vec<String>,
 }
 
 impl ResourceName for PrincipalResource {
-    fn get_name(&self) -> String {
+    fn get_name(&self) -> Cow<'_, str> {
-        self.principal.id.clone()
+        Cow::from(&self.principal.id)
     }
 }
 

crates/carddav/src/principal/prop.rs

@@ -4,7 +4,7 @@ use rustical_dav::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName, Debug)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
@@ -27,10 +27,10 @@ pub enum PrincipalProp {
     PrincipalAddress(Option<HrefElement>),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, Debug)]
 pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName, Debug)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
     Principal(PrincipalProp),

crates/carddav/src/principal/snapshots/rustical_carddav__principal__tests__propfind-2.snap

@@ -0,0 +1,125 @@
+---
+source: crates/carddav/src/principal/tests.rs
+expression: response
+---
+ResponseElement {
+    href: "/carddav/principal/user/",
+    status: None,
+    propstat: [
+        Normal(
+            PropstatElement {
+                prop: PropTagWrapper(
+                    [
+                        Principal(
+                            PrincipalUrl(
+                                HrefElement {
+                                    href: "/carddav/principal/user/",
+                                },
+                            ),
+                        ),
+                        Principal(
+                            GroupMembership(
+                                GroupMembership(
+                                    [
+                                        HrefElement {
+                                            href: "/carddav/principal/group/",
+                                        },
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Principal(
+                            GroupMemberSet(
+                                GroupMemberSet(
+                                    [],
+                                ),
+                            ),
+                        ),
+                        Principal(
+                            AlternateUriSet,
+                        ),
+                        Principal(
+                            PrincipalCollectionSet(
+                                HrefElement {
+                                    href: "/carddav/principal/",
+                                },
+                            ),
+                        ),
+                        Principal(
+                            AddressbookHomeSet(
+                                AddressbookHomeSet(
+                                    [
+                                        HrefElement {
+                                            href: "/carddav/principal/group/",
+                                        },
+                                        HrefElement {
+                                            href: "/carddav/principal/user/",
+                                        },
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Principal(
+                            PrincipalAddress(
+                                None,
+                            ),
+                        ),
+                        Common(
+                            Resourcetype(
+                                Resourcetype(
+                                    [
+                                        ResourcetypeInner(
+                                            Some(
+                                                Namespace("DAV:"),
+                                            ),
+                                            "collection",
+                                        ),
+                                        ResourcetypeInner(
+                                            Some(
+                                                Namespace("DAV:"),
+                                            ),
+                                            "principal",
+                                        ),
+                                    ],
+                                ),
+                            ),
+                        ),
+                        Common(
+                            Displayname(
+                                Some(
+                                    "user",
+                                ),
+                            ),
+                        ),
+                        Common(
+                            CurrentUserPrincipal(
+                                HrefElement {
+                                    href: "/carddav/principal/user/",
+                                },
+                            ),
+                        ),
+                        Common(
+                            CurrentUserPrivilegeSet(
+                                UserPrivilegeSet {
+                                    privileges: {
+                                        All,
+                                    },
+                                },
+                            ),
+                        ),
+                        Common(
+                            Owner(
+                                Some(
+                                    HrefElement {
+                                        href: "/carddav/principal/user/",
+                                    },
+                                ),
+                            ),
+                        ),
+                    ],
+                ),
+                status: 200,
+            },
+        ),
+    ],
+}

crates/carddav/src/principal/snapshots/rustical_carddav__principal__tests__propfind-3.snap

@@ -0,0 +1,45 @@
+---
+source: crates/carddav/src/principal/tests.rs
+expression: response.serialize_to_string().unwrap()
+---
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns="DAV:">
+    <href>/carddav/principal/user/</href>
+    <propstat>
+        <prop xmlns="DAV:">
+            <principal-URL xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/user/</href>
+            </principal-URL>
+            <group-membership xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/group/</href>
+            </group-membership>
+            <group-member-set xmlns="DAV:">
+            </group-member-set>
+            <alternate-URI-set xmlns="DAV:"/>
+            <principal-collection-set xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/</href>
+            </principal-collection-set>
+            <addressbook-home-set xmlns="urn:ietf:params:xml:ns:carddav">
+                <href xmlns="DAV:">/carddav/principal/group/</href>
+                <href xmlns="DAV:">/carddav/principal/user/</href>
+            </addressbook-home-set>
+            <resourcetype xmlns="DAV:">
+                <collection xmlns="DAV:"/>
+                <principal xmlns="DAV:"/>
+            </resourcetype>
+            <displayname xmlns="DAV:">user</displayname>
+            <current-user-principal xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set xmlns="DAV:">
+                <privilege>
+                    <all/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner xmlns="DAV:">
+                <href xmlns="DAV:">/carddav/principal/user/</href>
+            </owner>
+        </prop>
+        <status xmlns="DAV:">HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

crates/carddav/src/principal/snapshots/rustical_carddav__principal__tests__propfind.snap

@@ -0,0 +1,8 @@
+---
+source: crates/carddav/src/principal/tests.rs
+expression: propfind
+---
+PropfindElement {
+    prop: Allprop,
+    include: None,
+}

crates/carddav/src/principal/tests.rs

@@ -0,0 +1,41 @@
+use rustical_dav::resource::Resource;
+use rustical_store::auth::Principal;
+use rustical_xml::XmlSerializeRoot;
+
+use crate::{CardDavPrincipalUri, principal::PrincipalResource};
+
+#[test]
+fn test_propfind() {
+    let propfind = PrincipalResource::parse_propfind(
+        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+    )
+    .unwrap();
+
+    insta::assert_debug_snapshot!(propfind);
+
+    let principal = Principal {
+        id: "user".to_string(),
+        displayname: None,
+        principal_type: rustical_store::auth::PrincipalType::Individual,
+        password: None,
+        memberships: vec!["group".to_string()],
+    };
+
+    let resource = PrincipalResource {
+        principal: principal.clone(),
+        members: vec![],
+    };
+
+    let response = resource
+        .propfind(
+            &format!("/carddav/principal/{}", principal.id),
+            &propfind.prop,
+            propfind.include.as_ref(),
+            &CardDavPrincipalUri("/carddav"),
+            &principal,
+        )
+        .unwrap();
+
+    insta::assert_debug_snapshot!(response);
+    insta::assert_snapshot!(response.serialize_to_string().unwrap());
+}

crates/dav/Cargo.toml

@@ -28,3 +28,7 @@ headers.workspace = true
 strum.workspace = true
 matchit.workspace = true
 matchit-serde.workspace = true
+ical = { workspace = true, optional = true }
+
+[features]
+ical = ["dep:ical"]

crates/dav/src/extensions/common.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Debug, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "CommonPropertiesPropName")]
 pub enum CommonPropertiesProp {
     // WebDAV (RFC 2518)

crates/dav/src/extensions/synctoken.rs

@@ -1,6 +1,6 @@
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants, Debug)]
 #[xml(unit_variants_ident = "SyncTokenExtensionPropName")]
 pub enum SyncTokenExtensionProp {
     // Collection Synchronization (RFC 6578)

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

@@ -6,12 +6,15 @@ use axum::{
     extract::{MatchedPath, Path, State},
     response::{IntoResponse, Response},
 };
+use axum_extra::TypedHeader;
+use headers::Host;
 use http::{HeaderMap, StatusCode, Uri};
 use matchit_serde::ParamsDeserializer;
 use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
+#[allow(clippy::too_many_arguments)]
 pub async fn axum_route_copy<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
@@ -20,6 +23,7 @@ pub async fn axum_route_copy<R: ResourceService>(
     Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
+    TypedHeader(host): TypedHeader<Host>,
 ) -> Result<Response, R::Error> {
     let destination = header_map
         .get("Destination")
@@ -27,7 +31,11 @@ pub async fn axum_route_copy<R: ResourceService>(
         .to_str()
         .map_err(|_| crate::Error::Forbidden)?;
     let destination_uri: Uri = destination.parse().map_err(|_| crate::Error::Forbidden)?;
-    // TODO: Check that host also matches
+    if let Some(authority) = destination_uri.authority()
+        && host != authority.clone().into()
+    {
+        return Err(crate::Error::Forbidden.into());
+    }
     let destination = destination_uri.path();
 
     let mut router = matchit::Router::new();

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

@@ -52,12 +52,11 @@ pub async fn route_delete<R: ResourceService>(
         return Err(Error::Unauthorized.into());
     }
 
-    if let Some(if_match) = if_match {
+    if let Some(if_match) = if_match
-        dbg!(&if_match);
+        && !resource.satisfies_if_match(&if_match)
-        if !resource.satisfies_if_match(&if_match) {
+    {
-            // Precondition failed
+        // Precondition failed
-            return Err(crate::Error::PreconditionFailed.into());
+        return Err(crate::Error::PreconditionFailed.into());
-        }
     }
     if let Some(if_none_match) = if_none_match
         && resource.satisfies_if_none_match(&if_none_match)

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

@@ -6,12 +6,15 @@ use axum::{
     extract::{MatchedPath, Path, State},
     response::{IntoResponse, Response},
 };
+use axum_extra::TypedHeader;
+use headers::Host;
 use http::{HeaderMap, StatusCode, Uri};
 use matchit_serde::ParamsDeserializer;
 use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
+#[allow(clippy::too_many_arguments)]
 pub async fn axum_route_move<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
@@ -20,6 +23,7 @@ pub async fn axum_route_move<R: ResourceService>(
     Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
+    TypedHeader(host): TypedHeader<Host>,
 ) -> Result<Response, R::Error> {
     let destination = header_map
         .get("Destination")
@@ -27,7 +31,11 @@ pub async fn axum_route_move<R: ResourceService>(
         .to_str()
         .map_err(|_| crate::Error::Forbidden)?;
     let destination_uri: Uri = destination.parse().map_err(|_| crate::Error::Forbidden)?;
-    // TODO: Check that host also matches
+    if let Some(authority) = destination_uri.authority()
+        && host != authority.clone().into()
+    {
+        return Err(crate::Error::Forbidden.into());
+    }
     let destination = destination_uri.path();
 
     let mut router = matchit::Router::new();

crates/dav/src/resource/mod.rs

@@ -11,6 +11,7 @@ pub use resource_service::ResourceService;
 use rustical_xml::{
     EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
 };
+use std::borrow::Cow;
 use std::str::FromStr;
 
 mod axum_methods;
@@ -30,7 +31,7 @@ pub trait ResourcePropName: FromStr {}
 impl<T: FromStr> ResourcePropName for T {}
 
 pub trait ResourceName {
-    fn get_name(&self) -> String;
+    fn get_name(&self) -> Cow<'_, str>;
 }
 
 pub trait Resource: Clone + Send + 'static {

crates/dav/src/xml/group.rs

@@ -1,8 +1,8 @@
 use crate::xml::HrefElement;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, Debug)]
 pub struct GroupMembership(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, Debug)]
 pub struct GroupMemberSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);

crates/dav/src/xml/mod.rs

@@ -15,3 +15,7 @@ mod report_set;
 pub use report_set::SupportedReportSet;
 mod group;
 pub use group::*;
+#[cfg(feature = "ical")]
+mod text_match;
+#[cfg(feature = "ical")]
+pub use text_match::*;

crates/dav/src/xml/multistatus.rs

@@ -3,9 +3,9 @@ use headers::{CacheControl, ContentType, HeaderMapExt};
 use http::StatusCode;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Debug};
 
-#[derive(XmlSerialize)]
+#[derive(XmlSerialize, Debug)]
 pub struct PropTagWrapper<T: XmlSerialize>(#[xml(flatten, ty = "untagged")] pub Vec<T>);
 
 // RFC 2518
@@ -30,7 +30,7 @@ fn xml_serialize_status(
     XmlSerialize::serialize(&format!("HTTP/1.1 {status}"), ns, tag, namespaces, writer)
 }
 
-#[derive(XmlSerialize)]
+#[derive(XmlSerialize, Debug)]
 #[xml(untagged)]
 pub enum PropstatWrapper<T: XmlSerialize> {
     Normal(PropstatElement<PropTagWrapper<T>>),
@@ -40,15 +40,8 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // RFC 2518
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
-#[derive(XmlSerialize, XmlRootTag)]
+#[derive(XmlSerialize, XmlRootTag, Debug)]
 #[xml(ns = "crate::namespace::NS_DAV", root = "response")]
-#[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
-))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
     #[xml(serialize_with = "xml_serialize_optional_status")]

crates/dav/src/xml/propfind.rs

@@ -45,7 +45,7 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                 // start of a child element
                 Event::Start(start) | Event::Empty(start) => {
                     let empty = matches!(event, Event::Empty(_));
-                    let (ns, name) = reader.resolve_element(start.name());
+                    let (ns, name) = reader.resolver().resolve_element(start.name());
                     let ns = match ns {
                         ResolveResult::Bound(ns) => Some(NamespaceOwned::from(ns)),
                         ResolveResult::Unknown(_ns) => todo!("handle error"),

crates/dav/src/xml/text_match.rs

@@ -0,0 +1,154 @@
+use ical::property::ContentLine;
+use rustical_xml::{ValueDeserialize, XmlDeserialize};
+use std::borrow::Cow;
+
+#[derive(Clone, Debug, PartialEq, Eq, Default)]
+pub enum TextCollation {
+    #[default]
+    AsciiCasemap,
+    UnicodeCasemap,
+    Octet,
+}
+
+impl TextCollation {
+    #[must_use]
+    pub fn normalise<'a>(&self, value: &'a str) -> Cow<'a, str> {
+        match self {
+            // https://datatracker.ietf.org/doc/html/rfc4790#section-9.2
+            Self::AsciiCasemap => Cow::from(value.to_ascii_uppercase()),
+            Self::UnicodeCasemap => Cow::from(value.to_uppercase()),
+            Self::Octet => Cow::from(value),
+        }
+    }
+}
+
+impl AsRef<str> for TextCollation {
+    fn as_ref(&self) -> &str {
+        match self {
+            Self::AsciiCasemap => "i;ascii-casemap",
+            Self::UnicodeCasemap => "i;unicode-casemap",
+            Self::Octet => "i;octet",
+        }
+    }
+}
+
+impl ValueDeserialize for TextCollation {
+    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlError> {
+        match val {
+            "i;ascii-casemap" => Ok(Self::AsciiCasemap),
+            "i;unicode-casemap" => Ok(Self::UnicodeCasemap),
+            "i;octet" => Ok(Self::Octet),
+            _ => Err(rustical_xml::XmlError::InvalidVariant(format!(
+                "Invalid collation: {val}"
+            ))),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Default)]
+pub struct NegateCondition(pub bool);
+
+impl ValueDeserialize for NegateCondition {
+    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlError> {
+        match val {
+            "yes" => Ok(Self(true)),
+            "no" => Ok(Self(false)),
+            _ => Err(rustical_xml::XmlError::InvalidVariant(format!(
+                "Invalid negate-condition parameter: {val}"
+            ))),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Default)]
+pub enum MatchType {
+    Equals,
+    #[default]
+    Contains,
+    StartsWith,
+    EndsWith,
+}
+
+impl MatchType {
+    #[must_use]
+    pub fn match_text(&self, collation: &TextCollation, needle: &str, haystack: &str) -> bool {
+        let haystack = collation.normalise(haystack);
+        let needle = collation.normalise(needle);
+
+        match &self {
+            Self::Equals => haystack == needle,
+            Self::Contains => haystack.contains(needle.as_ref()),
+            Self::StartsWith => haystack.starts_with(needle.as_ref()),
+            Self::EndsWith => haystack.ends_with(needle.as_ref()),
+        }
+    }
+}
+
+impl ValueDeserialize for MatchType {
+    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlError> {
+        Ok(match val {
+            "equals" => Self::Equals,
+            "contains" => Self::Contains,
+            "starts-with" => Self::StartsWith,
+            "ends-with" => Self::EndsWith,
+            _ => {
+                return Err(rustical_xml::XmlError::InvalidVariant(format!(
+                    "Invalid match-type parameter: {val}"
+                )));
+            }
+        })
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[allow(dead_code)]
+pub struct TextMatchElement {
+    #[xml(ty = "attr", default = "Default::default")]
+    pub collation: TextCollation,
+    #[xml(ty = "attr", default = "Default::default")]
+    pub negate_condition: NegateCondition,
+    #[xml(ty = "attr", default = "Default::default")]
+    pub match_type: MatchType,
+    #[xml(ty = "text")]
+    pub needle: String,
+}
+
+impl TextMatchElement {
+    #[must_use]
+    pub fn match_text(&self, haystack: &str) -> bool {
+        let Self {
+            collation,
+            negate_condition,
+            needle,
+            match_type,
+        } = self;
+
+        let matches = match_type.match_text(collation, needle, haystack);
+        // XOR
+        negate_condition.0 ^ matches
+    }
+    #[must_use]
+    pub fn match_property(&self, property: &ContentLine) -> bool {
+        let text = property.value.as_deref().unwrap_or("");
+        self.match_text(text)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::TextCollation;
+    use crate::xml::MatchType;
+
+    #[test]
+    fn test_collation() {
+        assert!(!MatchType::Contains.match_text(&TextCollation::AsciiCasemap, "GrÜN", "grünsd"));
+        assert!(MatchType::Contains.match_text(&TextCollation::AsciiCasemap, "GrüN", "grün"));
+        assert!(!MatchType::Contains.match_text(&TextCollation::Octet, "GrüN", "grün"));
+        assert!(MatchType::Contains.match_text(&TextCollation::UnicodeCasemap, "GrÜN", "grün"));
+        assert!(MatchType::Contains.match_text(&TextCollation::AsciiCasemap, "GrüN", "grün"));
+        assert!(MatchType::Contains.match_text(&TextCollation::AsciiCasemap, "GrüN", "grün"));
+        assert!(MatchType::StartsWith.match_text(&TextCollation::Octet, "hello", "hello you"));
+        assert!(MatchType::EndsWith.match_text(&TextCollation::Octet, "mama", "joe mama"));
+        assert!(MatchType::Equals.match_text(&TextCollation::UnicodeCasemap, "GrÜN", "grün"));
+    }
+}

crates/dav_push/src/extension.rs

@@ -2,7 +2,7 @@ use crate::{ContentUpdate, PropertyUpdate, SupportedTriggers, Transports, Trigge
 use rustical_dav::header::Depth;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants, Debug)]
 #[xml(unit_variants_ident = "DavPushExtensionPropName")]
 pub enum DavPushExtensionProp {
     // WebDav Push

crates/dav_push/src/prop.rs

@@ -22,7 +22,7 @@ impl Default for Transports {
     }
 }
 
-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Clone)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Clone, Debug)]
 pub struct SupportedTriggers(#[xml(flatten, ty = "untagged")] pub Vec<Trigger>);
 
 #[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Debug, Clone)]

crates/frontend/js-components/deno.json

@@ -11,8 +11,8 @@
     ]
   },
   "imports": {
-    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.5",
+    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.6",
     "lit": "npm:lit@^3.3.1",
-    "vite": "npm:vite@^7.1.12"
+    "vite": "npm:vite@^7.3.0"
   }
 }

crates/frontend/js-components/deno.lock

@@ -1,145 +1,145 @@
 {
   "version": "5",
   "specifiers": {
-    "npm:@deno/vite-plugin@^1.0.5": "1.0.5_vite@7.1.12__picomatch@4.0.3",
+    "npm:@deno/vite-plugin@^1.0.6": "1.0.6_vite@7.3.0__picomatch@4.0.3",
     "npm:lit@^3.3.1": "3.3.1",
-    "npm:vite@*": "7.1.12_picomatch@4.0.3",
+    "npm:vite@*": "7.3.0_picomatch@4.0.3",
-    "npm:vite@^7.1.12": "7.1.12_picomatch@4.0.3"
+    "npm:vite@^7.3.0": "7.3.0_picomatch@4.0.3"
   },
   "npm": {
-    "@deno/vite-plugin@1.0.5_vite@7.1.12__picomatch@4.0.3": {
+    "@deno/vite-plugin@1.0.6_vite@7.3.0__picomatch@4.0.3": {
-      "integrity": "sha512-tLja5n4dyMhcze1NzvSs2iiriBymfBlDCZIrjMTxb9O2ru0gvmV6mn5oBD2teNw5Sd92cj3YJzKwsAs8tMJXlg==",
+      "integrity": "sha512-Sh5XqvFuKAwjARTesi0n6xRpEXm1V0UeqKh+SxIrexCofxOaieNDMqXZD02RiZCg0mrJ43V8eCMuVrDfq6mLmg==",
       "dependencies": [
         "vite"
       ]
     },
-    "@esbuild/aix-ppc64@0.25.12": {
+    "@esbuild/aix-ppc64@0.27.1": {
-      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "integrity": "sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==",
       "os": ["aix"],
       "cpu": ["ppc64"]
     },
-    "@esbuild/android-arm64@0.25.12": {
+    "@esbuild/android-arm64@0.27.1": {
-      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "integrity": "sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==",
       "os": ["android"],
       "cpu": ["arm64"]
     },
-    "@esbuild/android-arm@0.25.12": {
+    "@esbuild/android-arm@0.27.1": {
-      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "integrity": "sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==",
       "os": ["android"],
       "cpu": ["arm"]
     },
-    "@esbuild/android-x64@0.25.12": {
+    "@esbuild/android-x64@0.27.1": {
-      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "integrity": "sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==",
       "os": ["android"],
       "cpu": ["x64"]
     },
-    "@esbuild/darwin-arm64@0.25.12": {
+    "@esbuild/darwin-arm64@0.27.1": {
-      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "integrity": "sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==",
       "os": ["darwin"],
       "cpu": ["arm64"]
     },
-    "@esbuild/darwin-x64@0.25.12": {
+    "@esbuild/darwin-x64@0.27.1": {
-      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "integrity": "sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==",
       "os": ["darwin"],
       "cpu": ["x64"]
     },
-    "@esbuild/freebsd-arm64@0.25.12": {
+    "@esbuild/freebsd-arm64@0.27.1": {
-      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "integrity": "sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==",
       "os": ["freebsd"],
       "cpu": ["arm64"]
     },
-    "@esbuild/freebsd-x64@0.25.12": {
+    "@esbuild/freebsd-x64@0.27.1": {
-      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "integrity": "sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==",
       "os": ["freebsd"],
       "cpu": ["x64"]
     },
-    "@esbuild/linux-arm64@0.25.12": {
+    "@esbuild/linux-arm64@0.27.1": {
-      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "integrity": "sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==",
       "os": ["linux"],
       "cpu": ["arm64"]
     },
-    "@esbuild/linux-arm@0.25.12": {
+    "@esbuild/linux-arm@0.27.1": {
-      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "integrity": "sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==",
       "os": ["linux"],
       "cpu": ["arm"]
     },
-    "@esbuild/linux-ia32@0.25.12": {
+    "@esbuild/linux-ia32@0.27.1": {
-      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "integrity": "sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==",
       "os": ["linux"],
       "cpu": ["ia32"]
     },
-    "@esbuild/linux-loong64@0.25.12": {
+    "@esbuild/linux-loong64@0.27.1": {
-      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "integrity": "sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==",
       "os": ["linux"],
       "cpu": ["loong64"]
     },
-    "@esbuild/linux-mips64el@0.25.12": {
+    "@esbuild/linux-mips64el@0.27.1": {
-      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "integrity": "sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==",
       "os": ["linux"],
       "cpu": ["mips64el"]
     },
-    "@esbuild/linux-ppc64@0.25.12": {
+    "@esbuild/linux-ppc64@0.27.1": {
-      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "integrity": "sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==",
       "os": ["linux"],
       "cpu": ["ppc64"]
     },
-    "@esbuild/linux-riscv64@0.25.12": {
+    "@esbuild/linux-riscv64@0.27.1": {
-      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "integrity": "sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==",
       "os": ["linux"],
       "cpu": ["riscv64"]
     },
-    "@esbuild/linux-s390x@0.25.12": {
+    "@esbuild/linux-s390x@0.27.1": {
-      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "integrity": "sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==",
       "os": ["linux"],
       "cpu": ["s390x"]
     },
-    "@esbuild/linux-x64@0.25.12": {
+    "@esbuild/linux-x64@0.27.1": {
-      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "integrity": "sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==",
       "os": ["linux"],
       "cpu": ["x64"]
     },
-    "@esbuild/netbsd-arm64@0.25.12": {
+    "@esbuild/netbsd-arm64@0.27.1": {
-      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "integrity": "sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==",
       "os": ["netbsd"],
       "cpu": ["arm64"]
     },
-    "@esbuild/netbsd-x64@0.25.12": {
+    "@esbuild/netbsd-x64@0.27.1": {
-      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "integrity": "sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==",
       "os": ["netbsd"],
       "cpu": ["x64"]
     },
-    "@esbuild/openbsd-arm64@0.25.12": {
+    "@esbuild/openbsd-arm64@0.27.1": {
-      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "integrity": "sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==",
       "os": ["openbsd"],
       "cpu": ["arm64"]
     },
-    "@esbuild/openbsd-x64@0.25.12": {
+    "@esbuild/openbsd-x64@0.27.1": {
-      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "integrity": "sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==",
       "os": ["openbsd"],
       "cpu": ["x64"]
     },
-    "@esbuild/openharmony-arm64@0.25.12": {
+    "@esbuild/openharmony-arm64@0.27.1": {
-      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "integrity": "sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==",
       "os": ["openharmony"],
       "cpu": ["arm64"]
     },
-    "@esbuild/sunos-x64@0.25.12": {
+    "@esbuild/sunos-x64@0.27.1": {
-      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "integrity": "sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==",
       "os": ["sunos"],
       "cpu": ["x64"]
     },
-    "@esbuild/win32-arm64@0.25.12": {
+    "@esbuild/win32-arm64@0.27.1": {
-      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "integrity": "sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==",
       "os": ["win32"],
       "cpu": ["arm64"]
     },
-    "@esbuild/win32-ia32@0.25.12": {
+    "@esbuild/win32-ia32@0.27.1": {
-      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "integrity": "sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==",
       "os": ["win32"],
       "cpu": ["ia32"]
     },
-    "@esbuild/win32-x64@0.25.12": {
+    "@esbuild/win32-x64@0.27.1": {
-      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "integrity": "sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==",
       "os": ["win32"],
       "cpu": ["x64"]
     },
@@ -268,8 +268,8 @@
     "@types/trusted-types@2.0.7": {
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
     },
-    "esbuild@0.25.12": {
+    "esbuild@0.27.1": {
-      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "integrity": "sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==",
       "optionalDependencies": [
         "@esbuild/aix-ppc64",
         "@esbuild/android-arm",
@@ -397,8 +397,8 @@
         "picomatch"
       ]
     },
-    "vite@7.1.12_picomatch@4.0.3": {
+    "vite@7.3.0_picomatch@4.0.3": {
-      "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
+      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
       "dependencies": [
         "esbuild",
         "fdir",
@@ -415,9 +415,9 @@
   },
   "workspace": {
     "dependencies": [
-      "npm:@deno/vite-plugin@^1.0.5",
+      "npm:@deno/vite-plugin@^1.0.6",
       "npm:lit@^3.3.1",
-      "npm:vite@^7.1.12"
+      "npm:vite@^7.3.0"
     ]
   }
 }

crates/frontend/js-components/index.html

@@ -1,16 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Lit</title>
-    <link rel="stylesheet" href="./src/index.css" />
-    <script type="module" src="/src/my-element.ts"></script>
-  </head>
-  <body>
-    <my-element>
-      <h1>Vite + Lit</h1>
-    </my-element>
-  </body>
-</html>

crates/frontend/js-components/lib/bundle.ts

@@ -0,0 +1,8 @@
+export { CreateAddressbookForm } from './create-addressbook-form.ts'
+export { CreateBirthdayCalendarForm } from './create-birthday-calendar-form.ts'
+export { CreateCalendarForm } from './create-calendar-form.ts'
+export { DeleteButton } from './delete-button.ts'
+export { EditAddressbookForm } from './edit-addressbook-form.ts'
+export { EditCalendarForm } from './edit-calendar-form.ts'
+export { ImportAddressbookForm } from './import-addressbook-form.ts'
+export { ImportCalendarForm } from './import-calendar-form.ts'

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

@@ -36,27 +36,27 @@ export class CreateAddressbookForm extends LitElement {
         <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}>
+            <select .value=${this.user} @change=${e => this.principal = e.target.value}>
-              <option value=${this.user}>${this.user}</option>
+              <option .value=${this.user}>${this.user}</option>
               ${window.rusticalUser.memberships.map(membership => html`
-                <option value=${membership}>${membership}</option>
+                <option .value=${membership}>${membership}</option>
               `)}
             </select>
           </label>
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.addr_id} @change=${e => this.addr_id = e.target.value} />
+            <input type="text" .value=${this.addr_id} @change=${e => this.addr_id = e.target.value} />
           </label>
           <br>
           <label>
             Displayname
-            <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+            <input type="text" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
           <label>
             Description
-            <input type="text" name="description" @change=${e => this.description = e.target.value} />
+            <input type="text" .value=${this.description} @change=${e => this.description = e.target.value} />
           </label>
           <br>
           <button type="submit">Create</button>

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

@@ -5,7 +5,7 @@ import { escapeXml } from ".";
 import { getTimezones } from "./timezones.ts";
 
 @customElement("create-birthday-calendar-form")
-export class CreateCalendarForm extends LitElement {
+export class CreateBirthdayCalendarForm extends LitElement {
   protected override createRenderRoot() {
     return this
   }
@@ -34,17 +34,17 @@ export class CreateCalendarForm extends LitElement {
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname
-            <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+            <input type="text" .value=${this.displayname} required @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
           <label>
             Description
-            <input type="text" name="description" @change=${e => this.description = e.target.value} />
+            <input type="text" .value=${this.description} @change=${e => this.description = e.target.value} />
           </label>
           <br>
           <label>
             Color
-            <input type="color" name="color"  @change=${e => this.color = e.target.value} />
+            <input type="color" .value=${this.color} @change=${e => this.color = e.target.value} />
           </label>
           <br>
           <button type="submit">Create</button>

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

@@ -1,16 +1,30 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { escapeXml } from ".";
+import { escapeXml, SVG_ICON_CALENDAR, SVG_ICON_INTERNET } from ".";
 import { getTimezones } from "./timezones.ts";
 
 @customElement("create-calendar-form")
 export class CreateCalendarForm extends LitElement {
   constructor() {
     super()
+    this.resetForm()
     this.fetchTimezones()
   }
 
+  resetForm() {
+    this.form.value?.reset()
+    this.principal = this.user
+    this.cal_id = self.crypto.randomUUID()
+    this.displayname = ''
+    this.description = ''
+    this.timezone_id = ''
+    this.color = ''
+    this.isSubscription = false
+    this.subscriptionUrl = null
+    this.components = new Set(["VEVENT", "VTODO"])
+  }
+
   async fetchTimezones() {
     this.timezones = await getTimezones()
   }
@@ -22,23 +36,23 @@ export class CreateCalendarForm extends LitElement {
   @property()
   user: string = ''
   @property()
-  principal: string = ''
+  principal: string
   @property()
-  cal_id: string = self.crypto.randomUUID()
+  cal_id: string
   @property()
-  displayname: string = ''
+  displayname: string
   @property()
-  description: string = ''
+  description: string
   @property()
-  timezone_id: string = ''
+  timezone_id: string
   @property()
-  color: string = ''
+  color: string
   @property()
-  isSubscription: boolean = false
+  isSubscription: boolean
   @property()
-  subscriptionUrl: string = ''
+  subscriptionUrl: string
   @property()
-  components: Set<"VEVENT" | "VTODO" | "VJOURNAL"> = new Set()
+  components: Set<"VEVENT" | "VTODO" | "VJOURNAL">
 
   dialog: Ref<HTMLDialogElement> = createRef()
   form: Ref<HTMLFormElement> = createRef()
@@ -47,13 +61,13 @@ export class CreateCalendarForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Create calendar</button>
+      <button @click=${e => this.dialog.value.showModal()}>Create calendar</button>
-      <dialog ${ref(this.dialog)}>
+      <dialog ${ref(this.dialog)} @close=${e => this.resetForm()}>
         <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}>
+            <select required 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>
@@ -63,17 +77,17 @@ export class CreateCalendarForm extends LitElement {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
+            <input type="text" required .value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
           </label>
           <br>
           <label>
             Displayname
-            <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+            <input type="text" required .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
           <label>
             Timezone (optional)
-            <select name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value}>
+            <select .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value}>
               <option value="">No timezone</option>
               ${this.timezones.map(timezone => html`
                 <option value=${timezone} ?selected=${timezone === this.timezone_id}>${timezone}</option>
@@ -83,45 +97,57 @@ export class CreateCalendarForm extends LitElement {
           <br>
           <label>
             Description
-            <input type="text" name="description" @change=${e => this.description = e.target.value} />
+            <input type="text" .value=${this.description} @change=${e => this.description = e.target.value} />
           </label>
           <br>
           <label>
             Color
-            <input type="color" name="color"  @change=${e => this.color = e.target.value} />
+            <input type="color" .value=${this.color} @change=${e => this.color = e.target.value} />
           </label>
           <br>
           <br>
-          <label>
+          <label>Type</label>
-            Calendar is subscription to external calendar
+          <div class="tab-radio">
-            <input type="checkbox" name="is_subscription" @change=${e => this.isSubscription = e.target.checked}  />
+            <label>
-          </label>
+              <input type="radio" name="type" .checked=${!this.isSubscription} @change=${e => this.isSubscription = false}></input>
+              ${SVG_ICON_CALENDAR}
+              Calendar
+            </label>
+            <label>
+              <input type="radio" name="type" .checked=${this.isSubscription} @change=${e => this.isSubscription = true}></input>
+              ${SVG_ICON_INTERNET}
+              webCal Subscription
+            </label>
+          </div>
           <br>
           ${this.isSubscription ? html`
             <label>
               Subscription URL
-              <input type="text" name="subscription_url" @change=${e => this.subscriptionUrl = e.target.value}  />
+              <input type="text" pattern="https://.*" .required=${this.isSubscription} .value=${this.subscriptionUrl} @change=${e => this.subscriptionUrl = e.target.value}  />
             </label>
             <br>
+            <br>
           `: html``}
-          <br>
+
-          ${["VEVENT", "VTODO", "VJOURNAL"].map(comp => html`
+          <label>Components</label>
-            <label>
+          <div>
-              Support ${comp}
+            ${["VEVENT", "VTODO", "VJOURNAL"].map(comp => html`
-              <input type="checkbox" value=${comp} @change=${e => e.target.checked ? this.components.add(e.target.value) : this.components.delete(e.target.value)} />
+              <label>
-            </label>
+                Support ${comp}
-            <br>
+                <input type="checkbox" .value=${comp} @change=${e => e.target.checked ? this.components.add(e.target.value) : this.components.delete(e.target.value)} .checked=${this.components.has(comp)} />
-          `)}
+              </label>
+              <br>
+            `)}
+          </div>
           <br>
           <button type="submit">Create</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close();}} class="cancel">Cancel</button>
       </form>
       </dialog>
         `
   }
 
   async submit(e: SubmitEvent) {
-    console.log(this.displayname)
     e.preventDefault()
     if (!this.cal_id) {
       alert("Empty id")
@@ -135,6 +161,10 @@ export class CreateCalendarForm extends LitElement {
       alert("No calendar components selected")
       return
     }
+    if (this.isSubscription && !this.subscriptionUrl) {
+      alert("Invalid subscription url")
+      return
+    }
 
     let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
       method: 'MKCOL',

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

@@ -34,12 +34,12 @@ export class EditAddressbookForm extends LitElement {
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+            <input type="text" .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} />
+            <input type="text" .value=${this.description} @change=${e => this.description = e.target.value} />
           </label>
           <br>
           <button type="submit">Submit</button>

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

@@ -53,12 +53,12 @@ export class EditCalendarForm extends LitElement {
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
+            <input type="text" required .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
           <label>
             Timezone (optional)
-            <select name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value}>
+            <select .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value}>
               <option value="">No timezone</option>
               ${this.timezones.map(timezone => html`
                 <option value=${timezone} ?selected=${timezone === this.timezone_id}>${timezone}</option>
@@ -68,18 +68,18 @@ export class EditCalendarForm extends LitElement {
           <br>
           <label>
             Description
-            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
+            <input type="text" .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} />
+            <input type="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)} />
+              <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>
           `)}

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

@@ -32,23 +32,25 @@ export class ImportAddressbookForm extends LitElement {
         <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}>
+            <select name="principal" required .value=${this.user} @change=${e => this.principal = e.target.value}>
-              <option value=${this.user}>${this.user}</option>
+              <option .value=${this.user}>${this.user}</option>
               ${window.rusticalUser.memberships.map(membership => html`
-                <option value=${membership}>${membership}</option>
+                <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} />
+            <input type="text" required .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]} />
+            <input type="file" accept="text/vcard" required @change=${e => this.file = e.target.files[0]} />
           </label>
+          <br>
+          <br>
           <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>

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

@@ -32,23 +32,25 @@ export class ImportCalendarForm extends LitElement {
         <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}>
+            <select name="principal" required .value=${this.user} @change=${e => this.principal = e.target.value}>
-              <option value=${this.user}>${this.user}</option>
+              <option .value=${this.user}>${this.user}</option>
               ${window.rusticalUser.memberships.map(membership => html`
-                <option value=${membership}>${membership}</option>
+                <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} />
+            <input type="text" required .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]} />
+            <input type="file" required accept="text/calendar" @change=${e => this.file = e.target.files[0]} />
           </label>
+          <br>
+          <br>
           <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>

crates/frontend/js-components/lib/index.ts

@@ -1,3 +1,5 @@
+import {svg} from 'lit'
+
 export function escapeXml(unsafe: string): string {
   return unsafe.replace(/&/g, '&')
     .replace(/</g, '&lt;')
@@ -5,3 +7,23 @@ export function escapeXml(unsafe: string): string {
     .replace(/"/g, '&quot;')
     .replace(/'/g, '&apos;')
 }
+
+export const SVG_ICON_CALENDAR = svg`<!-- 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>
+`
+
+export const SVG_ICON_INTERNET = svg`<!-- Adapted from https://iconoir.com/ -->
+<svg class="icon" width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M13 2.04932C13 2.04932 16 5.99994 16 11.9999" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M11 21.9506C11 21.9506 8 17.9999 8 11.9999C8 5.99994 11 2.04932 11 2.04932" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M2.62964 15.5H12" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path d="M2.62964 8.5H21.3704" stroke-linecap="round" stroke-linejoin="round"></path>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M21.8789 17.9174C22.3727 18.2211 22.3423 18.9604 21.8337 19.0181L19.2671 19.309L18.1159 21.6213C17.8878 22.0795 17.1827 21.8552 17.0661 21.2873L15.8108 15.1713C15.7123 14.6913 16.1437 14.3892 16.561 14.646L21.8789 17.9174Z"></path>
+</svg>
+`

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

@@ -14,21 +14,14 @@ export default defineConfig({
 
     rollupOptions: {
       input: [
-        "lib/create-birthday-calendar-form.ts",
+        "lib/bundle.ts",
-        "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: {
         dir: "../public/assets/js/",
         format: "es",
-        manualChunks: {
+        // manualChunks: {
-          lit: ["lit"],
+        //   lit: ["lit"],
-        }
+        // }
       }
     },
   },