address_object resource: Implement displayname

.github/workflows/docker-publish.yml

@@ -2,10 +2,7 @@ name: Docker
 
 on:
   push:
-    branches:
+    branches: ["main"]
-      - main
-      - dev
-      - feat/*
   release:
     types: ["published"]
 
@@ -48,8 +45,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            ${{ github.ref_name == 'main' && 'type=ref,event=branch' || '' }}
+            type=ref,event=branch
-            type=ref,event=branch,prefix=br-
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}

.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json

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

.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json

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

.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json

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

Cargo.lock

@@ -573,9 +573,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.53"
+version = "1.2.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
+checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -1241,9 +1241,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
+checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
 
 [[package]]
 name = "flume"
@@ -1771,7 +1771,7 @@ dependencies = [
 [[package]]
 name = "ical"
 version = "0.12.0-dev"
-source = "git+https://github.com/lennart-k/ical-rs?rev=f1ad6456fd6cbd1e6da095297febddd2cfe61422#f1ad6456fd6cbd1e6da095297febddd2cfe61422"
+source = "git+https://github.com/lennart-k/ical-rs?branch=dev#5e61c25646c3785448d349e7d18b2833fc483c53"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -1781,7 +1781,7 @@ dependencies = [
  "phf 0.13.1",
  "regex",
  "rrule",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2118,7 +2118,7 @@ dependencies = [
  "matchit 0.9.1",
  "percent-encoding",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2370,7 +2370,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tracing",
 ]
 
@@ -2400,7 +2400,7 @@ dependencies = [
  "opentelemetry_sdk",
  "prost",
  "reqwest",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
  "tracing",
@@ -2437,7 +2437,7 @@ dependencies = [
  "opentelemetry",
  "percent-encoding",
  "rand 0.9.2",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
 ]
@@ -2870,9 +2870,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.39.0"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e3bf4aa9d243beeb01a7b3bc30b77cfe2c44e24ec02d751a7104a53c2c49a1"
+checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
  "memchr",
 ]
@@ -2891,7 +2891,7 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "web-time",
@@ -2912,7 +2912,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tinyvec",
  "tracing",
  "web-time",
@@ -3187,7 +3187,7 @@ dependencies = [
  "chrono-tz",
  "log",
  "regex",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3317,7 +3317,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "anyhow",
  "argon2",
@@ -3328,7 +3328,6 @@ dependencies = [
  "figment",
  "headers",
  "http",
- "ical",
  "insta",
  "opentelemetry",
  "opentelemetry-otlp",
@@ -3349,7 +3348,6 @@ dependencies = [
  "rustical_store",
  "rustical_store_sqlite",
  "serde",
- "similar-asserts",
  "sqlx",
  "tokio",
  "toml 0.9.11+spec-1.1.0",
@@ -3364,7 +3362,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3394,7 +3392,7 @@ dependencies = [
  "similar-asserts",
  "strum",
  "strum_macros",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tower",
  "tower-http",
@@ -3406,7 +3404,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "async-trait",
  "axum",
@@ -3429,7 +3427,7 @@ dependencies = [
  "serde",
  "strum",
  "strum_macros",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tower",
  "tower-http",
@@ -3440,7 +3438,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "async-trait",
  "axum",
@@ -3458,7 +3456,7 @@ dependencies = [
  "rustical_xml",
  "serde",
  "strum",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tower",
  "tracing",
@@ -3466,7 +3464,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "async-trait",
  "axum",
@@ -3484,14 +3482,14 @@ dependencies = [
  "rustical_store",
  "rustical_xml",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "rustical_frontend"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "askama",
  "askama_web",
@@ -3514,7 +3512,7 @@ dependencies = [
  "rustical_store",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tower",
  "tower-http",
@@ -3527,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "axum",
  "chrono",
@@ -3541,12 +3539,12 @@ dependencies = [
  "serde",
  "sha2",
  "similar-asserts",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "rustical_oidc"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "async-trait",
  "axum",
@@ -3555,14 +3553,14 @@ dependencies = [
  "openidconnect",
  "reqwest",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tower-sessions",
  "tracing",
 ]
 
 [[package]]
 name = "rustical_store"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3585,7 +3583,7 @@ dependencies = [
  "rustical_xml",
  "serde",
  "sha2",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tower",
  "tower-sessions",
@@ -3595,7 +3593,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3605,14 +3603,13 @@ dependencies = [
  "password-auth",
  "password-hash",
  "pbkdf2",
- "regex",
  "rstest",
  "rustical_ical",
  "rustical_store",
  "serde",
  "sha2",
  "sqlx",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "uuid",
@@ -3620,10 +3617,10 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "quick-xml",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "xml_derive",
 ]
 
@@ -3656,9 +3653,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.0"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "4910321ebe4151be888e35fe062169554e74aad01beafed60410131420ceffbc"
 dependencies = [
  "web-time",
  "zeroize",
@@ -3666,9 +3663,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.9"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4048,7 +4045,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "smallvec",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -4132,7 +4129,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tracing",
  "uuid",
  "whoami",
@@ -4171,7 +4168,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tracing",
  "uuid",
  "whoami",
@@ -4197,7 +4194,7 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "tracing",
  "url",
  "uuid",
@@ -4316,11 +4313,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.18"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.18",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -4336,9 +4333,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.18"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4720,7 +4717,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.17",
  "time",
  "tokio",
  "tracing",
@@ -5442,7 +5439,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "xml_derive"
-version = "0.11.17"
+version = "0.11.10"
 dependencies = [
  "darling 0.23.0",
  "heck",
@@ -5563,6 +5560,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.15"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f63c051f4fe3c1509da62131a678643c5b6fbdc9273b2b79d4378ebda003d2"
+checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.11.17"
+version = "0.11.10"
 rust-version = "1.92"
 edition = "2024"
 description = "A CalDAV server"
@@ -73,7 +73,7 @@ tokio = { version = "1.48", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.39" }
+quick-xml = { version = "0.38" }
 rust-embed = "8.9"
 tower-sessions = "0.14"
 futures-core = "0.3"
@@ -107,7 +107,7 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { git = "https://github.com/lennart-k/ical-rs", rev = "f1ad6456fd6cbd1e6da095297febddd2cfe61422", features = [
+ical = { git = "https://github.com/lennart-k/ical-rs", branch = "dev", features = [
   "chrono-tz",
 ] }
 toml = "0.9"
@@ -153,7 +153,6 @@ criterion = { version = "0.8", features = ["async_tokio"] }
 rstest.workspace = true
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 insta.workspace = true
-similar-asserts.workspace = true
 
 [dependencies]
 rustical_store.workspace = true
@@ -161,7 +160,6 @@ rustical_store_sqlite.workspace = true
 rustical_caldav.workspace = true
 rustical_carddav.workspace = true
 rustical_frontend.workspace = true
-ical.workspace = true
 toml.workspace = true
 serde.workspace = true
 tokio.workspace = true

Dockerfile

@@ -36,7 +36,7 @@ COPY --from=planner /rustical/recipe.json recipe.json
 RUN cargo chef cook --release --target "$(cat /tmp/rust_target)"
 
 COPY . .
-RUN cargo install --locked --target "$(cat /tmp/rust_target)" --path .
+RUN cargo install --target "$(cat /tmp/rust_target)" --path .
 
 FROM scratch
 COPY --from=builder /usr/local/cargo/bin/rustical /usr/local/bin/rustical

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

@@ -26,10 +26,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     }
 
     let parser = ical::IcalParser::from_slice(body.as_bytes());
-    let mut cal = match parser.expect_one() {
+    let mut cal = parser.expect_one()?.mutable();
-        Ok(cal) => cal.mutable(),
-        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-    };
 
     // Extract calendar metadata
     let displayname = cal
@@ -70,10 +67,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
         cal_components.push(CalendarObjectType::Todo);
     }
 
-    let objects = match cal.into_objects() {
+    let objects = cal.into_objects()?.into_iter().map(Into::into).collect();
-        Ok(objects) => objects.into_iter().map(Into::into).collect(),
-        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-    };
     let new_cal = Calendar {
         principal,
         id: cal_id,

crates/caldav/src/calendar_object/methods.rs

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

crates/caldav/src/error.rs

@@ -52,6 +52,9 @@ pub enum Error {
     #[error(transparent)]
     XmlDecodeError(#[from] rustical_xml::XmlError),
 
+    #[error(transparent)]
+    IcalError(#[from] rustical_ical::Error),
+
     #[error(transparent)]
     PreconditionFailed(Precondition),
 }
@@ -72,6 +75,8 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
+            // TODO: Can also be Bad Request, if it's used input
+            Self::IcalError(_err) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
         }
     }
@@ -79,9 +84,6 @@ impl Error {
 
 impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
-        if let Self::PreconditionFailed(precondition) = self {
-            return precondition.into_response();
-        }
         if matches!(
             self.status_code(),
             StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED

crates/carddav/src/address_object/methods.rs

@@ -103,10 +103,7 @@ pub async fn put_object<AS: AddressbookStore>(
         true
     };
 
-    let object = match AddressObject::from_vcf(body) {
+    let object = AddressObject::from_vcf(body)?;
-        Ok(object) => object,
-        Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
-    };
     let etag = object.get_etag();
     addr_store
         .put_object(&principal, &addressbook_id, &object_id, object, overwrite)

crates/carddav/src/error.rs

@@ -23,6 +23,9 @@ pub enum Error {
 
     #[error(transparent)]
     XmlDecodeError(#[from] rustical_xml::XmlError),
+
+    #[error(transparent)]
+    IcalError(#[from] rustical_ical::Error),
 }
 
 impl Error {
@@ -40,6 +43,8 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
+            // TODO: Can also be Bad Request, if it's used input
+            Self::IcalError(_err) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 }

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

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

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

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

crates/dav/src/xml/propfind.rs

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

crates/store_sqlite/Cargo.toml

@@ -37,4 +37,3 @@ pbkdf2.workspace = true
 rustical_ical.workspace = true
 rstest = { workspace = true, optional = true }
 sha2.workspace = true
-regex.workspace = true

crates/store_sqlite/src/addressbook_store/mod.rs

@@ -2,7 +2,6 @@ use super::ChangeOperation;
 use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
 use derive_more::derive::Constructor;
-use ical::parser::ParserError;
 use rustical_ical::AddressObject;
 use rustical_store::{
     Addressbook, AddressbookStore, CollectionMetadata, CollectionOperation,
@@ -10,7 +9,7 @@ use rustical_store::{
 };
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
 use tokio::sync::mpsc::Sender;
-use tracing::{error, error_span, instrument, warn};
+use tracing::{error_span, instrument, warn};
 
 pub mod birthday_calendar;
 
@@ -19,12 +18,6 @@ struct AddressObjectRow {
     id: String,
     vcf: String,
 }
-impl From<AddressObjectRow> for (String, Result<AddressObject, ParserError>) {
-    fn from(row: AddressObjectRow) -> Self {
-        let result = AddressObject::from_vcf(row.vcf);
-        (row.id, result)
-    }
-}
 
 impl TryFrom<AddressObjectRow> for (String, AddressObject) {
     type Error = rustical_store::Error;
@@ -38,7 +31,6 @@ impl TryFrom<AddressObjectRow> for (String, AddressObject) {
 pub struct SqliteAddressbookStore {
     db: SqlitePool,
     sender: Sender<CollectionOperation>,
-    skip_broken: bool,
 }
 
 impl SqliteAddressbookStore {
@@ -96,36 +88,6 @@ impl SqliteAddressbookStore {
         Ok(())
     }
 
-    #[allow(clippy::missing_panics_doc)]
-    pub async fn validate_objects(&self, principal: &str) -> Result<(), Error> {
-        let mut success = true;
-        for addressbook in self.get_addressbooks(principal).await? {
-            for (object_id, res) in Self::_get_objects(&self.db, principal, &addressbook.id).await?
-            {
-                if let Err(err) = res {
-                    warn!(
-                        "Invalid address object found at {principal}/{addr_id}/{object_id}.vcf. Error: {err}",
-                        addr_id = addressbook.id
-                    );
-                    success = false;
-                }
-            }
-        }
-        if !success {
-            if self.skip_broken {
-                error!(
-                    "Not all address objects are valid. Since data_store.sqlite.skip_broken=true they will be hidden. You are still advised to manually remove or repair the object. If you need help feel free to open up an issue on GitHub."
-                );
-            } else {
-                error!(
-                    "Not all address objects are valid. Since data_store.sqlite.skip_broken=false this causes a panic. Remove or repair the broken objects manually or set data_store.sqlite.skip_broken=false as a temporary solution to ignore the error. If you need help feel free to open up an issue on GitHub."
-                );
-                panic!();
-            }
-        }
-        Ok(())
-    }
-
     // Logs an operation to an address object
     async fn log_object_operation(
         tx: &mut Transaction<'_, Sqlite>,
@@ -172,7 +134,7 @@ impl SqliteAddressbookStore {
         if let Err(err) = self.sender.try_send(CollectionOperation { topic, data }) {
             error_span!(
                 "Error trying to send addressbook update notification:",
-                err = format!("{err}"),
+                err = format!("{err:?}"),
             );
         }
     }
@@ -391,8 +353,8 @@ impl SqliteAddressbookStore {
         executor: E,
         principal: &str,
         addressbook_id: &str,
-    ) -> Result<impl Iterator<Item = (String, Result<AddressObject, ParserError>)>, Error> {
+    ) -> Result<Vec<(String, AddressObject)>, rustical_store::Error> {
-        Ok(sqlx::query_as!(
+        sqlx::query_as!(
             AddressObjectRow,
             "SELECT id, vcf FROM addressobjects WHERE principal = ? AND addressbook_id = ? AND deleted_at IS NULL",
             principal,
@@ -401,8 +363,8 @@ impl SqliteAddressbookStore {
         .fetch_all(executor)
         .await.map_err(crate::Error::from)?
         .into_iter()
-        .map(Into::into)
+        .map(std::convert::TryInto::try_into)
-        )
+        .collect()
     }
 
     async fn _get_object<'e, E: Executor<'e, Database = Sqlite>>(
@@ -645,16 +607,7 @@ impl AddressbookStore for SqliteAddressbookStore {
         principal: &str,
         addressbook_id: &str,
     ) -> Result<Vec<(String, AddressObject)>, rustical_store::Error> {
-        let objects = Self::_get_objects(&self.db, principal, addressbook_id).await?;
+        Self::_get_objects(&self.db, principal, addressbook_id).await
-        if self.skip_broken {
-            Ok(objects
-                .filter_map(|(id, res)| Some((id, res.ok()?)))
-                .collect())
-        } else {
-            Ok(objects
-                .map(|(id, res)| res.map(|obj| (id, obj)))
-                .collect::<Result<Vec<_>, _>>()?)
-        }
     }
 
     #[instrument]

crates/store_sqlite/src/calendar_store.rs

@@ -3,9 +3,7 @@ use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
 use chrono::TimeDelta;
 use derive_more::derive::Constructor;
-use ical::parser::ParserError;
 use ical::types::CalDateTime;
-use regex::Regex;
 use rustical_ical::{CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
@@ -14,7 +12,7 @@ use rustical_store::{CollectionOperation, CollectionOperationInfo};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
 use tokio::sync::mpsc::Sender;
-use tracing::{error, error_span, instrument, warn};
+use tracing::{error_span, instrument, warn};
 
 #[derive(Debug, Clone)]
 struct CalendarObjectRow {
@@ -23,23 +21,6 @@ struct CalendarObjectRow {
     uid: String,
 }
 
-impl From<CalendarObjectRow> for (String, Result<CalendarObject, ParserError>) {
-    fn from(row: CalendarObjectRow) -> Self {
-        let result = CalendarObject::from_ics(row.ics).inspect(|object| {
-            if object.get_uid() != row.uid {
-                warn!(
-                    "Calendar object {}.ics: UID={} and row uid={} do not match",
-                    row.id,
-                    object.get_uid(),
-                    row.uid
-                );
-            }
-        });
-
-        (row.id, result)
-    }
-}
-
 impl TryFrom<CalendarObjectRow> for (String, CalendarObject) {
     type Error = rustical_store::Error;
 
@@ -110,7 +91,6 @@ impl From<CalendarRow> for Calendar {
 pub struct SqliteCalendarStore {
     db: SqlitePool,
     sender: Sender<CollectionOperation>,
-    skip_broken: bool,
 }
 
 impl SqliteCalendarStore {
@@ -160,117 +140,11 @@ impl SqliteCalendarStore {
         if let Err(err) = self.sender.try_send(CollectionOperation { topic, data }) {
             error_span!(
                 "Error trying to send calendar update notification:",
-                err = format!("{err}"),
+                err = format!("{err:?}"),
             );
         }
     }
 
-    #[allow(clippy::missing_panics_doc)]
-    pub async fn validate_objects(&self, principal: &str) -> Result<(), Error> {
-        let mut success = true;
-        for calendar in self.get_calendars(principal).await? {
-            for (object_id, res) in Self::_get_objects(&self.db, principal, &calendar.id).await? {
-                if let Err(err) = res {
-                    warn!(
-                        "Invalid calendar object found at {principal}/{cal_id}/{object_id}.ics. Error: {err}",
-                        cal_id = calendar.id
-                    );
-                    success = false;
-                }
-            }
-        }
-        if !success {
-            if self.skip_broken {
-                error!(
-                    "Not all calendar objects are valid. Since data_store.sqlite.skip_broken=true they will be hidden. You are still advised to manually remove or repair the object. If you need help feel free to open up an issue on GitHub."
-                );
-            } else {
-                error!(
-                    "Not all calendar objects are valid. Since data_store.sqlite.skip_broken=false this causes a panic. Remove or repair the broken objects manually or set data_store.sqlite.skip_broken=false as a temporary solution to ignore the error. If you need help feel free to open up an issue on GitHub."
-                );
-                panic!();
-            }
-        }
-        Ok(())
-    }
-
-    /// In the past exports generated objects with invalid VERSION:4.0
-    /// This repair sets them to VERSION:2.0
-    #[allow(clippy::missing_panics_doc)]
-    pub async fn repair_invalid_version_4_0(&self) -> Result<(), Error> {
-        struct Row {
-            principal: String,
-            cal_id: String,
-            id: String,
-            ics: String,
-        }
-
-        let mut tx = self
-            .db
-            .begin_with(BEGIN_IMMEDIATE)
-            .await
-            .map_err(crate::Error::from)?;
-
-        #[allow(clippy::missing_panics_doc)]
-        let version_pattern = Regex::new(r"(?mi)^VERSION:4.0").unwrap();
-
-        let repairs: Vec<Row> = sqlx::query_as!(
-            Row,
-            r#"SELECT principal, cal_id, id, ics FROM calendarobjects WHERE ics LIKE '%VERSION:4.0%';"#
-        )
-        .fetch_all(&mut *tx)
-        .await
-        .map_err(crate::Error::from)?
-            .into_iter()
-            .filter_map(|mut row| {
-                version_pattern.find(&row.ics)?;
-                let new_ics = version_pattern.replace(&row.ics, "VERSION:2.0");
-                // Safeguard that we really only changed the version
-                assert_eq!(row.ics.len(), new_ics.len());
-                row.ics = new_ics.to_string();
-                Some(row)
-            })
-            .collect();
-
-        if repairs.is_empty() {
-            return Ok(());
-        }
-        warn!(
-            "Found {} calendar objects with invalid VERSION:4.0. Repairing by setting to VERSION:2.0",
-            repairs.len()
-        );
-
-        for repair in &repairs {
-            // calendarobjectchangelog is used by sync-collection to fetch changes
-            // By deleting entries we will later regenerate new entries such that clients will notice
-            // the objects have changed
-            warn!(
-                "Repairing VERSION for {}/{}/{}.ics",
-                repair.principal, repair.cal_id, repair.id
-            );
-            sqlx::query!(
-                "DELETE FROM calendarobjectchangelog WHERE (principal, cal_id, object_id) = (?, ?, ?);",
-                repair.principal, repair.cal_id, repair.id
-            ).execute(&mut *tx).await
-            .map_err(crate::Error::from)?;
-
-            sqlx::query!(
-                "UPDATE calendarobjects SET ics = ? WHERE (principal, cal_id, id) = (?, ?, ?);",
-                repair.ics,
-                repair.principal,
-                repair.cal_id,
-                repair.id
-            )
-            .execute(&mut *tx)
-            .await
-            .map_err(crate::Error::from)?;
-        }
-
-        tx.commit().await.map_err(crate::Error::from)?;
-
-        Ok(())
-    }
-
     // Commit "orphaned" objects to the changelog table
     pub async fn repair_orphans(&self) -> Result<(), Error> {
         struct Row {
@@ -504,8 +378,8 @@ impl SqliteCalendarStore {
         executor: E,
         principal: &str,
         cal_id: &str,
-    ) -> Result<impl Iterator<Item = (String, Result<CalendarObject, ParserError>)>, Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, Error> {
-        Ok(sqlx::query_as!(
+        sqlx::query_as!(
             CalendarObjectRow,
             "SELECT id, uid, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
             principal,
@@ -514,8 +388,8 @@ impl SqliteCalendarStore {
         .fetch_all(executor)
         .await.map_err(crate::Error::from)?
         .into_iter()
-        .map(Into::into)
+        .map(std::convert::TryInto::try_into)
-        )
+        .collect()
     }
 
     async fn _calendar_query<'e, E: Executor<'e, Database = Sqlite>>(
@@ -523,14 +397,14 @@ impl SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
         query: CalendarQuery,
-    ) -> Result<impl Iterator<Item = (String, Result<CalendarObject, ParserError>)>, Error> {
+    ) -> Result<Vec<(String, CalendarObject)>, Error> {
         // We extend our query interval by one day in each direction since we really don't want to
         // miss any objects because of timezone differences
         // I've previously tried NaiveDate::MIN,MAX, but it seems like sqlite cannot handle these
         let start = query.time_start.map(|start| start - TimeDelta::days(1));
         let end = query.time_end.map(|end| end + TimeDelta::days(1));
 
-        Ok(sqlx::query_as!(
+        sqlx::query_as!(
             CalendarObjectRow,
             r"SELECT id, uid, ics FROM calendarobjects
                 WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL
@@ -548,7 +422,8 @@ impl SqliteCalendarStore {
         .await
         .map_err(crate::Error::from)?
         .into_iter()
-        .map(Into::into))
+        .map(std::convert::TryInto::try_into)
+        .collect()
     }
 
     async fn _get_object<'e, E: Executor<'e, Database = Sqlite>>(
@@ -688,7 +563,6 @@ impl SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
         synctoken: i64,
-        skip_broken: bool,
     ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
         struct Row {
             object_id: String,
@@ -718,8 +592,6 @@ impl SqliteCalendarStore {
             match Self::_get_object(&mut *conn, principal, cal_id, &object_id, false).await {
                 Ok(object) => objects.push((object_id, object)),
                 Err(rustical_store::Error::NotFound) => deleted_objects.push(object_id),
-                // Skip broken object
-                Err(rustical_store::Error::IcalError(_)) if skip_broken => (),
                 Err(err) => return Err(err),
             }
         }
@@ -870,16 +742,7 @@ impl CalendarStore for SqliteCalendarStore {
         cal_id: &str,
         query: CalendarQuery,
     ) -> Result<Vec<(String, CalendarObject)>, Error> {
-        let objects = Self::_calendar_query(&self.db, principal, cal_id, query).await?;
+        Self::_calendar_query(&self.db, principal, cal_id, query).await
-        if self.skip_broken {
-            Ok(objects
-                .filter_map(|(id, res)| Some((id, res.ok()?)))
-                .collect())
-        } else {
-            Ok(objects
-                .map(|(id, res)| res.map(|obj| (id, obj)))
-                .collect::<Result<Vec<_>, _>>()?)
-        }
     }
 
     async fn calendar_metadata(
@@ -910,16 +773,7 @@ impl CalendarStore for SqliteCalendarStore {
         principal: &str,
         cal_id: &str,
     ) -> Result<Vec<(String, CalendarObject)>, Error> {
-        let objects = Self::_get_objects(&self.db, principal, cal_id).await?;
+        Self::_get_objects(&self.db, principal, cal_id).await
-        if self.skip_broken {
-            Ok(objects
-                .filter_map(|(id, res)| Some((id, res.ok()?)))
-                .collect())
-        } else {
-            Ok(objects
-                .map(|(id, res)| res.map(|obj| (id, obj)))
-                .collect::<Result<Vec<_>, _>>()?)
-        }
     }
 
     #[instrument]
@@ -1042,7 +896,7 @@ impl CalendarStore for SqliteCalendarStore {
         cal_id: &str,
         synctoken: i64,
     ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
-        Self::_sync_changes(&self.db, principal, cal_id, synctoken, self.skip_broken).await
+        Self::_sync_changes(&self.db, principal, cal_id, synctoken).await
     }
 
     fn is_read_only(&self, _cal_id: &str) -> bool {

crates/store_sqlite/src/error.rs

@@ -18,7 +18,7 @@ impl From<sqlx::Error> for Error {
             sqlx::Error::RowNotFound => Self::StoreError(rustical_store::Error::NotFound),
             sqlx::Error::Database(err) => {
                 if err.is_unique_violation() {
-                    warn!("{err}");
+                    warn!("{err:?}");
                     Self::StoreError(rustical_store::Error::AlreadyExists)
                 } else {
                     Self::SqlxError(sqlx::Error::Database(err))

crates/store_sqlite/src/tests/mod.rs

@@ -52,8 +52,8 @@ pub async fn test_store_context() -> TestStoreContext {
     let db = get_test_db().await;
     TestStoreContext {
         db: db.clone(),
-        addr_store: SqliteAddressbookStore::new(db.clone(), send_addr, false),
+        addr_store: SqliteAddressbookStore::new(db.clone(), send_addr),
-        cal_store: SqliteCalendarStore::new(db.clone(), send_cal, false),
+        cal_store: SqliteCalendarStore::new(db.clone(), send_cal),
         principal_store: SqlitePrincipalStore::new(db.clone()),
         sub_store: SqliteStore::new(db),
     }

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

@@ -136,7 +136,7 @@ impl NamedStruct {
                         #(#builder_field_inits),*
                     };
 
-                    let (ns, name) = reader.resolver().resolve_element(start.name());
+                    let (ns, name) = reader.resolve_element(start.name());
                     #(#tagname_field_branches);*
                     #(#namespace_field_branches);*
 
@@ -161,7 +161,7 @@ impl NamedStruct {
                                 // start of a child element
                                 Event::Start(start) | Event::Empty(start) => {
                                     let empty = matches!(event, Event::Empty(_));
-                                    let (ns, name) = reader.resolver().resolve_element(start.name());
+                                    let (ns, name) = reader.resolve_element(start.name());
                                     match (ns, name.as_ref()) {
                                         #(#named_field_branches),*
                                         #(#untagged_field_branches),*

crates/xml/src/de.rs

@@ -42,7 +42,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
             match event {
                 Event::Decl(_) | Event::Comment(_) => { /*  ignore this */ }
                 Event::Start(start) | Event::Empty(start) => {
-                    let (ns, name) = reader.resolver().resolve_element(start.name());
+                    let (ns, name) = reader.resolve_element(start.name());
                     let matches = match (Self::root_ns(), &ns, name) {
                         // Wrong tag
                         (_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,

src/commands/mod.rs

@@ -17,8 +17,6 @@ pub fn cmd_gen_config(_args: GenConfigArgs) -> anyhow::Result<()> {
         http: HttpConfig::default(),
         data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
             db_url: "/var/lib/rustical/db.sqlite3".to_owned(),
-            run_repairs: true,
-            skip_broken: true,
         }),
         tracing: TracingConfig::default(),
         frontend: FrontendConfig {

src/config.rs

@@ -26,10 +26,6 @@ impl Default for HttpConfig {
 #[serde(deny_unknown_fields)]
 pub struct SqliteDataStoreConfig {
     pub db_url: String,
-    #[serde(default = "default_true")]
-    pub run_repairs: bool,
-    #[serde(default = "default_true")]
-    pub skip_broken: bool,
 }
 
 #[derive(Debug, Deserialize, Serialize)]

src/integration_tests/caldav/calendar.rs

@@ -8,7 +8,7 @@ use rustical_store::{CalendarMetadata, CalendarStore};
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;
 
-pub fn mkcalendar_template(
+fn mkcalendar_template(
     CalendarMetadata {
         displayname,
         order: _order,

src/integration_tests/caldav/calendar_put.rs

@@ -1,77 +0,0 @@
-use axum::body::Body;
-use headers::{Authorization, HeaderMapExt};
-use http::{Request, StatusCode};
-use rstest::rstest;
-use rustical_store::CalendarMetadata;
-use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
-use tower::ServiceExt;
-
-use crate::integration_tests::{
-    ResponseExtractString, caldav::calendar::mkcalendar_template, get_app,
-};
-
-#[rstest]
-#[tokio::test]
-async fn test_put_invalid(
-    #[from(test_store_context)]
-    #[future]
-    context: TestStoreContext,
-) {
-    let context = context.await;
-    let app = get_app(context.clone());
-
-    let calendar_meta = CalendarMetadata {
-        displayname: Some("Calendar".to_string()),
-        description: Some("Description".to_string()),
-        color: Some("#00FF00".to_string()),
-        order: 0,
-    };
-    let (principal, cal_id) = ("user", "calendar");
-    let url = format!("/caldav/principal/{principal}/{cal_id}");
-
-    let mut request = Request::builder()
-        .method("MKCALENDAR")
-        .uri(&url)
-        .body(Body::from(mkcalendar_template(&calendar_meta)))
-        .unwrap();
-    request
-        .headers_mut()
-        .typed_insert(Authorization::basic("user", "pass"));
-    let response = app.clone().oneshot(request).await.unwrap();
-    assert_eq!(response.status(), StatusCode::CREATED);
-
-    // Invalid calendar data
-    let ical = r"BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Example Corp.//CalDAV Client//EN
-BEGIN:VEVENT
-UID:20010712T182145Z-123401@example.com
-DTSTAMP:20060712T182145Z
-DTSTART:20060714T170000Z
-RRULE:UNTIL=123
-DTEND:20060715T040000Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-END:VCALENDAR";
-
-    let mut request = Request::builder()
-        .method("PUT")
-        .uri(format!("{url}/qwue23489.ics"))
-        .header("If-None-Match", "*")
-        .header("Content-Type", "text/calendar")
-        .body(Body::from(ical))
-        .unwrap();
-    request
-        .headers_mut()
-        .typed_insert(Authorization::basic("user", "pass"));
-
-    let response = app.clone().oneshot(request).await.unwrap();
-    assert_eq!(response.status(), StatusCode::PRECONDITION_FAILED);
-    let body = response.extract_string().await;
-    insta::assert_snapshot!(body, @r#"
-    <?xml version="1.0" encoding="utf-8"?>
-    <error 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">
-        <CAL:valid-calendar-data/>
-    </error>
-    "#);
-}

src/integration_tests/caldav/calendar_report.rs

@@ -87,79 +87,70 @@ const REPORT_7_8_3: &str = r#"
    </C:calendar-query>
 "#;
 
-// Adapted from Example 7.8.3 of RFC 4791
+const OUTPUT_7_8_3: &str = r#"
-// In the RFC the output is wrong since it returns DTSTART in UTC as local time, e.g.
+     <D:response>
-// DTSTART:20060103T170000
+       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
-// instead of
+       <D:propstat>
-// DTSTART:20060103T170000Z
+         <D:prop>
-// In https://datatracker.ietf.org/doc/html/rfc4791#section-9.6.5
+           <D:getetag>"fffff-abcd2"</D:getetag>
-// it is clearly stated that times with timezone information MUST be returned in UTC.
+           <C:calendar-data>BEGIN:VCALENDAR
-// Also, the RECURRENCE-ID needs to include the TIMEZONE, which is fixed here by converting it to
-// UTC
-const OUTPUT_7_8_3: &str = r#"<?xml version="1.0" encoding="utf-8"?>
-<multistatus 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">
-    <response>
-        <href>/caldav/principal/user/calendar/abcd2.ics</href>
-        <propstat>
-            <prop>
-                <CAL:calendar-data>BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VEVENT
    DTSTAMP:20060206T001121Z
-DTSTART:20060103T170000Z
+   DTSTART:20060103T170000
    DURATION:PT1H
+   RECURRENCE-ID:20060103T170000
    SUMMARY:Event #2
-UID:abcd2
+   UID:00959BC664CA650E933C892C@example.com
-RECURRENCE-ID:20060103T170000Z
    END:VEVENT
    BEGIN:VEVENT
    DTSTAMP:20060206T001121Z
-DTSTART:20060104T190000Z
+   DTSTART:20060104T190000
    DURATION:PT1H
-RECURRENCE-ID:20060104T170000Z
+   RECURRENCE-ID:20060104T170000
    SUMMARY:Event #2 bis
-UID:abcd2
+   UID:00959BC664CA650E933C892C@example.com
    END:VEVENT
    END:VCALENDAR
-</CAL:calendar-data>
+   </C:calendar-data>
-            </prop>
+         </D:prop>
-            <status>HTTP/1.1 200 OK</status>
+         <D:status>HTTP/1.1 200 OK</D:status>
-        </propstat>
+       </D:propstat>
-    </response>
+     </D:response>
-    <response>
+     <D:response>
-        <href>/caldav/principal/user/calendar/abcd3.ics</href>
+       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-        <propstat>
+       <D:propstat>
-            <prop>
+         <D:prop>
-                <CAL:calendar-data>BEGIN:VCALENDAR
+           <D:getetag>"fffff-abcd3"</D:getetag>
+           <C:calendar-data>BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VEVENT
    ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
    ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
    DTSTAMP:20060206T001220Z
-DTSTART:20060104T150000Z
+   DTSTART:20060104T150000
    DURATION:PT1H
    LAST-MODIFIED:20060206T001330Z
    ORGANIZER:mailto:cyrus@example.com
    SEQUENCE:1
    STATUS:TENTATIVE
    SUMMARY:Event #3
-UID:abcd3
+   UID:DC6C50A017428C5216A2F1CD@example.com
    X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
    END:VEVENT
    END:VCALENDAR
-</CAL:calendar-data>
+   </C:calendar-data>
-            </prop>
+         </D:prop>
-            <status>HTTP/1.1 200 OK</status>
+         <D:status>HTTP/1.1 200 OK</D:status>
-        </propstat>
+       </D:propstat>
-    </response>
+"#;
-</multistatus>"#;
 
 #[rstest]
-#[case(0, ICS_1, REPORT_7_8_1, None)]
+#[case(0, ICS_1, REPORT_7_8_1)]
-#[case(1, ICS_1, REPORT_7_8_2, None)]
+#[case(1, ICS_1, REPORT_7_8_2)]
-#[case(2, ICS_1, REPORT_7_8_3, Some(OUTPUT_7_8_3))]
+#[case(2, ICS_1, REPORT_7_8_3)]
 #[tokio::test]
 async fn test_report(
     #[from(test_store_context)]
@@ -168,7 +159,6 @@ async fn test_report(
     #[case] case: usize,
     #[case] ics: &'static str,
     #[case] report: &'static str,
-    #[case] output: Option<&'static str>,
 ) {
     let context = context.await;
     let app = get_app(context.clone());
@@ -203,7 +193,4 @@ async fn test_report(
     assert_eq!(response.status(), StatusCode::MULTI_STATUS);
     let body = response.extract_string().await;
     insta::assert_snapshot!(format!("{case}_report_body"), body);
-    if let Some(output) = output {
-        similar_asserts::assert_eq!(output, body.replace('\r', ""));
-    }
 }

src/integration_tests/caldav/mod.rs

@@ -9,8 +9,7 @@ use tower::ServiceExt;
 
 mod calendar;
 mod calendar_import;
-mod calendar_put;
+// mod calendar_report;
-mod calendar_report;
 
 #[rstest]
 #[tokio::test]

src/integration_tests/caldav/resources/rfc4791_appb.ics

@@ -55,7 +55,6 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
-X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 BEGIN:VTODO
 DTSTAMP:20060205T235335Z

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__1_get_body.snap

@@ -60,7 +60,6 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:[UID]
-X-ABC-GUID:[UID]
 END:VEVENT
 BEGIN:VTODO
 DTSTAMP:20060205T235335Z

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_report__0_report_body.snap

@@ -56,7 +56,7 @@ END:VCALENDAR
         <href>/caldav/principal/user/calendar/abcd3.ics</href>
         <propstat>
             <prop>
-                <getetag>&quot;a84fd022dfc742bf8f17ac04fca3aad687e9ae724180185e8e0df11e432dae30&quot;</getetag>
+                <getetag>&quot;c6a5b1cf6985805686df99e7f2e1cf286567dcb3383fc6fa1b12ce42d3fbc01c&quot;</getetag>
                 <CAL:calendar-data>BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Example Corp.//CalDAV Client//EN
@@ -90,7 +90,6 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
-X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_report__1_report_body.snap

@@ -88,7 +88,6 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
-X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_report__2_report_body.snap

@@ -13,19 +13,19 @@ VERSION:2.0
 PRODID:-//Example Corp.//CalDAV Client//EN
 BEGIN:VEVENT
 DTSTAMP:20060206T001121Z
-DTSTART:20060103T170000Z
 DURATION:PT1H
 SUMMARY:Event #2
 UID:abcd2
 RECURRENCE-ID:20060103T170000Z
+DTSTART:20060103T170000Z
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20060206T001121Z
-DTSTART:20060104T190000Z
 DURATION:PT1H
-RECURRENCE-ID:20060104T170000Z
+SUMMARY:Event #2
-SUMMARY:Event #2 bis
 UID:abcd2
+RECURRENCE-ID:20060104T170000Z
+DTSTART:20060104T170000Z
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>
@@ -44,7 +44,7 @@ BEGIN:VEVENT
 ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
 ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
 DTSTAMP:20060206T001220Z
-DTSTART:20060104T150000Z
+DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
 LAST-MODIFIED:20060206T001330Z
 ORGANIZER:mailto:cyrus@example.com
@@ -52,7 +52,6 @@ SEQUENCE:1
 STATUS:TENTATIVE
 SUMMARY:Event #3
 UID:abcd3
-X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
 END:VEVENT
 END:VCALENDAR
 </CAL:calendar-data>

src/main.rs

@@ -25,7 +25,7 @@ use std::sync::Arc;
 use tokio::sync::mpsc::Receiver;
 use tower::Layer;
 use tower_http::normalize_path::NormalizePathLayer;
-use tracing::{info, warn};
+use tracing::info;
 
 mod app;
 mod commands;
@@ -67,36 +67,17 @@ async fn get_data_stores(
     Receiver<CollectionOperation>,
 )> {
     Ok(match &config {
-        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+        DataStoreConfig::Sqlite(SqliteDataStoreConfig { db_url }) => {
-            db_url,
-            run_repairs,
-            skip_broken,
-        }) => {
             let db = create_db_pool(db_url, migrate).await?;
             // Channel to watch for changes (for DAV Push)
             let (send, recv) = tokio::sync::mpsc::channel(1000);
 
-            let addressbook_store = Arc::new(SqliteAddressbookStore::new(
+            let addressbook_store = Arc::new(SqliteAddressbookStore::new(db.clone(), send.clone()));
-                db.clone(),
-                send.clone(),
-                *skip_broken,
-            ));
-            let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send, *skip_broken));
-            if *run_repairs {
-                info!("Running repair tasks");
             addressbook_store.repair_orphans().await?;
-                cal_store.repair_invalid_version_4_0().await?;
+            let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send));
             cal_store.repair_orphans().await?;
-            }
             let subscription_store = Arc::new(SqliteStore::new(db.clone()));
             let principal_store = Arc::new(SqlitePrincipalStore::new(db));
-
-            // Validate all calendar objects
-            for principal in principal_store.get_principals().await? {
-                cal_store.validate_objects(&principal.id).await?;
-                addressbook_store.validate_objects(&principal.id).await?;
-            }
-
             (
                 addressbook_store,
                 cal_store,