version 0.9.14

Hopefully addresses SQLITE_BUSY error, see #131

.editorconfig

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

.github/workflows/ci.yml

@@ -1,20 +0,0 @@
-name: Rust CI
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build
-        run: cargo build --verbose
-      - name: Run tests
-        run: cargo test --verbose --workspace

.github/workflows/cicd.yml

@@ -0,0 +1,57 @@
+name: "CICD"
+on: [push, pull_request]
+permissions:
+  contents: read
+  pull-requests: write
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - run: cargo check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - run: cargo test --all-features --verbose --workspace
+
+  coverage:
+    name: Test Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Install tarpaulin
+        run: cargo install cargo-tarpaulin
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run tarpaulin
+        run: cargo tarpaulin --workspace --all-features --exclude xml_derive --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }}
+
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - run: rustup component add rustfmt clippy
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
+
+      - name: Run cargo clippy
+        run: cargo clippy -- -D warnings

.github/workflows/docker-publish.yml

@@ -41,12 +41,10 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          # As long as we don't have releases everything on the main branch shall be tagged as latest
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}

.sqlx/query-246ec675667992c1297c29348d46496a884c59adb8b64b569d36f4ce10f88f47.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id, vcf FROM addressobjects WHERE (principal, addressbook_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) or ?)",
+  "query": "SELECT id, vcf FROM addressobjects WHERE (principal, addressbook_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
   "describe": {
     "columns": [
       {
@@ -22,5 +22,5 @@
       false
     ]
   },
-  "hash": "395e40a7b3333b79bc2ad50a123d99f74bc2712a16257ee2119dd211fdb61f7e"
+  "hash": "246ec675667992c1297c29348d46496a884c59adb8b64b569d36f4ce10f88f47"
 }

.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json

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

.sqlx/query-2f043f62a7c0eae1023e319f0bc8f35dfdcf6a8247e03b1de3e2cabb2d3ab8ae.json

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

.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json

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

.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json

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

.sqlx/query-543838c030550cb09d1af08adfeade8b7ce3575d92fddbc6e9582d141bc9e49d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?)",
+  "query": "SELECT id, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
   "describe": {
     "columns": [
       {
@@ -15,12 +15,12 @@
       }
     ],
     "parameters": {
-      "Right": 3
+      "Right": 4
     },
     "nullable": [
       false,
       false
     ]
   },
-  "hash": "d2f7423e2e8f97607f6664200990dcadb927445880ec6edffba3b5aedf4e199b"
+  "hash": "543838c030550cb09d1af08adfeade8b7ce3575d92fddbc6e9582d141bc9e49d"
 }

.sqlx/query-5c09c2a3c052188435409d4ff076575394e625dd19f00dea2d4c71a9f34a5952.json

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

.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json

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

.sqlx/query-660833e0505d3bbcd6dd736cce06b1bf14263d0e0e87b27d89d376d422e4e474.json

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

.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE (principal, id) = (?, ?)",
+  "query": "SELECT *\n                FROM calendars\n                WHERE (principal, id) = (?, ?)\n                AND ((deleted_at IS NULL) OR ?) ",
   "describe": {
     "columns": [
       {
@@ -39,48 +39,43 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone",
+        "name": "timezone_id",
         "ordinal": 7,
         "type_info": "Text"
       },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
     "parameters": {
-      "Right": 2
+      "Right": 3
     },
     "nullable": [
       false,
@@ -93,12 +88,11 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,
       false
     ]
   },
-  "hash": "9f930775043a6d4571a8ffd5a981cadf7c51f3f11a189f8461505abec31076e6"
+  "hash": "bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553"
 }

.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json

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

.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json

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

.sqlx/query-d9f14260a46a7ccd137d462c35d350a7fe338a074131776596c5d803fcda1f48.json

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

Cargo.toml

@@ -2,9 +2,10 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.3.0"
+version = "0.9.14"
 edition = "2024"
 description = "A CalDAV server"
+documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"
 
@@ -16,7 +17,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = false
+publish = true
 
 [features]
 debug = ["opentelemetry"]
@@ -34,7 +35,7 @@ opentelemetry = [
 debug = 0
 
 [workspace.dependencies]
-matchit = "0.8"
+matchit = "0.9"
 uuid = { version = "1.11", features = ["v4", "fast-rng"] }
 async-trait = "0.1"
 axum = "0.8"
@@ -47,8 +48,7 @@ pbkdf2 = { version = "0.12", features = ["simple"] }
 rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
-lazy_static = "1.5"
+rstest = "0.26"
-rstest = "0.25"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -61,7 +61,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.37" }
+quick-xml = { version = "0.38" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"
@@ -95,8 +95,12 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { version = "0.11", features = ["generator", "serde"] }
+ical = { git = "https://github.com/lennart-k/ical-rs", features = [
-toml = "0.8"
+  "generator",
+  "serde",
+  "chrono-tz",
+] }
+toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
   "trace",
@@ -117,7 +121,7 @@ rustical_ical = { path = "./crates/ical/" }
 chrono-tz = "0.10"
 chrono-humanize = "0.2"
 rand = "0.9"
-axum-extra = { version = "0.10", features = ["typed-header"] }
+axum-extra = { version = "0.12", features = ["typed-header"] }
 rrule = "0.14"
 argon2 = "0.5"
 rpassword = "7.3"
@@ -126,7 +130,7 @@ syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.5"
-darling = "0.20"
+darling = "0.21"
 reqwest = { version = "0.12", features = [
   "rustls-tls",
   "charset",
@@ -134,12 +138,13 @@ reqwest = { version = "0.12", features = [
 ], default-features = false }
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
-matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" }
+matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "e18e65d7" }
+vtimezones-rs = "0.2"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }
 openssl = { version = "0.10", features = ["vendored"] }
-p256 = { version = "0.13", features = ["ecdh"] }
+async-std = { version = "1.13", features = ["attributes"] }
 
 [dependencies]
 rustical_store = { workspace = true }
@@ -158,15 +163,15 @@ async-trait = { workspace = true }
 uuid.workspace = true
 axum.workspace = true
 
-opentelemetry = { version = "0.30", optional = true }
+opentelemetry = { version = "0.31", optional = true }
-opentelemetry-otlp = { version = "0.30", optional = true, features = [
+opentelemetry-otlp = { version = "0.31", optional = true, features = [
   "grpc-tonic",
 ] }
-opentelemetry_sdk = { version = "0.30", features = [
+opentelemetry_sdk = { version = "0.31", features = [
   "rt-tokio",
 ], optional = true }
-opentelemetry-semantic-conventions = { version = "0.30", optional = true }
+opentelemetry-semantic-conventions = { version = "0.31", optional = true }
-tracing-opentelemetry = { version = "0.31", optional = true }
+tracing-opentelemetry = { version = "0.32", optional = true }
 tracing-subscriber = { version = "0.3", features = [
   "env-filter",
   "fmt",

Dockerfile

@@ -1,11 +1,11 @@
-FROM --platform=$BUILDPLATFORM rust:1.86-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.91-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
 # the compiler will otherwise ask for aarch64-linux-musl-gcc
 ENV CC_aarch64_unknown_linux_musl="clang"
-ENV AR_aarch64_unknown_linux_musl="llvm-ar"
+ENV AR_aarch64_unknown_linux_musl="llvm20-ar"
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"
 
 # Stupid workaound with tempfiles since environment variables
@@ -16,7 +16,7 @@ RUN case $TARGETPLATFORM in \
   *) echo "Unsupported platform ${TARGETPLATFORM}"; exit 1;;  \
   esac
 
-RUN apk add --no-cache musl-dev llvm19 clang perl pkgconf make \
+RUN apk add --no-cache musl-dev llvm20 clang perl pkgconf make \
   && rustup target add "$(cat /tmp/rust_target)" \
   && cargo install cargo-chef --locked \
   && rm -rf "$CARGO_HOME/registry"
@@ -45,4 +45,7 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000
+
+HEALTHCHECK --interval=30s --timeout=30s --start-period=3s --retries=3 CMD ["/usr/local/bin/rustical", "health"]

Justfile

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

README.md

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

about.toml

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

compose.oidc.yml

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

crates/caldav/Cargo.toml

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

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

@@ -4,12 +4,12 @@ use axum::body::Body;
 use axum::extract::State;
 use axum::{extract::Path, response::Response};
 use headers::{ContentType, HeaderMapExt};
-use http::{HeaderValue, StatusCode, header};
+use http::{HeaderValue, Method, StatusCode, header};
 use ical::generator::{Emitter, IcalCalendarBuilder};
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject, JournalObject, TodoObject};
+use rustical_ical::{CalendarObjectComponent, EventObject};
-use rustical_store::{CalendarStore, SubscriptionStore, auth::User};
+use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::collections::HashMap;
 use std::str::FromStr;
 use tracing::instrument;
@@ -18,67 +18,81 @@ use tracing::instrument;
 pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, calendar_id)): Path<(String, String)>,
     State(CalendarResourceService { cal_store, .. }): State<CalendarResourceService<C, S>>,
-    user: User,
+    user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store.get_calendar(&principal, &calendar_id).await?;
+    let calendar = cal_store
+        .get_calendar(&principal, &calendar_id, true)
+        .await?;
     if !user.is_principal(&calendar.principal) {
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store.get_calendar(&principal, &calendar_id).await?;
+    let mut vtimezones = HashMap::new();
-
-    let mut timezones = HashMap::new();
     let objects = cal_store.get_objects(&principal, &calendar_id).await?;
 
     let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
         .gregorian()
         .prodid("RustiCal");
-    if calendar.displayname.is_some() {
+    if let Some(displayname) = calendar.meta.displayname {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALNAME".to_owned(),
-            value: calendar.displayname,
+            value: Some(displayname),
             params: None,
         });
     }
-    if calendar.description.is_some() {
+    if let Some(description) = calendar.meta.description {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALDESC".to_owned(),
-            value: calendar.description,
+            value: Some(description),
             params: None,
         });
     }
-    if calendar.timezone_id.is_some() {
+    if let Some(timezone_id) = calendar.timezone_id {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-TIMEZONE".to_owned(),
-            value: calendar.timezone_id,
+            value: Some(timezone_id),
             params: None,
         });
     }
-    let mut ical_calendar = ical_calendar_builder.build();
 
     for object in &objects {
+        vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
-            CalendarObjectComponent::Event(EventObject {
+            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
-                event,
+                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
-                timezones: object_timezones,
+                for ev_override in overrides {
-                ..
+                    ical_calendar_builder =
-            }) => {
+                        ical_calendar_builder.add_event(ev_override.event.clone());
-                timezones.extend(object_timezones);
+                }
-                ical_calendar.events.push(event.clone());
             }
-            CalendarObjectComponent::Todo(TodoObject { todo, .. }) => {
+            CalendarObjectComponent::Todo(todo, overrides) => {
-                ical_calendar.todos.push(todo.clone());
+                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(JournalObject { journal, .. }) => {
+            CalendarObjectComponent::Journal(journal, overrides) => {
-                ical_calendar.journals.push(journal.clone());
+                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());
@@ -92,5 +106,9 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         ))
         .unwrap(),
     );
-    Ok(resp.body(Body::new(ical_calendar.generate())).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(ical_calendar.generate())).unwrap())
+    }
 }

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

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

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

@@ -4,10 +4,11 @@ use crate::calendar::prop::SupportedCalendarComponentSet;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use http::{Method, StatusCode};
+use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
@@ -45,7 +46,7 @@ pub struct PropElement {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcalendar")]
+#[xml(root = "mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -53,7 +54,7 @@ struct MkcalendarRequest {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -63,7 +64,7 @@ struct MkcolRequest {
 #[instrument(skip(cal_store))]
 pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, cal_id)): Path<(String, String)>,
-    user: User,
+    user: Principal,
     State(CalendarResourceService { cal_store, .. }): State<CalendarResourceService<C, S>>,
     method: Method,
     body: String,
@@ -78,31 +79,55 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         _ => unreachable!("We never call with another method"),
     };
 
-    if let Some("") = request.displayname.as_deref() {
+    if request.displayname.as_deref() == Some("") {
-        request.displayname = None
+        request.displayname = None;
     }
 
+    let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
+        Some(tzid)
+    } else if let Some(tz) = request.calendar_timezone {
+        // TODO: Proper error (calendar-timezone precondition)
+        let calendar = IcalParser::new(tz.as_bytes())
+            .next()
+            .ok_or_else(|| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        let timezone = calendar.timezones.first().ok_or_else(|| {
+            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+        })?;
+        let timezone: chrono_tz::Tz = timezone
+            .try_into()
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        Some(timezone.name().to_owned())
+    } else {
+        None
+    };
+
     let calendar = Calendar {
-        id: cal_id.to_owned(),
+        id: cal_id.clone(),
-        principal: principal.to_owned(),
+        principal: principal.clone(),
-        order: request.calendar_order.unwrap_or(0),
+        meta: CalendarMetadata {
-        displayname: request.displayname,
+            order: request.calendar_order.unwrap_or(0),
-        timezone: request.calendar_timezone,
+            displayname: request.displayname,
-        timezone_id: request.calendar_timezone_id,
+            color: request.calendar_color,
-        color: request.calendar_color,
+            description: request.calendar_description,
-        description: request.calendar_description,
+        },
+        timezone_id,
         deleted_at: None,
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),
         push_topic: uuid::Uuid::new_v4().to_string(),
-        components: request
+        components: request.supported_calendar_component_set.map_or_else(
-            .supported_calendar_component_set
+            || {
-            .map(Into::into)
+                vec![
-            .unwrap_or(vec![
+                    CalendarObjectType::Event,
-                CalendarObjectType::Event,
+                    CalendarObjectType::Todo,
-                CalendarObjectType::Todo,
+                    CalendarObjectType::Journal,
-                CalendarObjectType::Journal,
+                ]
-            ]),
+            },
+            Into::into,
+        ),
     };
 
     cal_store.insert_calendar(calendar).await?;

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

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

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

@@ -7,7 +7,7 @@ use http::{HeaderMap, HeaderValue, StatusCode, header};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
 use rustical_dav_push::register::PushRegister;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use rustical_store::{CalendarStore, Subscription, SubscriptionStore};
 use rustical_xml::XmlDocument;
 use tracing::instrument;
@@ -15,7 +15,7 @@ use tracing::instrument;
 #[instrument(skip(resource_service))]
 pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, cal_id)): Path<(String, String)>,
-    user: User,
+    user: Principal,
     State(resource_service): State<CalendarResourceService<C, S>>,
     body: String,
 ) -> Result<Response, Error> {
@@ -25,7 +25,7 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
 
     let calendar = resource_service
         .cal_store
-        .get_calendar(&principal, &cal_id)
+        .get_calendar(&principal, &cal_id, false)
         .await?;
     let calendar_resource = CalendarResource {
         cal: calendar,
@@ -49,12 +49,12 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
     };
 
     let subscription = Subscription {
-        id: sub_id.to_owned(),
+        id: sub_id.clone(),
         push_resource: request
             .subscription
             .web_push_subscription
             .push_resource
-            .to_owned(),
+            .clone(),
         topic: calendar_resource.cal.push_topic,
         expiration: expires.naive_local(),
         public_key: request

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

@@ -4,10 +4,10 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_xml::XmlDeserialize;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 // <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, href+)>
-pub(crate) struct CalendarMultigetRequest {
+pub struct CalendarMultigetRequest {
     #[xml(ty = "untagged")]
     pub(crate) prop: PropfindType<CalendarObjectPropWrapperName>,
     #[xml(flatten)]
@@ -27,20 +27,18 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
 
     for href in &cal_query.href {
         if let Some(filename) = href.strip_prefix(path) {
-            let filename = filename.trim_start_matches("/");
+            let filename = filename.trim_start_matches('/');
             if let Some(object_id) = filename.strip_suffix(".ics") {
-                match store.get_object(principal, cal_id, object_id).await {
+                match store.get_object(principal, cal_id, object_id, false).await {
                     Ok(object) => result.push(object),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
                     Err(err) => return Err(err.into()),
-                };
+                }
             } else {
                 not_found.push(href.to_owned());
-                continue;
             }
         } else {
             not_found.push(href.to_owned());
-            continue;
         }
     }
 

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

@@ -1,57 +1,62 @@
-use crate::{Error, calendar_object::CalendarObjectPropWrapperName};
+use crate::calendar_object::CalendarObjectPropWrapperName;
 use rustical_dav::xml::PropfindType;
 use rustical_ical::{CalendarObject, UtcDateTime};
-use rustical_store::{CalendarStore, calendar_store::CalendarQuery};
+use rustical_store::calendar_store::CalendarQuery;
 use rustical_xml::XmlDeserialize;
-use std::ops::Deref;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
-pub(crate) struct TimeRangeElement {
+pub struct TimeRangeElement {
     #[xml(ty = "attr")]
     pub(crate) start: Option<UtcDateTime>,
     #[xml(ty = "attr")]
     pub(crate) end: Option<UtcDateTime>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
-struct ParamFilterElement {
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
+pub struct ParamFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    is_not_defined: Option<()>,
+    pub(crate) is_not_defined: Option<()>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    text_match: Option<TextMatchElement>,
+    pub(crate) text_match: Option<TextMatchElement>,
 
     #[xml(ty = "attr")]
-    name: String,
+    pub(crate) name: String,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
-struct TextMatchElement {
+pub struct TextMatchElement {
     #[xml(ty = "attr")]
-    collation: String,
+    pub(crate) collation: String,
     #[xml(ty = "attr")]
-    negate_collation: String,
+    // "yes" or "no", default: "no"
+    pub(crate) negate_condition: Option<String>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
-pub(crate) struct PropFilterElement {
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
+pub struct PropFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    is_not_defined: Option<()>,
+    pub(crate) is_not_defined: Option<()>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    time_range: Option<TimeRangeElement>,
+    pub(crate) time_range: Option<TimeRangeElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    text_match: Option<TextMatchElement>,
+    pub(crate) text_match: Option<TextMatchElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    param_filter: Vec<ParamFilterElement>,
+    pub(crate) param_filter: Vec<ParamFilterElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
-pub(crate) struct CompFilterElement {
+pub struct CompFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) is_not_defined: Option<()>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
@@ -61,7 +66,7 @@ pub(crate) struct CompFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub(crate) comp_filter: Vec<CompFilterElement>,
 
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", ty = "attr")]
+    #[xml(ty = "attr")]
     pub(crate) name: String,
 }
 
@@ -71,11 +76,11 @@ impl CompFilterElement {
         let comp_vcal = self.name == "VCALENDAR";
         match (self.is_not_defined, comp_vcal) {
             // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
+            (Some(()), true) |
             // Client is asking for something different than a vcalendar
             (None, false) => return false,
             _ => {}
-        };
+        }
 
         if self.time_range.is_some() {
             // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
@@ -101,28 +106,26 @@ impl CompFilterElement {
         let comp_name_matches = self.name == cal_object.get_component_name();
         match (self.is_not_defined, comp_name_matches) {
             // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
+            (Some(()), true) |
             // Client is asking for something different than a vcalendar
             (None, false) => return false,
             _ => {}
-        };
+        }
 
         // TODO: Implement prop-filter (and comp-filter?) at some point
 
         if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start {
+            if let Some(start) = &time_range.start
-                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
+                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
-                    if start.deref() > &last_occurence.utc() {
+                && **start > last_occurence.utc()
-                        return false;
+            {
-                    }
+                return false;
-                };
             }
-            if let Some(end) = &time_range.end {
+            if let Some(end) = &time_range.end
-                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
+                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
-                    if end.deref() < &first_occurence.utc() {
+                && **end < first_occurence.utc()
-                        return false;
+            {
-                    }
+                return false;
-                };
             }
         }
         true
@@ -132,7 +135,7 @@ impl CompFilterElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
-pub(crate) struct FilterElement {
+pub struct FilterElement {
     // This comp-filter matches on VCALENDAR
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) comp_filter: CompFilterElement,
@@ -147,21 +150,21 @@ impl FilterElement {
 impl From<&FilterElement> for CalendarQuery {
     fn from(value: &FilterElement) -> Self {
         let comp_filter_vcalendar = &value.comp_filter;
-        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
+        for comp_filter in &comp_filter_vcalendar.comp_filter {
             // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
             // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
-                if let Some(time_range) = &comp_filter.time_range {
+                && let Some(time_range) = &comp_filter.time_range
-                    let start = time_range.start.as_ref().map(|start| start.date_naive());
+            {
-                    let end = time_range.end.as_ref().map(|end| end.date_naive());
+                let start = time_range.start.as_ref().map(|start| start.date_naive());
-                    return CalendarQuery {
+                let end = time_range.end.as_ref().map(|end| end.date_naive());
-                        time_start: start,
+                return Self {
-                        time_end: end,
+                    time_start: start,
-                    };
+                    time_end: end,
-                }
+                };
             }
         }
-        Default::default()
+        Self::default()
     }
 }
 
@@ -181,25 +184,6 @@ pub struct CalendarQueryRequest {
 
 impl From<&CalendarQueryRequest> for CalendarQuery {
     fn from(value: &CalendarQueryRequest) -> Self {
-        value
+        value.filter.as_ref().map(Self::from).unwrap_or_default()
-            .filter
-            .as_ref()
-            .map(CalendarQuery::from)
-            .unwrap_or_default()
     }
 }
-
-pub async fn get_objects_calendar_query<C: CalendarStore>(
-    cal_query: &CalendarQueryRequest,
-    principal: &str,
-    cal_id: &str,
-    store: &C,
-) -> Result<Vec<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));
-    }
-    Ok(objects)
-}

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

@@ -0,0 +1,120 @@
+use crate::Error;
+use rustical_ical::CalendarObject;
+use rustical_store::CalendarStore;
+
+mod elements;
+pub use elements::*;
+
+pub async fn get_objects_calendar_query<C: CalendarStore>(
+    cal_query: &CalendarQueryRequest,
+    principal: &str,
+    cal_id: &str,
+    store: &C,
+) -> Result<Vec<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));
+    }
+    Ok(objects)
+}
+
+#[cfg(test)]
+mod tests {
+    use rustical_dav::xml::PropElement;
+    use rustical_xml::XmlDocument;
+
+    use crate::{
+        calendar::methods::report::{
+            ReportRequest,
+            calendar_query::{
+                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
+                PropFilterElement, TextMatchElement,
+            },
+        },
+        calendar_object::{CalendarData, CalendarObjectPropName, CalendarObjectPropWrapperName},
+    };
+
+    #[test]
+    fn calendar_query_7_8_7() {
+        const INPUT: &str = r#"
+            <?xml version="1.0" encoding="utf-8" ?>
+            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
+                <D:prop xmlns:D="DAV:">
+                    <D:getetag/>
+                    <C:calendar-data/>
+                </D:prop>
+                <C:filter>
+                <C:comp-filter name="VCALENDAR">
+                    <C:comp-filter name="VEVENT">
+                        <C:prop-filter name="ATTENDEE">
+                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
+                            <C:param-filter name="PARTSTAT">
+                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
+                            </C:param-filter>
+                        </C:prop-filter>
+                    </C:comp-filter>
+                </C:comp-filter>
+                </C:filter>
+            </C:calendar-query>
+        "#;
+
+        let report = ReportRequest::parse_str(INPUT).unwrap();
+        let calendar_query: CalendarQueryRequest =
+            if let ReportRequest::CalendarQuery(query) = report {
+                query
+            } else {
+                panic!()
+            };
+        assert_eq!(
+            calendar_query,
+            CalendarQueryRequest {
+                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
+                    vec![
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::Getetag,
+                        ),
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::CalendarData(CalendarData::default())
+                        ),
+                    ],
+                    vec![]
+                )),
+                filter: Some(FilterElement {
+                    comp_filter: CompFilterElement {
+                        is_not_defined: None,
+                        time_range: None,
+                        prop_filter: vec![],
+                        comp_filter: vec![CompFilterElement {
+                            prop_filter: vec![PropFilterElement {
+                                name: "ATTENDEE".to_owned(),
+                                text_match: Some(TextMatchElement {
+                                    collation: "i;ascii-casemap".to_owned(),
+                                    negate_condition: None
+                                }),
+                                is_not_defined: None,
+                                param_filter: vec![ParamFilterElement {
+                                    is_not_defined: None,
+                                    name: "PARTSTAT".to_owned(),
+                                    text_match: Some(TextMatchElement {
+                                        collation: "i;ascii-casemap".to_owned(),
+                                        negate_condition: None
+                                    }),
+                                }],
+                                time_range: None
+                            }],
+                            comp_filter: vec![],
+                            is_not_defined: None,
+                            name: "VEVENT".to_owned(),
+                            time_range: None
+                        }],
+                        name: "VCALENDAR".to_owned()
+                    }
+                }),
+                timezone: None,
+                timezone_id: None
+            }
+        );
+    }
+}

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

@@ -21,7 +21,7 @@ use rustical_dav::{
     },
 };
 use rustical_ical::CalendarObject;
-use rustical_store::{CalendarStore, SubscriptionStore, auth::User};
+use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use rustical_xml::{XmlDeserialize, XmlDocument};
 use sync_collection::handle_sync_collection;
 use tracing::instrument;
@@ -41,11 +41,11 @@ pub(crate) enum ReportRequest {
 }
 
 impl ReportRequest {
-    fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
+    const fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
         match &self {
-            ReportRequest::CalendarMultiget(CalendarMultigetRequest { prop, .. }) => prop,
+            Self::CalendarMultiget(CalendarMultigetRequest { prop, .. })
-            ReportRequest::CalendarQuery(CalendarQueryRequest { prop, .. }) => prop,
+            | Self::CalendarQuery(CalendarQueryRequest { prop, .. })
-            ReportRequest::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
         }
     }
 }
@@ -56,7 +56,7 @@ fn objects_response(
     path: &str,
     principal: &str,
     puri: &impl PrincipalUri,
-    user: &User,
+    user: &Principal,
     prop: &PropfindType<CalendarObjectPropWrapperName>,
 ) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
     let mut responses = Vec::new();
@@ -67,7 +67,7 @@ fn objects_response(
                 object,
                 principal: principal.to_owned(),
             }
-            .propfind(&path, prop, puri, user)?,
+            .propfind(&path, prop, None, puri, user)?,
         );
     }
 
@@ -90,7 +90,7 @@ fn objects_response(
 #[instrument(skip(cal_store))]
 pub async fn route_report_calendar<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, cal_id)): Path<(String, String)>,
-    user: User,
+    user: Principal,
     Extension(puri): Extension<CalDavPrincipalUri>,
     State(CalendarResourceService { cal_store, .. }): State<CalendarResourceService<C, S>>,
     OriginalUri(uri): OriginalUri,
@@ -184,7 +184,7 @@ mod tests {
                     "/caldav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                 ]
             })
-        )
+        );
     }
 
     #[test]
@@ -241,7 +241,7 @@ mod tests {
                 timezone: None,
                 timezone_id: None,
             })
-        )
+        );
     }
 
     #[test]
@@ -269,6 +269,6 @@ mod tests {
                     "/caldav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                 ]
             })
-        )
+        );
     }
 }

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

@@ -13,7 +13,7 @@ use rustical_dav::{
 };
 use rustical_store::{
     CalendarStore,
-    auth::User,
+    auth::Principal,
     synctoken::{format_synctoken, parse_synctoken},
 };
 
@@ -21,7 +21,7 @@ pub async fn handle_sync_collection<C: CalendarStore>(
     sync_collection: &SyncCollectionRequest<CalendarObjectPropWrapperName>,
     path: &str,
     puri: &impl PrincipalUri,
-    user: &User,
+    user: &Principal,
     principal: &str,
     cal_id: &str,
     cal_store: &C,
@@ -39,7 +39,7 @@ pub async fn handle_sync_collection<C: CalendarStore>(
                 object,
                 principal: principal.to_owned(),
             }
-            .propfind(&path, &sync_collection.prop, puri, user)?,
+            .propfind(&path, &sync_collection.prop, None, puri, user)?,
         );
     }
 

crates/caldav/src/calendar/mod.rs

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

crates/caldav/src/calendar/prop.rs

@@ -3,13 +3,13 @@ use rustical_ical::CalendarObjectType;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, From, Into)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
 pub struct SupportedCalendarComponent {
     #[xml(ty = "attr")]
     pub name: CalendarObjectType,
 }
 
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq)]
 pub struct SupportedCalendarComponentSet {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub comp: Vec<SupportedCalendarComponent>,
@@ -36,7 +36,7 @@ impl From<SupportedCalendarComponentSet> for Vec<CalendarObjectType> {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct CalendarData {
     #[xml(ty = "attr")]
     content_type: String,
@@ -53,13 +53,13 @@ impl Default for CalendarData {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, Default, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, Default, PartialEq, Eq)]
 pub struct SupportedCalendarData {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     calendar_data: CalendarData,
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
 pub enum ReportMethod {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     CalendarQuery,

crates/caldav/src/calendar/resource.rs

@@ -3,6 +3,7 @@ use crate::Error;
 use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
+use ical::IcalParser;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -12,12 +13,12 @@ use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedR
 use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
 use rustical_ical::CalDateTime;
 use rustical_store::Calendar;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
-use std::str::FromStr;
+use serde::Deserialize;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
 pub enum CalendarProp {
     // CalDAV (RFC 4791)
@@ -34,7 +35,7 @@ pub enum CalendarProp {
     CalendarTimezoneId(Option<String>),
     #[xml(ns = "rustical_dav::namespace::NS_ICAL")]
     CalendarOrder(Option<i64>),
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     SupportedCalendarComponentSet(SupportedCalendarComponentSet),
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCalendarData(SupportedCalendarData),
@@ -53,7 +54,7 @@ pub enum CalendarProp {
     MaxDateTime(String),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropWrapperName", untagged)]
 pub enum CalendarPropWrapper {
     Calendar(CalendarProp),
@@ -62,7 +63,7 @@ pub enum CalendarPropWrapper {
     Common(CommonPropertiesProp),
 }
 
-#[derive(Clone, Debug, From, Into)]
+#[derive(Clone, Debug, From, Into, Deserialize)]
 pub struct CalendarResource {
     pub cal: Calendar,
     pub read_only: bool,
@@ -70,7 +71,7 @@ pub struct CalendarResource {
 
 impl ResourceName for CalendarResource {
     fn get_name(&self) -> String {
-        self.cal.id.to_owned()
+        self.cal.id.clone()
     }
 }
 
@@ -88,14 +89,14 @@ impl SyncTokenExtension for CalendarResource {
 
 impl DavPushExtension for CalendarResource {
     fn get_topic(&self) -> String {
-        self.cal.push_topic.to_owned()
+        self.cal.push_topic.clone()
     }
 }
 
 impl Resource for CalendarResource {
     type Prop = CalendarPropWrapper;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
 
     fn is_collection(&self) -> bool {
         true
@@ -121,19 +122,23 @@ impl Resource for CalendarResource {
     fn get_prop(
         &self,
         puri: &impl PrincipalUri,
-        user: &User,
+        user: &Principal,
         prop: &CalendarPropWrapperName,
     ) -> Result<Self::Prop, Self::Error> {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                 CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.color.clone())
+                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
                 }
                 CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
-                    CalendarProp::CalendarTimezone(self.cal.timezone.clone())
+                    CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
+                        vtimezones_rs::VTIMEZONES
+                            .get(tzid)
+                            .map(|tz| (*tz).to_string())
+                    }))
                 }
                 // chrono_tz uses the IANA database
                 CalendarPropName::TimezoneServiceSet => CalendarProp::TimezoneServiceSet(
@@ -143,7 +148,7 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                 }
                 CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -151,13 +156,13 @@ impl Resource for CalendarResource {
                 CalendarPropName::SupportedCalendarData => {
                     CalendarProp::SupportedCalendarData(SupportedCalendarData::default())
                 }
-                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10000000),
+                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10_000_000),
                 CalendarPropName::SupportedReportSet => {
                     CalendarProp::SupportedReportSet(SupportedReportSet::all())
                 }
-                CalendarPropName::Source => CalendarProp::Source(
+                CalendarPropName::Source => {
-                    self.cal.subscription_url.to_owned().map(HrefElement::from),
+                    CalendarProp::Source(self.cal.subscription_url.clone().map(HrefElement::from))
-                ),
+                }
                 CalendarPropName::MinDateTime => {
                     CalendarProp::MinDateTime(CalDateTime::from(DateTime::<Utc>::MIN_UTC).format())
                 }
@@ -184,48 +189,66 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
                 CalendarProp::CalendarColor(color) => {
-                    self.cal.color = color;
+                    self.cal.meta.color = color;
                     Ok(())
                 }
                 CalendarProp::CalendarDescription(description) => {
-                    self.cal.description = description;
+                    self.cal.meta.description = description;
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
-                    // TODO: Ensure that timezone-id is also updated
+                    if let Some(tz) = timezone {
-                    self.cal.timezone = timezone;
+                        // TODO: Proper error (calendar-timezone precondition)
+                        let calendar = IcalParser::new(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(),
+                                )
+                            })?;
+
+                        let timezone = calendar.timezones.first().ok_or_else(|| {
+                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+                        })?;
+                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+                        })?;
+
+                        self.cal.timezone_id = Some(timezone.name().to_owned());
+                    }
                     Ok(())
                 }
-                CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id {
+                    if let Some(tzid) = &timezone_id
-                        // Validate timezone id
+                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
-                        chrono_tz::Tz::from_str(tzid).map_err(|_| {
+                    {
-                            rustical_dav::Error::BadRequest(format!(
+                        return Err(rustical_dav::Error::BadRequest(format!(
-                                "Invalid timezone-id: {}",
+                            "Invalid timezone-id: {tzid}"
-                                tzid
+                        )));
-                            ))
-                        })?;
-                        // TODO: Ensure that timezone is also updated (For now hope that clients play nice)
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
                 }
                 CalendarProp::CalendarOrder(order) => {
-                    self.cal.order = order.unwrap_or_default();
+                    self.cal.meta.order = order.unwrap_or_default();
                     Ok(())
                 }
                 CalendarProp::SupportedCalendarComponentSet(comp_set) => {
                     self.cal.components = comp_set.into();
                     Ok(())
                 }
-                CalendarProp::SupportedCalendarData(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::TimezoneServiceSet(_)
-                CalendarProp::MaxResourceSize(_) => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarProp::SupportedCalendarData(_)
-                CalendarProp::SupportedReportSet(_) => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarProp::MaxResourceSize(_)
-                // Converting between a calendar subscription calendar and a normal one would be weird
+                | CalendarProp::SupportedReportSet(_)
-                CalendarProp::Source(_) => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarProp::Source(_)
-                CalendarProp::MinDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarProp::MinDateTime(_)
-                CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
             },
             CalendarPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop),
             CalendarPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop),
@@ -240,36 +263,31 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
                 CalendarPropName::CalendarColor => {
-                    self.cal.color = None;
+                    self.cal.meta.color = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarDescription => {
-                    self.cal.description = None;
+                    self.cal.meta.description = None;
                     Ok(())
                 }
-                CalendarPropName::CalendarTimezone => {
+                CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
-                    self.cal.timezone = None;
-                    Ok(())
-                }
-                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::CalendarTimezoneId => {
                     self.cal.timezone_id = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarOrder => {
-                    self.cal.order = 0;
+                    self.cal.meta.order = 0;
                     Ok(())
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     Err(rustical_dav::Error::PropReadOnly)
                 }
-                CalendarPropName::SupportedCalendarData => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::TimezoneServiceSet
-                CalendarPropName::MaxResourceSize => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarPropName::SupportedCalendarData
-                CalendarPropName::SupportedReportSet => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarPropName::MaxResourceSize
-                // Converting a calendar subscription calendar into a normal one would be weird
+                | CalendarPropName::SupportedReportSet
-                CalendarPropName::Source => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarPropName::Source
-                CalendarPropName::MinDateTime => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarPropName::MinDateTime
-                CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly),
+                | CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly),
             },
             CalendarPropWrapperName::SyncToken(prop) => SyncTokenExtension::remove_prop(self, prop),
             CalendarPropWrapperName::DavPush(prop) => DavPushExtension::remove_prop(self, prop),
@@ -280,10 +298,10 @@ impl Resource for CalendarResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.cal.displayname.as_deref()
+        self.cal.meta.displayname.as_deref()
     }
     fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.displayname = name;
+        self.cal.meta.displayname = name;
         Ok(())
     }
 
@@ -291,8 +309,13 @@ impl Resource for CalendarResource {
         Some(&self.cal.principal)
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
+    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
-        if self.cal.subscription_url.is_some() || self.read_only {
+        if self.cal.subscription_url.is_some() {
+            return Ok(UserPrivilegeSet::owner_write_properties(
+                user.is_principal(&self.cal.principal),
+            ));
+        }
+        if self.read_only {
             return Ok(UserPrivilegeSet::owner_read(
                 user.is_principal(&self.cal.principal),
             ));
@@ -303,3 +326,15 @@ impl Resource for CalendarResource {
         ))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_tzdb_version() {
+        // Ensure that both chrono_tz and vzic_rs use the same tzdb version
+        assert_eq!(
+            chrono_tz::IANA_TZDB_VERSION,
+            vtimezones_rs::IANA_TZDB_VERSION
+        );
+    }
+}

crates/caldav/src/calendar/service.rs

@@ -1,4 +1,5 @@
 use crate::calendar::methods::get::route_get;
+use crate::calendar::methods::import::route_import;
 use crate::calendar::methods::mkcalendar::route_mkcalendar;
 use crate::calendar::methods::post::route_post;
 use crate::calendar::methods::report::route_report_calendar;
@@ -13,7 +14,7 @@ use axum::handler::Handler;
 use axum::response::Response;
 use futures_util::future::BoxFuture;
 use rustical_dav::resource::{AxumMethods, ResourceService};
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use rustical_store::{CalendarStore, SubscriptionStore};
 use std::convert::Infallible;
 use std::sync::Arc;
@@ -34,7 +35,7 @@ impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C
 }
 
 impl<C: CalendarStore, S: SubscriptionStore> CalendarResourceService<C, S> {
-    pub fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
+    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
         Self {
             cal_store,
             sub_store,
@@ -48,16 +49,20 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     type PathComponents = (String, String); // principal, calendar_id
     type Resource = CalendarResource;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy, webdav-push";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, webdav-push";
 
     async fn get_resource(
         &self,
         (principal, cal_id): &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Error> {
-        let calendar = self.cal_store.get_calendar(principal, cal_id).await?;
+        let calendar = self
+            .cal_store
+            .get_calendar(principal, cal_id, show_deleted)
+            .await?;
         Ok(CalendarResource {
             cal: calendar,
             read_only: self.cal_store.is_read_only(cal_id),
@@ -134,6 +139,13 @@ impl<C: CalendarStore, S: SubscriptionStore> AxumMethods for CalendarResourceSer
         })
     }
 
+    fn import() -> Option<rustical_dav::resource::MethodFunction<Self>> {
+        Some(|state, req| {
+            let mut service = Handler::with_state(route_import::<C, S>, state);
+            Box::pin(Service::call(&mut service, req))
+        })
+    }
+
     fn mkcalendar() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>>
     {
         Some(|state, req| {

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

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response xmlns="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"/>
+            <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>
+            <max-resource-size>10000000</max-resource-size>
+            <supported-report-set>
+                <supported-report>
+                    <report>
+                        <CAL:calendar-query/>
+                    </report>
+                </supported-report>
+                <supported-report>
+                    <report>
+                        <CAL:calendar-multiget/>
+                    </report>
+                </supported-report>
+                <supported-report>
+                    <report>
+                        <sync-collection/>
+                    </report>
+                </supported-report>
+            </supported-report-set>
+            <CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
+            <CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
+            <sync-token>github.com/lennart-k/rustical/ns/12</sync-token>
+            <CS:getctag>github.com/lennart-k/rustical/ns/12</CS:getctag>
+            <PUSH:transports>
+                <PUSH:web-push/>
+            </PUSH:transports>
+            <PUSH:topic>b28b41e9-8801-4fc5-ae29-8efb5fadeb36</PUSH:topic>
+            <PUSH:supported-triggers>
+                <PUSH:content-update>
+                    <depth>1</depth>
+                </PUSH:content-update>
+                <PUSH:property-update>
+                    <depth>1</depth>
+                </PUSH:property-update>
+            </PUSH:supported-triggers>
+            <resourcetype>
+                <collection/>
+                <CAL:calendar/>
+            </resourcetype>
+            <displayname>Calendar</displayname>
+            <current-user-principal>
+                <href>/caldav/principal/user/</href>
+            </current-user-principal>
+            <current-user-privilege-set>
+                <privilege>
+                    <read/>
+                </privilege>
+                <privilege>
+                    <read-acl/>
+                </privilege>
+                <privilege>
+                    <read-current-user-privilege-set/>
+                </privilege>
+            </current-user-privilege-set>
+            <owner>
+                <href>/caldav/principal/user/</href>
+            </owner>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+    </propstat>
+</response>

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

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

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

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

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

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

crates/caldav/src/calendar/tests.rs

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

crates/caldav/src/calendar_object/methods.rs

@@ -6,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, StatusCode};
+use http::{HeaderMap, Method, StatusCode};
 use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::instrument;
+use tracing::{debug, error, instrument};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -21,26 +21,33 @@ pub async fn get_event<C: CalendarStore>(
         object_id,
     }): Path<CalendarObjectPathComponents>,
     State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
-    user: User,
+    user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store.get_calendar(&principal, &calendar_id).await?;
+    let calendar = cal_store
+        .get_calendar(&principal, &calendar_id, false)
+        .await?;
     if !user.is_principal(&calendar.principal) {
         return Err(crate::Error::Unauthorized);
     }
 
     let event = cal_store
-        .get_object(&principal, &calendar_id, &object_id)
+        .get_object(&principal, &calendar_id, &object_id, false)
         .await?;
 
     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());
-    Ok(resp.body(Body::new(event.get_ics().to_owned())).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(event.get_ics().to_owned())).unwrap())
+    }
 }
 
 #[instrument(skip(cal_store))]
@@ -51,7 +58,7 @@ pub async fn put_event<C: CalendarStore>(
         object_id,
     }): Path<CalendarObjectPathComponents>,
     State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
-    user: User,
+    user: Principal,
     mut if_none_match: Option<TypedHeader<IfNoneMatch>>,
     header_map: HeaderMap,
     body: String,
@@ -71,12 +78,18 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(object_id, body) {
+    let Ok(object) = CalendarObject::from_ics(body.clone()) else {
-        Ok(obj) => obj,
+        debug!("invalid calendar data:\n{body}");
-        Err(_) => {
+        return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
-            return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
-        }
     };
+    if object.get_id() != object_id {
+        error!(
+            "Calendar object UID and file name not matching: UID={}, filename={}",
+            object.get_id(),
+            object_id
+        );
+        return Err(Error::PreconditionFailed(Precondition::MatchingUid));
+    }
     cal_store
         .put_object(principal, calendar_id, object, overwrite)
         .await?;

crates/caldav/src/calendar_object/prop.rs

@@ -2,7 +2,7 @@ use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_ical::UtcDateTime;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropName")]
 pub enum CalendarObjectProp {
     // WebDAV (RFC 2518)
@@ -17,7 +17,7 @@ pub enum CalendarObjectProp {
     CalendarData(String),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropWrapperName", untagged)]
 pub enum CalendarObjectPropWrapper {
     CalendarObject(CalendarObjectProp),
@@ -25,7 +25,7 @@ pub enum CalendarObjectPropWrapper {
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, Hash)]
-pub(crate) struct ExpandElement {
+pub struct ExpandElement {
     #[xml(ty = "attr")]
     pub(crate) start: UtcDateTime,
     #[xml(ty = "attr")]

crates/caldav/src/calendar_object/resource.rs

@@ -1,4 +1,7 @@
-use super::prop::*;
+use super::prop::{
+    CalendarData, CalendarObjectProp, CalendarObjectPropName, CalendarObjectPropWrapper,
+    CalendarObjectPropWrapperName,
+};
 use crate::Error;
 use derive_more::derive::{From, Into};
 use rustical_dav::{
@@ -8,7 +11,7 @@ use rustical_dav::{
     xml::Resourcetype,
 };
 use rustical_ical::CalendarObject;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 
 #[derive(Clone, From, Into)]
 pub struct CalendarObjectResource {
@@ -25,7 +28,7 @@ impl ResourceName for CalendarObjectResource {
 impl Resource for CalendarObjectResource {
     type Prop = CalendarObjectPropWrapper;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
 
     fn is_collection(&self) -> bool {
         false
@@ -38,7 +41,7 @@ impl Resource for CalendarObjectResource {
     fn get_prop(
         &self,
         puri: &impl PrincipalUri,
-        user: &User,
+        user: &Principal,
         prop: &CalendarObjectPropWrapperName,
     ) -> Result<Self::Prop, Self::Error> {
         Ok(match prop {
@@ -69,7 +72,6 @@ impl Resource for CalendarObjectResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        // TODO: Extract summary from object
         None
     }
 
@@ -81,7 +83,7 @@ impl Resource for CalendarObjectResource {
         Some(self.object.get_etag())
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
+    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
         Ok(UserPrivilegeSet::owner_only(
             user.is_principal(&self.principal),
         ))

crates/caldav/src/calendar_object/service.rs

@@ -9,7 +9,7 @@ use async_trait::async_trait;
 use axum::{extract::Request, handler::Handler, response::Response};
 use futures_util::future::BoxFuture;
 use rustical_dav::resource::{AxumMethods, ResourceService};
-use rustical_store::{CalendarStore, auth::User};
+use rustical_store::{CalendarStore, auth::Principal};
 use serde::{Deserialize, Deserializer};
 use std::{convert::Infallible, sync::Arc};
 use tower::Service;
@@ -35,7 +35,7 @@ impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
 }
 
 impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub fn new(cal_store: Arc<C>) -> Self {
+    pub const fn new(cal_store: Arc<C>) -> Self {
         Self { cal_store }
     }
 }
@@ -46,7 +46,7 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
     type Resource = CalendarObjectResource;
     type MemberType = CalendarObjectResource;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
@@ -58,10 +58,11 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
             calendar_id,
             object_id,
         }: &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let object = self
             .cal_store
-            .get_object(principal, calendar_id, object_id)
+            .get_object(principal, calendar_id, object_id, show_deleted)
             .await?;
         Ok(CalendarObjectResource {
             object,
@@ -105,9 +106,8 @@ where
     D: Deserializer<'de>,
 {
     let name: String = Deserialize::deserialize(deserializer)?;
-    if let Some(object_id) = name.strip_suffix(".ics") {
+    name.strip_suffix(".ics").map_or_else(
-        Ok(object_id.to_owned())
+        || Err(serde::de::Error::custom("Missing .ics extension")),
-    } else {
+        |object_id| Ok(object_id.to_owned()),
-        Err(serde::de::Error::custom("Missing .ics extension"))
+    )
-    }
 }

crates/caldav/src/error.rs

@@ -12,6 +12,8 @@ pub enum Precondition {
     #[error("valid-calendar-data")]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     ValidCalendarData,
+    #[error("matching-uid")]
+    MatchingUid,
 }
 
 impl IntoResponse for Precondition {
@@ -60,29 +62,35 @@ pub enum Error {
 }
 
 impl Error {
+    #[must_use]
     pub fn status_code(&self) -> StatusCode {
         match self {
-            Error::StoreError(err) => match err {
+            Self::StoreError(err) => match err {
                 rustical_store::Error::NotFound => StatusCode::NOT_FOUND,
                 rustical_store::Error::AlreadyExists => StatusCode::CONFLICT,
                 rustical_store::Error::ReadOnly => StatusCode::FORBIDDEN,
                 _ => StatusCode::INTERNAL_SERVER_ERROR,
             },
-            Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::DavError(err) => StatusCode::try_from(err.status_code().as_u16())
-            Error::DavError(err) => StatusCode::try_from(err.status_code().as_u16())
                 .expect("Just converting between versions"),
-            Error::Unauthorized => StatusCode::UNAUTHORIZED,
+            Self::Unauthorized => StatusCode::UNAUTHORIZED,
-            Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
+            Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
-            Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
-            Error::NotFound => StatusCode::NOT_FOUND,
+            Self::NotFound => StatusCode::NOT_FOUND,
-            Error::IcalError(err) => err.status_code(),
+            Self::IcalError(err) => err.status_code(),
-            Error::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
+            Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
         }
     }
 }
 
 impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
+        if matches!(
+            self.status_code(),
+            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
+        ) {
+            error!("{self}");
+        }
         (self.status_code(), self.to_string()).into_response()
     }
 }

crates/caldav/src/lib.rs

@@ -1,12 +1,12 @@
-use axum::response::Redirect;
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-use axum::routing::any;
+#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::{Extension, Router};
 use derive_more::Constructor;
 use principal::PrincipalResourceService;
 use rustical_dav::resource::{PrincipalUri, ResourceService};
 use rustical_dav::resources::RootResourceService;
 use rustical_store::auth::middleware::AuthenticationLayer;
-use rustical_store::auth::{AuthenticationProvider, User};
+use rustical_store::auth::{AuthenticationProvider, Principal};
 use rustical_store::{CalendarStore, SubscriptionStore};
 use std::sync::Arc;
 
@@ -14,7 +14,6 @@ pub mod calendar;
 pub mod calendar_object;
 pub mod error;
 pub mod principal;
-
 pub use error::Error;
 
 #[derive(Debug, Clone, Constructor)]
@@ -34,23 +33,18 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
     auth_provider: Arc<AP>,
     store: Arc<C>,
     subscription_store: Arc<S>,
+    simplified_home_set: bool,
 ) -> Router {
-    let principal_service = PrincipalResourceService {
+    Router::new().nest(
-        auth_provider: auth_provider.clone(),
+        prefix,
-        sub_store: subscription_store.clone(),
+        RootResourceService::<_, Principal, CalDavPrincipalUri>::new(PrincipalResourceService {
-        cal_store: store.clone(),
+            auth_provider: auth_provider.clone(),
-    };
+            sub_store: subscription_store,
-
+            cal_store: store,
-    Router::new()
+            simplified_home_set,
-        .nest(
+        })
-            prefix,
+        .axum_router()
-            RootResourceService::<_, User, CalDavPrincipalUri>::new(principal_service.clone())
+        .layer(AuthenticationLayer::new(auth_provider))
-                .axum_router()
+        .layer(Extension(CalDavPrincipalUri(prefix))),
-                .layer(AuthenticationLayer::new(auth_provider))
+    )
-                .layer(Extension(CalDavPrincipalUri(prefix))),
-        )
-        .route(
-            "/.well-known/caldav",
-            any(async || Redirect::permanent(prefix)),
-        )
 }

crates/caldav/src/principal/mod.rs

@@ -5,29 +5,33 @@ use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{
     GroupMemberSet, GroupMembership, Resourcetype, ResourcetypeInner, SupportedReportSet,
 };
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 
 mod service;
 pub use service::*;
 mod prop;
 pub use prop::*;
+#[cfg(test)]
+pub mod tests;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct PrincipalResource {
-    principal: User,
+    principal: Principal,
     members: Vec<String>,
+    // If true only return the principal as the calendar home set, otherwise also groups
+    simplified_home_set: bool,
 }
 
 impl ResourceName for PrincipalResource {
     fn get_name(&self) -> String {
-        self.principal.id.to_owned()
+        self.principal.id.clone()
     }
 }
 
 impl Resource for PrincipalResource {
     type Prop = PrincipalPropWrapper;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
 
     fn is_collection(&self) -> bool {
         true
@@ -37,18 +41,13 @@ impl Resource for PrincipalResource {
         Resourcetype(&[
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "principal"),
-            // https://github.com/apple/ccs-calendarserver/blob/13c706b985fb728b9aab42dc0fef85aae21921c3/doc/Extensions/caldav-proxy.txt
-            ResourcetypeInner(
-                Some(rustical_dav::namespace::NS_CALENDARSERVER),
-                "calendar-proxy-write",
-            ),
         ])
     }
 
     fn get_prop(
         &self,
         puri: &impl PrincipalUri,
-        user: &User,
+        user: &Principal,
         prop: &PrincipalPropWrapperName,
     ) -> Result<Self::Prop, Self::Error> {
         let principal_url = puri.principal_uri(&self.principal.id);
@@ -57,14 +56,22 @@ impl Resource for PrincipalResource {
             PrincipalPropWrapperName::Principal(prop) => {
                 PrincipalPropWrapper::Principal(match prop {
                     PrincipalPropName::CalendarUserType => {
-                        PrincipalProp::CalendarUserType(self.principal.principal_type.to_owned())
+                        PrincipalProp::CalendarUserType(self.principal.principal_type.clone())
                     }
                     PrincipalPropName::PrincipalUrl => {
                         PrincipalProp::PrincipalUrl(principal_url.into())
                     }
-                    PrincipalPropName::CalendarHomeSet => {
+                    PrincipalPropName::CalendarHomeSet => PrincipalProp::CalendarHomeSet(
-                        PrincipalProp::CalendarHomeSet(principal_url.into())
+                        CalendarHomeSet(if self.simplified_home_set {
-                    }
+                            vec![principal_url.into()]
+                        } else {
+                            self.principal
+                                .memberships()
+                                .iter()
+                                .map(|principal| puri.principal_uri(principal).into())
+                                .collect()
+                        }),
+                    ),
                     PrincipalPropName::CalendarUserAddressSet => {
                         PrincipalProp::CalendarUserAddressSet(principal_url.into())
                     }
@@ -113,8 +120,8 @@ impl Resource for PrincipalResource {
         Some(&self.principal.id)
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
+    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
-        Ok(UserPrivilegeSet::owner_read(
+        Ok(UserPrivilegeSet::owner_only(
             user.is_principal(&self.principal.id),
         ))
     }

crates/caldav/src/principal/prop.rs

@@ -2,11 +2,11 @@ use rustical_dav::{
     extensions::CommonPropertiesProp,
     xml::{GroupMemberSet, GroupMembership, HrefElement, SupportedReportSet},
 };
-use rustical_store::auth::user::PrincipalType;
+use rustical_store::auth::PrincipalType;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // Scheduling Extensions to CalDAV (RFC 6638)
@@ -16,13 +16,13 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     // PrincipalCollectionSet(HrefElement),
@@ -31,17 +31,20 @@ pub enum PrincipalProp {
 
     // CalDAV (RFC 4791)
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    CalendarHomeSet(HrefElement),
+    CalendarHomeSet(CalendarHomeSet),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
     Principal(PrincipalProp),
     Common(CommonPropertiesProp),
 }
 
-#[derive(XmlSerialize, PartialEq, Clone, VariantArray)]
+#[derive(XmlSerialize, PartialEq, Eq, Clone, VariantArray)]
 pub enum ReportMethod {
     // We don't actually support principal-match
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/caldav/src/principal/service.rs

@@ -5,7 +5,7 @@ use crate::{CalDavPrincipalUri, Error};
 use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::resource::{AxumMethods, ResourceService};
-use rustical_store::auth::{AuthenticationProvider, User};
+use rustical_store::auth::{AuthenticationProvider, Principal};
 use rustical_store::{CalendarStore, SubscriptionStore};
 use std::sync::Arc;
 
@@ -18,6 +18,8 @@ pub struct PrincipalResourceService<
     pub(crate) auth_provider: Arc<AP>,
     pub(crate) sub_store: Arc<S>,
     pub(crate) cal_store: Arc<CS>,
+    // If true only return the principal as the calendar home set, otherwise also groups
+    pub(crate) simplified_home_set: bool,
 }
 
 impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
@@ -28,6 +30,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
             auth_provider: self.auth_provider.clone(),
             sub_store: self.sub_store.clone(),
             cal_store: self.cal_store.clone(),
+            simplified_home_set: self.simplified_home_set,
         }
     }
 }
@@ -40,14 +43,15 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
     type MemberType = CalendarResource;
     type Resource = PrincipalResource;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
 
     async fn get_resource(
         &self,
         (principal,): &Self::PathComponents,
+        _show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let user = self
             .auth_provider
@@ -57,6 +61,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
         Ok(PrincipalResource {
             members: self.auth_provider.list_members(&user.id).await?,
             principal: user,
+            simplified_home_set: self.simplified_home_set,
         })
     }
 

crates/caldav/src/principal/tests.rs

@@ -0,0 +1,92 @@
+use std::sync::Arc;
+
+use crate::{
+    CalDavPrincipalUri,
+    principal::{PrincipalResource, PrincipalResourceService},
+};
+use rstest::rstest;
+use rustical_dav::resource::{Resource, ResourceService};
+use rustical_store::auth::{Principal, PrincipalType::Individual};
+use rustical_store_sqlite::{
+    SqliteStore,
+    calendar_store::SqliteCalendarStore,
+    principal_store::SqlitePrincipalStore,
+    tests::{get_test_calendar_store, get_test_principal_store, get_test_subscription_store},
+};
+use rustical_xml::XmlSerializeRoot;
+
+#[rstest]
+#[tokio::test]
+async fn test_principal_resource(
+    #[from(get_test_calendar_store)]
+    #[future]
+    cal_store: SqliteCalendarStore,
+    #[from(get_test_principal_store)]
+    #[future]
+    auth_provider: SqlitePrincipalStore,
+    #[from(get_test_subscription_store)]
+    #[future]
+    sub_store: SqliteStore,
+) {
+    let service = PrincipalResourceService {
+        cal_store: Arc::new(cal_store.await),
+        sub_store: Arc::new(sub_store.await),
+        auth_provider: Arc::new(auth_provider.await),
+        simplified_home_set: false,
+    };
+
+    // We don't have any calendars here
+    assert!(
+        service
+            .get_members(&("user".to_owned(),))
+            .await
+            .unwrap()
+            .is_empty()
+    );
+
+    assert!(matches!(
+        service
+            .get_resource(&("invalid-user".to_owned(),), true)
+            .await,
+        Err(crate::Error::NotFound)
+    ));
+
+    let _principal_resource = service
+        .get_resource(&("user".to_owned(),), true)
+        .await
+        .unwrap();
+}
+
+#[tokio::test]
+async fn test_propfind() {
+    let propfind = PrincipalResource::parse_propfind(
+        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+    )
+    .unwrap();
+
+    let principal = Principal {
+        id: "user".to_string(),
+        displayname: None,
+        principal_type: Individual,
+        password: None,
+        memberships: vec!["group".to_string()],
+    };
+
+    let resource = PrincipalResource {
+        principal: principal.clone(),
+        members: vec![],
+        simplified_home_set: false,
+    };
+
+    let response = resource
+        .propfind(
+            &format!("/caldav/principal/{}", principal.id),
+            &propfind.prop,
+            propfind.include.as_ref(),
+            &CalDavPrincipalUri("/caldav"),
+            &principal,
+        )
+        .unwrap();
+
+    let _output = response.serialize_to_string().unwrap();
+}

crates/carddav/src/address_object/methods.rs

@@ -7,12 +7,13 @@ use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::TypedHeader;
 use axum_extra::headers::{ContentType, ETag, HeaderMapExt, IfNoneMatch};
+use http::Method;
 use http::{HeaderMap, StatusCode};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
 use rustical_ical::AddressObject;
 use rustical_store::AddressbookStore;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use std::str::FromStr;
 use tracing::instrument;
 
@@ -24,7 +25,8 @@ pub async fn get_object<AS: AddressbookStore>(
         object_id,
     }): Path<AddressObjectPathComponents>,
     State(AddressObjectResourceService { addr_store }): State<AddressObjectResourceService<AS>>,
-    user: User,
+    user: Principal,
+    method: Method,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
         return Err(Error::Unauthorized);
@@ -49,7 +51,11 @@ pub async fn get_object<AS: AddressbookStore>(
     let hdrs = resp.headers_mut().unwrap();
     hdrs.typed_insert(ETag::from_str(&object.get_etag()).unwrap());
     hdrs.typed_insert(ContentType::from_str("text/vcard").unwrap());
-    Ok(resp.body(Body::new(object.get_vcf().to_owned())).unwrap())
+    if matches!(method, Method::HEAD) {
+        Ok(resp.body(Body::empty()).unwrap())
+    } else {
+        Ok(resp.body(Body::new(object.get_vcf().to_owned())).unwrap())
+    }
 }
 
 #[instrument(skip(addr_store, body))]
@@ -60,7 +66,7 @@ pub async fn put_object<AS: AddressbookStore>(
         object_id,
     }): Path<AddressObjectPathComponents>,
     State(AddressObjectResourceService { addr_store }): State<AddressObjectResourceService<AS>>,
-    user: User,
+    user: Principal,
     mut if_none_match: Option<TypedHeader<IfNoneMatch>>,
     header_map: HeaderMap,
     body: String,

crates/carddav/src/address_object/prop.rs

@@ -1,7 +1,7 @@
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressObjectPropName")]
 pub enum AddressObjectProp {
     // WebDAV (RFC 2518)
@@ -15,7 +15,7 @@ pub enum AddressObjectProp {
     AddressData(String),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressObjectPropWrapperName", untagged)]
 pub enum AddressObjectPropWrapper {
     AddressObject(AddressObjectProp),

crates/carddav/src/address_object/resource.rs

@@ -13,7 +13,7 @@ use rustical_dav::{
     xml::Resourcetype,
 };
 use rustical_ical::AddressObject;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 
 #[derive(Clone, From, Into)]
 pub struct AddressObjectResource {
@@ -30,7 +30,7 @@ impl ResourceName for AddressObjectResource {
 impl Resource for AddressObjectResource {
     type Prop = AddressObjectPropWrapper;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
 
     fn is_collection(&self) -> bool {
         false
@@ -43,7 +43,7 @@ impl Resource for AddressObjectResource {
     fn get_prop(
         &self,
         puri: &impl PrincipalUri,
-        user: &User,
+        user: &Principal,
         prop: &AddressObjectPropWrapperName,
     ) -> Result<Self::Prop, Self::Error> {
         Ok(match prop {
@@ -78,7 +78,7 @@ impl Resource for AddressObjectResource {
         Some(self.object.get_etag())
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
+    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
         Ok(UserPrivilegeSet::owner_only(
             user.is_principal(&self.principal),
         ))

crates/carddav/src/address_object/service.rs

@@ -5,7 +5,7 @@ use axum::{extract::Request, handler::Handler, response::Response};
 use derive_more::derive::Constructor;
 use futures_util::future::BoxFuture;
 use rustical_dav::resource::{AxumMethods, ResourceService};
-use rustical_store::{AddressbookStore, auth::User};
+use rustical_store::{AddressbookStore, auth::Principal};
 use serde::{Deserialize, Deserializer};
 use std::{convert::Infallible, sync::Arc};
 use tower::Service;
@@ -37,7 +37,7 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
     type Resource = AddressObjectResource;
     type MemberType = AddressObjectResource;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
     type PrincipalUri = CardDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, addressbook";
@@ -49,10 +49,11 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
             addressbook_id,
             object_id,
         }: &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let object = self
             .addr_store
-            .get_object(principal, addressbook_id, object_id, false)
+            .get_object(principal, addressbook_id, object_id, show_deleted)
             .await?;
         Ok(AddressObjectResource {
             object,
@@ -97,9 +98,8 @@ where
     D: Deserializer<'de>,
 {
     let name: String = Deserialize::deserialize(deserializer)?;
-    if let Some(object_id) = name.strip_suffix(".vcf") {
+    name.strip_suffix(".vcf").map_or_else(
-        Ok(object_id.to_owned())
+        || Err(serde::de::Error::custom("Missing .vcf extension")),
-    } else {
+        |object_id| Ok(object_id.to_owned()),
-        Err(serde::de::Error::custom("Missing .vcf extension"))
+    )
-    }
 }

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

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

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

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

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

@@ -4,11 +4,11 @@ use axum::{
     response::{IntoResponse, Response},
 };
 use http::StatusCode;
-use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::User};
+use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
 use rustical_xml::{XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct Resourcetype {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     addressbook: Option<()>,
@@ -16,25 +16,25 @@ pub struct Resourcetype {
     collection: Option<()>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct MkcolAddressbookProp {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     resourcetype: Option<Resourcetype>,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     displayname: Option<String>,
-    #[xml(rename = b"addressbook-description")]
+    #[xml(rename = "addressbook-description")]
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     description: Option<String>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct PropElement<T: XmlDeserialize> {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     prop: T,
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -44,7 +44,7 @@ struct MkcolRequest {
 #[instrument(skip(addr_store))]
 pub async fn route_mkcol<AS: AddressbookStore, S: SubscriptionStore>(
     Path((principal, addressbook_id)): Path<(String, String)>,
-    user: User,
+    user: Principal,
     State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
     body: String,
 ) -> Result<Response, Error> {
@@ -53,13 +53,13 @@ pub async fn route_mkcol<AS: AddressbookStore, S: SubscriptionStore>(
     }
 
     let mut request = MkcolRequest::parse_str(&body)?.set.prop;
-    if let Some("") = request.displayname.as_deref() {
+    if request.displayname.as_deref() == Some("") {
-        request.displayname = None
+        request.displayname = None;
     }
 
     let addressbook = Addressbook {
-        id: addressbook_id.to_owned(),
+        id: addressbook_id.clone(),
-        principal: principal.to_owned(),
+        principal: principal.clone(),
         displayname: request.displayname,
         description: request.description,
         deleted_at: None,
@@ -88,15 +88,8 @@ pub async fn route_mkcol<AS: AddressbookStore, S: SubscriptionStore>(
         }
     }
 
-    match addr_store.insert_addressbook(addressbook).await {
+    addr_store.insert_addressbook(addressbook).await?;
-        // TODO: The spec says we should return a mkcol-response.
+    Ok(StatusCode::CREATED.into_response())
-        // However, it works without one but breaks on iPadOS when using an empty one :)
-        Ok(()) => Ok(StatusCode::CREATED.into_response()),
-        Err(err) => {
-            dbg!(err.to_string());
-            Err(err.into())
-        }
-    }
 }
 
 #[cfg(test)]
@@ -134,6 +127,6 @@ mod tests {
                     }
                 }
             }
-        )
+        );
     }
 }

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

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

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

@@ -7,7 +7,7 @@ use http::{HeaderMap, HeaderValue, StatusCode, header};
 use rustical_dav::privileges::UserPrivilege;
 use rustical_dav::resource::Resource;
 use rustical_dav_push::register::PushRegister;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use rustical_store::{AddressbookStore, Subscription, SubscriptionStore};
 use rustical_xml::XmlDocument;
 use tracing::instrument;
@@ -15,7 +15,7 @@ use tracing::instrument;
 #[instrument(skip(resource_service))]
 pub async fn route_post<AS: AddressbookStore, S: SubscriptionStore>(
     Path((principal, addr_id)): Path<(String, String)>,
-    user: User,
+    user: Principal,
     State(resource_service): State<AddressbookResourceService<AS, S>>,
     body: String,
 ) -> Result<Response, Error> {
@@ -45,12 +45,12 @@ pub async fn route_post<AS: AddressbookStore, S: SubscriptionStore>(
     };
 
     let subscription = Subscription {
-        id: sub_id.to_owned(),
+        id: sub_id.clone(),
         push_resource: request
             .subscription
             .web_push_subscription
             .push_resource
-            .to_owned(),
+            .clone(),
         topic: addressbook_resource.0.push_topic,
         expiration: expires.naive_local(),
         public_key: request

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

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

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

@@ -10,10 +10,10 @@ use rustical_dav::{
     xml::{MultistatusElement, PropfindType, multistatus::ResponseElement},
 };
 use rustical_ical::AddressObject;
-use rustical_store::{AddressbookStore, auth::User};
+use rustical_store::{AddressbookStore, auth::Principal};
 use rustical_xml::XmlDeserialize;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 pub struct AddressbookMultigetRequest {
@@ -35,7 +35,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
 
     for href in &addressbook_multiget.href {
         if let Some(filename) = href.strip_prefix(path) {
-            let filename = filename.trim_start_matches("/");
+            let filename = filename.trim_start_matches('/');
             if let Some(object_id) = filename.strip_suffix(".vcf") {
                 match store
                     .get_object(principal, addressbook_id, object_id, false)
@@ -44,26 +44,25 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
                     Ok(object) => result.push(object),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
                     Err(err) => return Err(err.into()),
-                };
+                }
             } else {
                 not_found.push(href.to_owned());
-                continue;
             }
         } else {
             not_found.push(href.to_owned());
-            continue;
         }
     }
 
     Ok((result, not_found))
 }
 
+#[allow(clippy::too_many_arguments)]
 pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
     addr_multiget: &AddressbookMultigetRequest,
     prop: &PropfindType<AddressObjectPropWrapperName>,
     path: &str,
     puri: &impl PrincipalUri,
-    user: &User,
+    user: &Principal,
     principal: &str,
     cal_id: &str,
     addr_store: &AS,
@@ -80,7 +79,7 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
                 object,
                 principal: principal.to_owned(),
             }
-            .propfind(&path, prop, puri, user)?,
+            .propfind(&path, prop, None, puri, user)?,
         );
     }
 

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

@@ -9,7 +9,7 @@ use axum::{
     response::IntoResponse,
 };
 use rustical_dav::xml::{PropfindType, sync_collection::SyncCollectionRequest};
-use rustical_store::{AddressbookStore, SubscriptionStore, auth::User};
+use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
 use rustical_xml::{XmlDeserialize, XmlDocument};
 use sync_collection::handle_sync_collection;
 use tracing::instrument;
@@ -26,10 +26,10 @@ pub(crate) enum ReportRequest {
 }
 
 impl ReportRequest {
-    fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
+    const fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
         match self {
-            ReportRequest::AddressbookMultiget(AddressbookMultigetRequest { prop, .. }) => prop,
+            Self::AddressbookMultiget(AddressbookMultigetRequest { prop, .. })
-            ReportRequest::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
         }
     }
 }
@@ -37,7 +37,7 @@ impl ReportRequest {
 #[instrument(skip(addr_store))]
 pub async fn route_report_addressbook<AS: AddressbookStore, S: SubscriptionStore>(
     Path((principal, addressbook_id)): Path<(String, String)>,
-    user: User,
+    user: Principal,
     OriginalUri(uri): OriginalUri,
     Extension(puri): Extension<CardDavPrincipalUri>,
     State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
@@ -101,7 +101,7 @@ mod tests {
         assert_eq!(
             report_request,
             ReportRequest::SyncCollection(SyncCollectionRequest {
-                sync_token: "".to_owned(),
+                sync_token: String::new(),
                 sync_level: SyncLevel::One,
                 prop: rustical_dav::xml::PropfindType::Prop(PropElement(
                     vec![AddressObjectPropWrapperName::AddressObject(
@@ -111,7 +111,7 @@ mod tests {
                 )),
                 limit: None
             })
-        )
+        );
     }
 
     #[test]
@@ -142,6 +142,6 @@ mod tests {
                     "/carddav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                 ]
             })
-        )
+        );
     }
 }

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

@@ -13,7 +13,7 @@ use rustical_dav::{
 };
 use rustical_store::{
     AddressbookStore,
-    auth::User,
+    auth::Principal,
     synctoken::{format_synctoken, parse_synctoken},
 };
 
@@ -21,7 +21,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
     sync_collection: &SyncCollectionRequest<AddressObjectPropWrapperName>,
     path: &str,
     puri: &impl PrincipalUri,
-    user: &User,
+    user: &Principal,
     principal: &str,
     addressbook_id: &str,
     addr_store: &AS,
@@ -39,7 +39,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
                 object,
                 principal: principal.to_owned(),
             }
-            .propfind(&path, &sync_collection.prop, puri, user)?,
+            .propfind(&path, &sync_collection.prop, None, puri, user)?,
         );
     }
 

crates/carddav/src/addressbook/prop.rs

@@ -6,7 +6,7 @@ use rustical_dav_push::DavPushExtensionProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropName")]
 pub enum AddressbookProp {
     // CardDAV (RFC 6352)
@@ -20,7 +20,7 @@ pub enum AddressbookProp {
     MaxResourceSize(i64),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropWrapperName", untagged)]
 pub enum AddressbookPropWrapper {
     Addressbook(AddressbookProp),
@@ -29,7 +29,7 @@ pub enum AddressbookPropWrapper {
     Common(CommonPropertiesProp),
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct AddressDataType {
     #[xml(ty = "attr")]
     pub content_type: &'static str,
@@ -37,7 +37,7 @@ pub struct AddressDataType {
     pub version: &'static str,
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct SupportedAddressData {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
     address_data_type: &'static [AddressDataType],
@@ -60,7 +60,7 @@ impl Default for SupportedAddressData {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
 pub enum ReportMethod {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     AddressbookMultiget,

crates/carddav/src/addressbook/resource.rs

@@ -10,14 +10,14 @@ use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::DavPushExtension;
 use rustical_store::Addressbook;
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 
 #[derive(Clone, Debug, From, Into)]
 pub struct AddressbookResource(pub(crate) Addressbook);
 
 impl ResourceName for AddressbookResource {
     fn get_name(&self) -> String {
-        self.0.id.to_owned()
+        self.0.id.clone()
     }
 }
 
@@ -29,14 +29,14 @@ impl SyncTokenExtension for AddressbookResource {
 
 impl DavPushExtension for AddressbookResource {
     fn get_topic(&self) -> String {
-        self.0.push_topic.to_owned()
+        self.0.push_topic.clone()
     }
 }
 
 impl Resource for AddressbookResource {
     type Prop = AddressbookPropWrapper;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
 
     fn is_collection(&self) -> bool {
         true
@@ -52,20 +52,20 @@ impl Resource for AddressbookResource {
     fn get_prop(
         &self,
         puri: &impl PrincipalUri,
-        user: &User,
+        user: &Principal,
         prop: &AddressbookPropWrapperName,
     ) -> Result<Self::Prop, Self::Error> {
         Ok(match prop {
             AddressbookPropWrapperName::Addressbook(prop) => {
                 AddressbookPropWrapper::Addressbook(match prop {
                     AddressbookPropName::MaxResourceSize => {
-                        AddressbookProp::MaxResourceSize(10000000)
+                        AddressbookProp::MaxResourceSize(10_000_000)
                     }
                     AddressbookPropName::SupportedReportSet => {
                         AddressbookProp::SupportedReportSet(SupportedReportSet::all())
                     }
                     AddressbookPropName::AddressbookDescription => {
-                        AddressbookProp::AddressbookDescription(self.0.description.to_owned())
+                        AddressbookProp::AddressbookDescription(self.0.description.clone())
                     }
                     AddressbookPropName::SupportedAddressData => {
                         AddressbookProp::SupportedAddressData(SupportedAddressData::default())
@@ -92,9 +92,11 @@ impl Resource for AddressbookResource {
                     self.0.description = description;
                     Ok(())
                 }
-                AddressbookProp::MaxResourceSize(_) => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookProp::MaxResourceSize(_)
-                AddressbookProp::SupportedReportSet(_) => Err(rustical_dav::Error::PropReadOnly),
+                | AddressbookProp::SupportedReportSet(_)
-                AddressbookProp::SupportedAddressData(_) => Err(rustical_dav::Error::PropReadOnly),
+                | AddressbookProp::SupportedAddressData(_) => {
+                    Err(rustical_dav::Error::PropReadOnly)
+                }
             },
             AddressbookPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop),
             AddressbookPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop),
@@ -112,9 +114,11 @@ impl Resource for AddressbookResource {
                     self.0.description = None;
                     Ok(())
                 }
-                AddressbookPropName::MaxResourceSize => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookPropName::MaxResourceSize
-                AddressbookPropName::SupportedReportSet => Err(rustical_dav::Error::PropReadOnly),
+                | AddressbookPropName::SupportedReportSet
-                AddressbookPropName::SupportedAddressData => Err(rustical_dav::Error::PropReadOnly),
+                | AddressbookPropName::SupportedAddressData => {
+                    Err(rustical_dav::Error::PropReadOnly)
+                }
             },
             AddressbookPropWrapperName::SyncToken(prop) => {
                 SyncTokenExtension::remove_prop(self, prop)
@@ -138,7 +142,7 @@ impl Resource for AddressbookResource {
         Some(&self.0.principal)
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
+    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
         Ok(UserPrivilegeSet::owner_only(
             user.is_principal(&self.0.principal),
         ))

crates/carddav/src/addressbook/service.rs

@@ -3,8 +3,8 @@ use super::methods::report::route_report_addressbook;
 use crate::address_object::AddressObjectResourceService;
 use crate::address_object::resource::AddressObjectResource;
 use crate::addressbook::methods::get::route_get;
+use crate::addressbook::methods::import::route_import;
 use crate::addressbook::methods::post::route_post;
-use crate::addressbook::methods::put::route_put;
 use crate::addressbook::resource::AddressbookResource;
 use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
@@ -14,7 +14,7 @@ use axum::handler::Handler;
 use axum::response::Response;
 use futures_util::future::BoxFuture;
 use rustical_dav::resource::{AxumMethods, ResourceService};
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 use rustical_store::{AddressbookStore, SubscriptionStore};
 use std::convert::Infallible;
 use std::sync::Arc;
@@ -26,7 +26,7 @@ pub struct AddressbookResourceService<AS: AddressbookStore, S: SubscriptionStore
 }
 
 impl<A: AddressbookStore, S: SubscriptionStore> AddressbookResourceService<A, S> {
-    pub fn new(addr_store: Arc<A>, sub_store: Arc<S>) -> Self {
+    pub const fn new(addr_store: Arc<A>, sub_store: Arc<S>) -> Self {
         Self {
             addr_store,
             sub_store,
@@ -51,7 +51,7 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
     type PathComponents = (String, String); // principal, addressbook_id
     type Resource = AddressbookResource;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
     type PrincipalUri = CardDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, addressbook, webdav-push";
@@ -59,10 +59,11 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
     async fn get_resource(
         &self,
         (principal, addressbook_id): &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Error> {
         let addressbook = self
             .addr_store
-            .get_addressbook(principal, addressbook_id, false)
+            .get_addressbook(principal, addressbook_id, show_deleted)
             .await
             .map_err(|_e| Error::NotFound)?;
         Ok(addressbook.into())
@@ -138,9 +139,9 @@ impl<AS: AddressbookStore, S: SubscriptionStore> AxumMethods for AddressbookReso
         })
     }
 
-    fn put() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
+    fn import() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
         Some(|state, req| {
-            let mut service = Handler::with_state(route_put::<AS, S>, state);
+            let mut service = Handler::with_state(route_import::<AS, S>, state);
             Box::pin(Service::call(&mut service, req))
         })
     }

crates/carddav/src/error.rs

@@ -30,20 +30,20 @@ pub enum Error {
 }
 
 impl Error {
-    pub fn status_code(&self) -> StatusCode {
+    #[must_use]
+    pub const fn status_code(&self) -> StatusCode {
         match self {
-            Error::StoreError(err) => match err {
+            Self::StoreError(err) => match err {
                 rustical_store::Error::NotFound => StatusCode::NOT_FOUND,
                 rustical_store::Error::AlreadyExists => StatusCode::CONFLICT,
                 rustical_store::Error::ReadOnly => StatusCode::FORBIDDEN,
                 _ => StatusCode::INTERNAL_SERVER_ERROR,
             },
-            Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::DavError(err) => err.status_code(),
-            Error::DavError(err) => err.status_code(),
+            Self::Unauthorized => StatusCode::UNAUTHORIZED,
-            Error::Unauthorized => StatusCode::UNAUTHORIZED,
+            Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
-            Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
+            Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
-            Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::NotFound => StatusCode::NOT_FOUND,
-            Error::NotFound => StatusCode::NOT_FOUND,
             Self::IcalError(err) => err.status_code(),
         }
     }

crates/carddav/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::response::Redirect;
 use axum::routing::any;
 use axum::{Extension, Router};
@@ -9,7 +11,7 @@ use rustical_dav::resources::RootResourceService;
 use rustical_store::auth::middleware::AuthenticationLayer;
 use rustical_store::{
     AddressbookStore, SubscriptionStore,
-    auth::{AuthenticationProvider, User},
+    auth::{AuthenticationProvider, Principal},
 };
 use std::sync::Arc;
 
@@ -36,15 +38,12 @@ pub fn carddav_router<AP: AuthenticationProvider, A: AddressbookStore, S: Subscr
     store: Arc<A>,
     subscription_store: Arc<S>,
 ) -> Router {
-    let principal_service = PrincipalResourceService::new(
+    let principal_service =
-        store.clone(),
+        PrincipalResourceService::new(store, auth_provider.clone(), subscription_store);
-        auth_provider.clone(),
-        subscription_store.clone(),
-    );
     Router::new()
         .nest(
             prefix,
-            RootResourceService::<_, User, CardDavPrincipalUri>::new(principal_service.clone())
+            RootResourceService::<_, Principal, CardDavPrincipalUri>::new(principal_service)
                 .axum_router()
                 .layer(AuthenticationLayer::new(auth_provider))
                 .layer(Extension(CardDavPrincipalUri(prefix))),

crates/carddav/src/principal/mod.rs

@@ -5,7 +5,7 @@ use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{
     GroupMemberSet, GroupMembership, HrefElement, Resourcetype, ResourcetypeInner,
 };
-use rustical_store::auth::User;
+use rustical_store::auth::Principal;
 
 mod service;
 pub use service::*;
@@ -14,20 +14,20 @@ pub use prop::*;
 
 #[derive(Debug, Clone)]
 pub struct PrincipalResource {
-    principal: User,
+    principal: Principal,
     members: Vec<String>,
 }
 
 impl ResourceName for PrincipalResource {
     fn get_name(&self) -> String {
-        self.principal.id.to_owned()
+        self.principal.id.clone()
     }
 }
 
 impl Resource for PrincipalResource {
     type Prop = PrincipalPropWrapper;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
 
     fn is_collection(&self) -> bool {
         true
@@ -43,7 +43,7 @@ impl Resource for PrincipalResource {
     fn get_prop(
         &self,
         puri: &impl PrincipalUri,
-        user: &User,
+        user: &Principal,
         prop: &PrincipalPropWrapperName,
     ) -> Result<Self::Prop, Self::Error> {
         let principal_href = HrefElement::new(puri.principal_uri(&self.principal.id));
@@ -53,7 +53,13 @@ impl Resource for PrincipalResource {
                 PrincipalPropWrapper::Principal(match prop {
                     PrincipalPropName::PrincipalUrl => PrincipalProp::PrincipalUrl(principal_href),
                     PrincipalPropName::AddressbookHomeSet => {
-                        PrincipalProp::AddressbookHomeSet(principal_href)
+                        PrincipalProp::AddressbookHomeSet(AddressbookHomeSet(
+                            self.principal
+                                .memberships()
+                                .iter()
+                                .map(|principal| puri.principal_uri(principal).into())
+                                .collect(),
+                        ))
                     }
                     PrincipalPropName::PrincipalAddress => PrincipalProp::PrincipalAddress(None),
                     PrincipalPropName::GroupMembership => {
@@ -99,7 +105,7 @@ impl Resource for PrincipalResource {
         Some(&self.principal.id)
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
+    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
         Ok(UserPrivilegeSet::owner_only(
             user.is_principal(&self.principal.id),
         ))

crates/carddav/src/principal/prop.rs

@@ -4,30 +4,33 @@ use rustical_dav::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
-    #[xml(rename = b"principal-URL")]
+    #[xml(rename = "principal-URL")]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalCollectionSet(HrefElement),
 
     // CardDAV (RFC 6352)
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
-    AddressbookHomeSet(HrefElement),
+    AddressbookHomeSet(AddressbookHomeSet),
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     PrincipalAddress(Option<HrefElement>),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
     Principal(PrincipalProp),

crates/carddav/src/principal/service.rs

@@ -5,7 +5,7 @@ use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::resource::{AxumMethods, ResourceService};
-use rustical_store::auth::{AuthenticationProvider, User};
+use rustical_store::auth::{AuthenticationProvider, Principal};
 use rustical_store::{AddressbookStore, SubscriptionStore};
 use std::sync::Arc;
 
@@ -34,7 +34,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Clon
 impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore>
     PrincipalResourceService<A, AP, S>
 {
-    pub fn new(addr_store: Arc<A>, auth_provider: Arc<AP>, sub_store: Arc<S>) -> Self {
+    pub const fn new(addr_store: Arc<A>, auth_provider: Arc<AP>, sub_store: Arc<S>) -> Self {
         Self {
             addr_store,
             auth_provider,
@@ -51,7 +51,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
     type MemberType = AddressbookResource;
     type Resource = PrincipalResource;
     type Error = Error;
-    type Principal = User;
+    type Principal = Principal;
     type PrincipalUri = CardDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, addressbook";
@@ -59,6 +59,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
     async fn get_resource(
         &self,
         (principal,): &Self::PathComponents,
+        _show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let user = self
             .auth_provider

crates/dav/Cargo.toml

@@ -11,7 +11,6 @@ publish = false
 axum.workspace = true
 tower.workspace = true
 axum-extra.workspace = true
-
 rustical_xml.workspace = true
 async-trait.workspace = true
 futures-util.workspace = true

crates/dav/src/error.rs

@@ -1,3 +1,4 @@
+use axum::body::Body;
 use http::StatusCode;
 use rustical_xml::XmlError;
 use thiserror::Error;
@@ -34,9 +35,9 @@ pub enum Error {
 }
 
 impl Error {
-    pub fn status_code(&self) -> StatusCode {
+    #[must_use]
+    pub const fn status_code(&self) -> StatusCode {
         match self {
-            Self::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
             Self::BadRequest(_) => StatusCode::BAD_REQUEST,
             Self::Unauthorized => StatusCode::UNAUTHORIZED,
@@ -49,9 +50,9 @@ impl Error {
                 | XmlError::InvalidValue(_) => StatusCode::UNPROCESSABLE_ENTITY,
                 _ => StatusCode::BAD_REQUEST,
             },
-            Error::PropReadOnly => StatusCode::CONFLICT,
+            Self::PropReadOnly => StatusCode::CONFLICT,
-            Error::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
+            Self::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
-            Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::InternalError | Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::Forbidden => StatusCode::FORBIDDEN,
         }
     }
@@ -59,10 +60,15 @@ impl Error {
 
 impl axum::response::IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
-        use axum::body::Body;
+        if matches!(
+            self.status_code(),
+            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
+        ) {
+            error!("{self}");
+        }
 
         let mut resp = axum::response::Response::builder().status(self.status_code());
-        if matches!(&self, &Error::Unauthorized) {
+        if matches!(&self, &Self::Unauthorized) {
             resp.headers_mut()
                 .expect("This must always work")
                 .insert("WWW-Authenticate", "Basic".parse().unwrap());

crates/dav/src/extensions/common.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "CommonPropertiesPropName")]
 pub enum CommonPropertiesProp {
     // WebDAV (RFC 2518)
@@ -39,9 +39,9 @@ pub trait CommonPropertiesExtension: Resource {
             CommonPropertiesPropName::Resourcetype => {
                 CommonPropertiesProp::Resourcetype(self.get_resourcetype())
             }
-            CommonPropertiesPropName::Displayname => {
+            CommonPropertiesPropName::Displayname => CommonPropertiesProp::Displayname(
-                CommonPropertiesProp::Displayname(self.get_displayname().map(|s| s.to_string()))
+                self.get_displayname().map(std::string::ToString::to_string),
-            }
+            ),
             CommonPropertiesPropName::CurrentUserPrincipal => {
                 CommonPropertiesProp::CurrentUserPrincipal(
                     principal_uri.principal_uri(principal.get_id()).into(),

crates/dav/src/extensions/synctoken.rs

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

crates/dav/src/header/depth.rs

@@ -19,7 +19,7 @@ impl IntoResponse for InvalidDepthHeader {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Depth {
     Zero,
     One,
@@ -29,9 +29,9 @@ pub enum Depth {
 impl ValueSerialize for Depth {
     fn serialize(&self) -> String {
         match self {
-            Depth::Zero => "0",
+            Self::Zero => "0",
-            Depth::One => "1",
+            Self::One => "1",
-            Depth::Infinity => "infinity",
+            Self::Infinity => "infinity",
         }
         .to_owned()
     }
@@ -55,9 +55,9 @@ impl TryFrom<&[u8]> for Depth {
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
         match value {
-            b"0" => Ok(Depth::Zero),
+            b"0" => Ok(Self::Zero),
-            b"1" => Ok(Depth::One),
+            b"1" => Ok(Self::One),
-            b"Infinity" | b"infinity" => Ok(Depth::Infinity),
+            b"Infinity" | b"infinity" => Ok(Self::Infinity),
             _ => Err(InvalidDepthHeader),
         }
     }
@@ -85,10 +85,11 @@ impl<S: Send + Sync> FromRequestParts<S> for Depth {
         parts: &mut axum::http::request::Parts,
         _state: &S,
     ) -> Result<Self, Self::Rejection> {
-        if let Some(depth_header) = parts.headers.get("Depth") {
+        parts
-            depth_header.as_bytes().try_into()
+            .headers
-        } else {
+            .get("Depth")
-            Ok(Self::Zero)
+            .map_or(Ok(Self::Zero), |depth_header| {
-        }
+                depth_header.as_bytes().try_into()
+            })
     }
 }

crates/dav/src/header/overwrite.rs

@@ -14,16 +14,12 @@ impl IntoResponse for InvalidOverwriteHeader {
     }
 }
 
-#[derive(Debug, PartialEq, Default)]
+#[derive(Debug, PartialEq, Eq)]
-pub enum Overwrite {
+pub struct Overwrite(pub bool);
-    #[default]
-    T,
-    F,
-}
 
-impl Overwrite {
+impl Default for Overwrite {
-    pub fn is_true(&self) -> bool {
+    fn default() -> Self {
-        matches!(self, Self::T)
+        Self(true)
     }
 }
 
@@ -34,11 +30,10 @@ impl<S: Send + Sync> FromRequestParts<S> for Overwrite {
         parts: &mut axum::http::request::Parts,
         _state: &S,
     ) -> Result<Self, Self::Rejection> {
-        if let Some(overwrite_header) = parts.headers.get("Overwrite") {
+        parts.headers.get("Overwrite").map_or_else(
-            overwrite_header.as_bytes().try_into()
+            || Ok(Self::default()),
-        } else {
+            |overwrite_header| overwrite_header.as_bytes().try_into(),
-            Ok(Self::default())
+        )
-        }
     }
 }
 
@@ -47,9 +42,48 @@ impl TryFrom<&[u8]> for Overwrite {
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
         match value {
-            b"T" => Ok(Overwrite::T),
+            b"T" => Ok(Self(true)),
-            b"F" => Ok(Overwrite::F),
+            b"F" => Ok(Self(false)),
             _ => Err(InvalidOverwriteHeader),
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use axum::{extract::FromRequestParts, response::IntoResponse};
+    use http::Request;
+
+    use crate::header::Overwrite;
+
+    #[tokio::test]
+    async fn test_overwrite_default() {
+        let request = Request::put("asd").body(()).unwrap();
+        let (mut parts, ()) = request.into_parts();
+        let overwrite = Overwrite::from_request_parts(&mut parts, &())
+            .await
+            .unwrap();
+        assert_eq!(
+            Overwrite(true),
+            overwrite,
+            "By default we want to overwrite!"
+        );
+    }
+
+    #[test]
+    fn test_overwrite() {
+        assert_eq!(
+            Overwrite(true),
+            Overwrite::try_from(b"T".as_slice()).unwrap()
+        );
+        assert_eq!(
+            Overwrite(false),
+            Overwrite::try_from(b"F".as_slice()).unwrap()
+        );
+        if let Err(err) = Overwrite::try_from(b"aslkdjlad".as_slice()) {
+            let _ = err.into_response();
+        } else {
+            unreachable!("should return error")
+        }
+    }
+}

crates/dav/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc)]
 pub mod error;
 pub mod extensions;
 pub mod header;

crates/dav/src/privileges.rs

@@ -1,8 +1,10 @@
+use itertools::Itertools;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use std::collections::{HashMap, HashSet};
 
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq)]
+// https://datatracker.ietf.org/doc/html/rfc3744
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq, PartialOrd, Ord)]
 pub enum UserPrivilege {
     Read,
     Write,
@@ -15,47 +17,55 @@ pub enum UserPrivilege {
 }
 
 impl XmlSerialize for UserPrivilegeSet {
-    fn serialize<W: std::io::Write>(
+    fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
-        writer: &mut quick_xml::Writer<W>,
+        writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
-            #[xml(rename = b"privilege", flatten)]
+            #[xml(rename = "privilege", flatten)]
             privileges: Vec<UserPrivilege>,
         }
 
         FakeUserPrivilegeSet {
-            privileges: self.privileges.iter().cloned().collect(),
+            privileges: self.privileges.iter().cloned().sorted().collect(),
         }
         .serialize(ns, tag, namespaces, writer)
     }
 
-    #[allow(refining_impl_trait)]
     fn attributes<'a>(&self) -> Option<Vec<quick_xml::events::attributes::Attribute<'a>>> {
         None
     }
 }
 
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct UserPrivilegeSet {
     privileges: HashSet<UserPrivilege>,
 }
 
 impl UserPrivilegeSet {
+    #[must_use]
     pub fn has(&self, privilege: &UserPrivilege) -> bool {
+        if (privilege == &UserPrivilege::WriteProperties
+            || privilege == &UserPrivilege::WriteContent)
+            && self.privileges.contains(&UserPrivilege::Write)
+        {
+            return true;
+        }
         self.privileges.contains(privilege) || self.privileges.contains(&UserPrivilege::All)
     }
 
+    #[must_use]
     pub fn all() -> Self {
         Self {
             privileges: HashSet::from([UserPrivilege::All]),
         }
     }
 
+    #[must_use]
     pub fn owner_only(is_owner: bool) -> Self {
         if is_owner {
             Self::all()
@@ -64,6 +74,7 @@ impl UserPrivilegeSet {
         }
     }
 
+    #[must_use]
     pub fn owner_read(is_owner: bool) -> Self {
         if is_owner {
             Self::read_only()
@@ -72,6 +83,17 @@ impl UserPrivilegeSet {
         }
     }
 
+    #[must_use]
+    pub fn owner_write_properties(is_owner: bool) -> Self {
+        // Content is read-only but we can write properties
+        if is_owner {
+            Self::write_properties()
+        } else {
+            Self::default()
+        }
+    }
+
+    #[must_use]
     pub fn read_only() -> Self {
         Self {
             privileges: HashSet::from([
@@ -81,6 +103,18 @@ impl UserPrivilegeSet {
             ]),
         }
     }
+
+    #[must_use]
+    pub fn write_properties() -> Self {
+        Self {
+            privileges: HashSet::from([
+                UserPrivilege::Read,
+                UserPrivilege::WriteProperties,
+                UserPrivilege::ReadAcl,
+                UserPrivilege::ReadCurrentUserPrivilegeSet,
+            ]),
+        }
+    }
 }
 
 impl<const N: usize> From<[UserPrivilege; N]> for UserPrivilegeSet {

crates/dav/src/resource/axum_methods.rs

@@ -9,41 +9,49 @@ pub type MethodFunction<State> =
 
 pub trait AxumMethods: Sized + Send + Sync + 'static {
     #[inline]
+    #[must_use]
     fn report() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn get() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
-    fn head() -> Option<MethodFunction<Self>> {
+    #[must_use]
-        None
-    }
-
-    #[inline]
     fn post() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn mkcol() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn mkcalendar() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn put() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
+    fn import() -> Option<MethodFunction<Self>> {
+        None
+    }
+
+    #[inline]
+    #[must_use]
     fn allow_header() -> Allow {
         let mut allow = vec![
             Method::from_str("PROPFIND").unwrap(),
@@ -58,8 +66,6 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         }
         if Self::get().is_some() {
             allow.push(Method::GET);
-        }
-        if Self::head().is_some() {
             allow.push(Method::HEAD);
         }
         if Self::post().is_some() {
@@ -74,6 +80,9 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         if Self::put().is_some() {
             allow.push(Method::PUT);
         }
+        if Self::import().is_some() {
+            allow.push(Method::from_str("IMPORT").unwrap());
+        }
 
         allow.into_iter().collect()
     }

crates/dav/src/resource/axum_service.rs

@@ -23,7 +23,7 @@ pub struct AxumService<RS: ResourceService + AxumMethods> {
 }
 
 impl<RS: ResourceService + AxumMethods> AxumService<RS> {
-    pub fn new(resource_service: RS) -> Self {
+    pub const fn new(resource_service: RS) -> Self {
         Self { resource_service }
     }
 }
@@ -72,16 +72,11 @@ where
                     return svc(self.resource_service.clone(), req);
                 }
             }
-            "GET" => {
+            "GET" | "HEAD" => {
                 if let Some(svc) = RS::get() {
                     return svc(self.resource_service.clone(), req);
                 }
             }
-            "HEAD" => {
-                if let Some(svc) = RS::head() {
-                    return svc(self.resource_service.clone(), req);
-                }
-            }
             "POST" => {
                 if let Some(svc) = RS::post() {
                     return svc(self.resource_service.clone(), req);
@@ -102,8 +97,13 @@ where
                     return svc(self.resource_service.clone(), req);
                 }
             }
+            "IMPORT" => {
+                if let Some(svc) = RS::import() {
+                    return svc(self.resource_service.clone(), req);
+                }
+            }
             _ => {}
-        };
+        }
         Box::pin(async move {
             Ok(Response::builder()
                 .status(StatusCode::METHOD_NOT_ALLOWED)

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

@@ -12,12 +12,12 @@ use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
-pub(crate) async fn axum_route_copy<R: ResourceService>(
+pub async fn axum_route_copy<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     depth: Option<Depth>,
     principal: R::Principal,
-    overwrite: Overwrite,
+    Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub(crate) async fn axum_route_copy<R: ResourceService>(
             .map_err(|_| crate::Error::Forbidden)?;
 
         if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
+            .copy_resource(&path, &dest_path, &principal, overwrite)
             .await?
         {
             // Overwritten

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

@@ -7,7 +7,7 @@ use axum_extra::TypedHeader;
 use headers::{IfMatch, IfNoneMatch};
 use http::HeaderMap;
 
-pub(crate) async fn axum_route_delete<R: ResourceService>(
+pub async fn axum_route_delete<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     principal: R::Principal,
@@ -24,8 +24,7 @@ pub(crate) async fn axum_route_delete<R: ResourceService>(
     }
     let no_trash = header_map
         .get("X-No-Trashbin")
-        .map(|val| matches!(val.to_str(), Ok("1")))
+        .is_some_and(|val| matches!(val.to_str(), Ok("1")));
-        .unwrap_or(false);
     route_delete(
         &path,
         &principal,
@@ -45,10 +44,11 @@ pub async fn route_delete<R: ResourceService>(
     if_match: Option<IfMatch>,
     if_none_match: Option<IfNoneMatch>,
 ) -> Result<(), R::Error> {
-    let resource = resource_service.get_resource(path_components).await?;
+    let resource = resource_service.get_resource(path_components, true).await?;
 
+    // Kind of a bodge since we don't get unbind from the parent
     let privileges = resource.get_user_privileges(principal)?;
-    if !privileges.has(&UserPrivilege::Write) {
+    if !privileges.has(&UserPrivilege::WriteProperties) {
         return Err(Error::Unauthorized.into());
     }
 
@@ -59,11 +59,11 @@ pub async fn route_delete<R: ResourceService>(
             return Err(crate::Error::PreconditionFailed.into());
         }
     }
-    if let Some(if_none_match) = if_none_match {
+    if let Some(if_none_match) = if_none_match
-        if resource.satisfies_if_none_match(&if_none_match) {
+        && resource.satisfies_if_none_match(&if_none_match)
-            // Precondition failed
+    {
-            return Err(crate::Error::PreconditionFailed.into());
+        // Precondition failed
-        }
+        return Err(crate::Error::PreconditionFailed.into());
     }
     resource_service
         .delete_resource(path_components, !no_trash)

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

@@ -4,8 +4,8 @@ mod mv;
 mod propfind;
 mod proppatch;
 
-pub(crate) use copy::axum_route_copy;
+pub use copy::axum_route_copy;
-pub(crate) use delete::axum_route_delete;
+pub use delete::axum_route_delete;
-pub(crate) use mv::axum_route_move;
+pub use mv::axum_route_move;
-pub(crate) use propfind::axum_route_propfind;
+pub use propfind::axum_route_propfind;
-pub(crate) use proppatch::axum_route_proppatch;
+pub use proppatch::axum_route_proppatch;

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

@@ -12,12 +12,12 @@ use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
-pub(crate) async fn axum_route_move<R: ResourceService>(
+pub async fn axum_route_move<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     depth: Option<Depth>,
     principal: R::Principal,
-    overwrite: Overwrite,
+    Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub(crate) async fn axum_route_move<R: ResourceService>(
             .map_err(|_| crate::Error::Forbidden)?;
 
         if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
+            .copy_resource(&path, &dest_path, &principal, overwrite)
             .await?
         {
             // Overwritten

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

@@ -6,11 +6,7 @@ use crate::resource::Resource;
 use crate::resource::ResourceName;
 use crate::resource::ResourceService;
 use crate::xml::MultistatusElement;
-use crate::xml::PropfindElement;
-use crate::xml::PropfindType;
 use axum::extract::{Extension, OriginalUri, Path, State};
-use rustical_xml::PropName;
-use rustical_xml::XmlDocument;
 use tracing::instrument;
 
 type RSMultistatus<R> = MultistatusElement<
@@ -19,7 +15,7 @@ type RSMultistatus<R> = MultistatusElement<
 >;
 
 #[instrument(skip(path, resource_service, puri))]
-pub(crate) async fn axum_route_propfind<R: ResourceService>(
+pub async fn axum_route_propfind<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     depth: Depth,
@@ -40,7 +36,7 @@ pub(crate) async fn axum_route_propfind<R: ResourceService>(
     .await
 }
 
-pub(crate) async fn route_propfind<R: ResourceService>(
+pub async fn route_propfind<R: ResourceService>(
     path_components: &R::PathComponents,
     path: &str,
     body: &str,
@@ -49,43 +45,39 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     resource_service: &R,
     puri: &impl PrincipalUri,
 ) -> Result<RSMultistatus<R>, R::Error> {
-    let resource = resource_service.get_resource(path_components).await?;
+    let resource = resource_service
+        .get_resource(path_components, false)
+        .await?;
     let privileges = resource.get_user_privileges(principal)?;
     if !privileges.has(&UserPrivilege::Read) {
         return Err(Error::Unauthorized.into());
     }
 
     // A request body is optional. If empty we MUST return all props
-    let propfind_self: PropfindElement<<<R::Resource as Resource>::Prop as PropName>::Names> =
+    let propfind_self = R::Resource::parse_propfind(body).map_err(Error::XmlError)?;
-        if !body.is_empty() {
+    let propfind_member = R::MemberType::parse_propfind(body).map_err(Error::XmlError)?;
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-            }
-        };
-    let propfind_member: PropfindElement<<<R::MemberType as Resource>::Prop as PropName>::Names> =
-        if !body.is_empty() {
-            PropfindElement::parse_str(body).map_err(Error::XmlError)?
-        } else {
-            PropfindElement {
-                prop: PropfindType::Allprop,
-            }
-        };
 
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {
+        // TODO: authorization check for member resources
         for member in resource_service.get_members(path_components).await? {
             member_responses.push(member.propfind(
                 &format!("{}/{}", path.trim_end_matches('/'), member.get_name()),
                 &propfind_member.prop,
+                propfind_member.include.as_ref(),
                 puri,
                 principal,
             )?);
         }
     }
 
-    let response = resource.propfind(path, &propfind_self.prop, puri, principal)?;
+    let response = resource.propfind(
+        path,
+        &propfind_self.prop,
+        propfind_self.include.as_ref(),
+        puri,
+        principal,
+    )?;
 
     Ok(MultistatusElement {
         responses: vec![response],

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

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

crates/dav/src/resource/mod.rs

@@ -1,15 +1,16 @@
 use crate::Principal;
 use crate::privileges::UserPrivilegeSet;
 use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
-use crate::xml::{PropElement, PropfindType, Resourcetype};
+use crate::xml::{PropElement, PropfindElement, PropfindType, Resourcetype};
 use crate::xml::{TagList, multistatus::ResponseElement};
 use headers::{ETag, IfMatch, IfNoneMatch};
 use http::StatusCode;
 use itertools::Itertools;
 use quick_xml::name::Namespace;
 pub use resource_service::ResourceService;
-use rustical_xml::{EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlSerialize};
+use rustical_xml::{
-use std::collections::HashSet;
+    EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
+};
 use std::str::FromStr;
 
 mod axum_methods;
@@ -41,6 +42,7 @@ pub trait Resource: Clone + Send + 'static {
 
     fn get_resourcetype(&self) -> Resourcetype;
 
+    #[must_use]
     fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
         Self::Prop::variant_names()
     }
@@ -74,27 +76,27 @@ pub trait Resource: Clone + Send + 'static {
     }
 
     fn satisfies_if_match(&self, if_match: &IfMatch) -> bool {
-        if let Some(etag) = self.get_etag() {
+        self.get_etag().map_or_else(
-            if let Ok(etag) = ETag::from_str(&etag) {
+            || if_match.is_any(),
-                if_match.precondition_passes(&etag)
+            |etag| {
-            } else {
+                ETag::from_str(&etag).map_or_else(
-                if_match.is_any()
+                    |_| if_match.is_any(),
-            }
+                    |etag| if_match.precondition_passes(&etag),
-        } else {
+                )
-            if_match.is_any()
+            },
-        }
+        )
     }
 
     fn satisfies_if_none_match(&self, if_none_match: &IfNoneMatch) -> bool {
-        if let Some(etag) = self.get_etag() {
+        self.get_etag().map_or_else(
-            if let Ok(etag) = ETag::from_str(&etag) {
+            || if_none_match != &IfNoneMatch::any(),
-                if_none_match.precondition_passes(&etag)
+            |etag| {
-            } else {
+                ETag::from_str(&etag).map_or_else(
-                if_none_match != &IfNoneMatch::any()
+                    |_| if_none_match != &IfNoneMatch::any(),
-            }
+                    |etag| if_none_match.precondition_passes(&etag),
-        } else {
+                )
-            if_none_match != &IfNoneMatch::any()
+            },
-        }
+        )
     }
 
     fn get_user_privileges(
@@ -102,10 +104,24 @@ pub trait Resource: Clone + Send + 'static {
         principal: &Self::Principal,
     ) -> Result<UserPrivilegeSet, Self::Error>;
 
+    fn parse_propfind(
+        body: &str,
+    ) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
+        if body.is_empty() {
+            Ok(PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            })
+        } else {
+            PropfindElement::parse_str(body)
+        }
+    }
+
     fn propfind(
         &self,
         path: &str,
         prop: &PropfindType<<Self::Prop as PropName>::Names>,
+        include: Option<&PropElement<<Self::Prop as PropName>::Names>>,
         principal_uri: &impl PrincipalUri,
         principal: &Self::Principal,
     ) -> Result<ResponseElement<Self::Prop>, Self::Error> {
@@ -115,36 +131,40 @@ pub trait Resource: Clone + Send + 'static {
             path.push('/');
         }
 
-        // TODO: Support include element
+        let (mut props, mut invalid_props): (Vec<<Self::Prop as PropName>::Names>, Vec<_>) =
-        let (props, invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) = match prop
+            match prop {
-        {
+                PropfindType::Propname => {
-            PropfindType::Propname => {
+                    let props = Self::list_props()
-                let props = Self::list_props()
+                        .into_iter()
-                    .into_iter()
+                        .map(|(ns, tag)| (ns.map(NamespaceOwned::from), tag.to_string()))
-                    .map(|(ns, tag)| (ns.map(NamespaceOwned::from), tag.to_string()))
+                        .collect_vec();
-                    .collect_vec();
 
-                return Ok(ResponseElement {
+                    return Ok(ResponseElement {
-                    href: path.to_owned(),
+                        href: path.clone(),
-                    propstat: vec![PropstatWrapper::TagList(PropstatElement {
+                        propstat: vec![PropstatWrapper::TagList(PropstatElement {
-                        prop: TagList::from(props),
+                            prop: TagList::from(props),
-                        status: StatusCode::OK,
+                            status: StatusCode::OK,
-                    })],
+                        })],
-                    ..Default::default()
+                        ..Default::default()
-                });
+                    });
-            }
+                }
-            PropfindType::Allprop => (
+                PropfindType::Allprop => (
-                Self::list_props()
+                    Self::list_props()
-                    .iter()
+                        .iter()
-                    .map(|(_ns, name)| <Self::Prop as PropName>::Names::from_str(name).unwrap())
+                        .map(|(_ns, name)| <Self::Prop as PropName>::Names::from_str(name).unwrap())
-                    .collect(),
+                        .collect(),
-                vec![],
+                    vec![],
-            ),
+                ),
-            PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
+                PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
-                valid_tags.iter().cloned().collect(),
+                    valid_tags.iter().unique().cloned().collect(),
-                invalid_tags.to_owned(),
+                    invalid_tags.to_owned(),
-            ),
+                ),
-        };
+            };
+
+        if let Some(PropElement(valid_tags, invalid_tags)) = include {
+            props.extend(valid_tags.clone());
+            invalid_props.extend(invalid_tags.to_owned());
+        }
 
         let prop_responses = props
             .into_iter()
@@ -162,7 +182,7 @@ pub trait Resource: Clone + Send + 'static {
             }));
         }
         Ok(ResponseElement {
-            href: path.to_owned(),
+            href: path.clone(),
             propstat: propstats,
             ..Default::default()
         })

crates/dav/src/resource/resource_service.rs

@@ -34,7 +34,8 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
 
     async fn get_resource(
         &self,
-        _path: &Self::PathComponents,
+        path: &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error>;
 
     async fn save_resource(
@@ -75,10 +76,7 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
         Err(crate::Error::Forbidden.into())
     }
 
-    fn axum_service(self) -> AxumService<Self>
+    fn axum_service(self) -> AxumService<Self> {
-    where
-        Self: AxumMethods,
-    {
         AxumService::new(self)
     }
 

crates/dav/src/resources/mod.rs

@@ -1,3 +1,72 @@
 pub mod root;
 
 pub use root::{RootResource, RootResourceService};
+
+#[cfg(test)]
+pub mod test {
+    use crate::{
+        Error, Principal,
+        extensions::{CommonPropertiesExtension, CommonPropertiesProp},
+        namespace::NS_DAV,
+        privileges::UserPrivilegeSet,
+        resource::{PrincipalUri, Resource},
+        xml::{Resourcetype, ResourcetypeInner},
+    };
+
+    #[derive(Debug, Clone)]
+    pub struct TestPrincipal(pub String);
+
+    impl Principal for TestPrincipal {
+        fn get_id(&self) -> &str {
+            &self.0
+        }
+    }
+
+    impl Resource for TestPrincipal {
+        type Prop = CommonPropertiesProp;
+        type Error = Error;
+        type Principal = Self;
+
+        fn is_collection(&self) -> bool {
+            true
+        }
+
+        fn get_resourcetype(&self) -> crate::xml::Resourcetype {
+            Resourcetype(&[ResourcetypeInner(Some(NS_DAV), "collection")])
+        }
+
+        fn get_prop(
+            &self,
+            principal_uri: &impl crate::resource::PrincipalUri,
+            principal: &Self::Principal,
+            prop: &<Self::Prop as rustical_xml::PropName>::Names,
+        ) -> Result<Self::Prop, Self::Error> {
+            <Self as CommonPropertiesExtension>::get_prop(self, principal_uri, principal, prop)
+        }
+
+        fn get_displayname(&self) -> Option<&str> {
+            Some(&self.0)
+        }
+
+        fn get_user_privileges(
+            &self,
+            principal: &Self::Principal,
+        ) -> Result<UserPrivilegeSet, Self::Error> {
+            Ok(UserPrivilegeSet::owner_only(
+                principal.get_id() == self.get_id(),
+            ))
+        }
+    }
+
+    #[derive(Debug, Clone)]
+    pub struct TestPrincipalUri;
+
+    impl PrincipalUri for TestPrincipalUri {
+        fn principal_collection(&self) -> String {
+            "/".to_owned()
+        }
+        fn principal_uri(&self, principal: &str) -> String {
+            format!("/{principal}/")
+        }
+    }
+}

crates/dav/src/resources/root.rs

@@ -63,7 +63,7 @@ pub struct RootResourceService<PRS: ResourceService + Clone, P: Principal, PURI:
 impl<PRS: ResourceService + Clone, P: Principal, PURI: PrincipalUri>
     RootResourceService<PRS, P, PURI>
 {
-    pub fn new(principal_resource_service: PRS) -> Self {
+    pub const fn new(principal_resource_service: PRS) -> Self {
         Self(principal_resource_service, PhantomData, PhantomData)
     }
 }
@@ -86,7 +86,11 @@ where
 
     const DAV_HEADER: &str = "1, 3, access-control";
 
-    async fn get_resource(&self, _: &()) -> Result<Self::Resource, Self::Error> {
+    async fn get_resource(
+        &self,
+        (): &(),
+        _show_deleted: bool,
+    ) -> Result<Self::Resource, Self::Error> {
         Ok(RootResource::<PRS::Resource, P>::default())
     }
 
@@ -101,3 +105,33 @@ impl<PRS: ResourceService<Principal = P> + Clone, P: Principal, PURI: PrincipalU
     for RootResourceService<PRS, P, PURI>
 {
 }
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        resource::Resource,
+        resources::{
+            RootResource,
+            test::{TestPrincipal, TestPrincipalUri},
+        },
+    };
+
+    #[test]
+    fn test_root_resource() {
+        let resource = RootResource::<TestPrincipal, TestPrincipal>::default();
+        let propfind = RootResource::<TestPrincipal, TestPrincipal>::parse_propfind(
+            r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+        )
+        .unwrap();
+
+        let _response = resource
+            .propfind(
+                "/",
+                &propfind.prop,
+                propfind.include.as_ref(),
+                &TestPrincipalUri,
+                &TestPrincipal("user".to_owned()),
+            )
+            .unwrap();
+    }
+}

crates/dav/src/xml/error.rs

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

crates/dav/src/xml/group.rs

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

crates/dav/src/xml/href.rs

@@ -1,14 +1,15 @@
 use derive_more::From;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, Debug, Clone, From, PartialEq)]
+#[derive(XmlDeserialize, XmlSerialize, Debug, Clone, From, PartialEq, Eq)]
 pub struct HrefElement {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub href: String,
 }
 
 impl HrefElement {
-    pub fn new(href: String) -> Self {
+    #[must_use]
+    pub const fn new(href: String) -> Self {
         Self { href }
     }
 }

crates/dav/src/xml/multistatus.rs

@@ -1,4 +1,5 @@
 use crate::xml::TagList;
+use headers::{CacheControl, ContentType, HeaderMapExt};
 use http::StatusCode;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
@@ -18,14 +19,15 @@ pub struct PropstatElement<PropType: XmlSerialize> {
     pub status: StatusCode,
 }
 
-fn xml_serialize_status<W: ::std::io::Write>(
+#[allow(clippy::trivially_copy_pass_by_ref)]
+fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
-    writer: &mut quick_xml::Writer<W>,
+    writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
-    XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
+    XmlSerialize::serialize(&format!("HTTP/1.1 {status}"), ns, tag, namespaces, writer)
 }
 
 #[derive(XmlSerialize)]
@@ -38,8 +40,15 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // RFC 2518
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
-#[derive(XmlSerialize)]
+#[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
+#[xml(ns_prefix(
+    crate::namespace::NS_DAV = "",
+    crate::namespace::NS_CARDDAV = "CARD",
+    crate::namespace::NS_CALDAV = "CAL",
+    crate::namespace::NS_CALENDARSERVER = "CS",
+    crate::namespace::NS_DAVPUSH = "PUSH"
+))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
     #[xml(serialize_with = "xml_serialize_optional_status")]
@@ -48,15 +57,16 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub propstat: Vec<PropstatWrapper<PropstatType>>,
 }
 
-fn xml_serialize_optional_status<W: ::std::io::Write>(
+#[allow(clippy::trivially_copy_pass_by_ref, clippy::ref_option)]
+fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
-    writer: &mut quick_xml::Writer<W>,
+    writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
-        &val.map(|status| format!("HTTP/1.1 {}", status)),
+        &val.map(|status| format!("HTTP/1.1 {status}")),
         ns,
         tag,
         namespaces,
@@ -78,18 +88,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub member_responses: Vec<ResponseElement<MemberPropType>>,
     pub sync_token: Option<String>,
 }
@@ -109,18 +119,16 @@ impl<T1: XmlSerialize, T2: XmlSerialize> axum::response::IntoResponse
 {
     fn into_response(self) -> axum::response::Response {
         use axum::body::Body;
-        use http::header;
 
-        let mut output: Vec<_> = b"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".into();
+        let output = match self.serialize_to_string() {
-        let mut writer = quick_xml::Writer::new_with_indent(&mut output, b' ', 4);
+            Ok(out) => out,
-        if let Err(err) = self.serialize_root(&mut writer) {
+            Err(err) => return crate::Error::from(err).into_response(),
-            return crate::Error::from(err).into_response();
+        };
-        }
 
         let mut resp = axum::response::Response::builder().status(StatusCode::MULTI_STATUS);
-        resp.headers_mut()
+        let hdrs = resp.headers_mut().unwrap();
-            .unwrap()
+        hdrs.typed_insert(ContentType::xml());
-            .insert(header::CONTENT_TYPE, "application/xml".try_into().unwrap());
+        hdrs.typed_insert(CacheControl::new().with_no_cache());
         resp.body(Body::from(output)).unwrap()
     }
 }

crates/dav/src/xml/propfind.rs

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