fix test snapshots

Fix a typo about anniversary

.gitignore

@@ -3,7 +3,7 @@ crates/*/target
 # For libraries ignore Cargo.lock
 crates/*/Cargo.lock
 
-db.sqlite3*
+**/*.sqlite3*
 config.toml
 principals.toml
 

Cargo.lock

@@ -181,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "askama_web"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d6576f8e59513752a3e2673ca602fb403be7d0d0aacba5cd8b219838ab58fe"
+checksum = "5911a65ac3916ef133167a855d52978f9fbf54680a093e0ef29e20b7e94a4523"
 dependencies = [
  "askama",
  "askama_web_derive",
@@ -565,6 +565,24 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
+[[package]]
+name = "caldata"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36de4a8034d98c95e7fe874b828272d823cfbd68e9571fe7bf6c419e852cbe2"
+dependencies = [
+ "chrono",
+ "chrono-tz",
+ "derive_more",
+ "itertools 0.14.0",
+ "lazy_static",
+ "phf 0.13.1",
+ "regex",
+ "rrule",
+ "thiserror 2.0.18",
+ "vtimezones-rs",
+]
+
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -573,9 +591,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.53"
+version = "1.2.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
+checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -1768,22 +1786,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ical"
-version = "0.12.0-dev"
-source = "git+https://github.com/lennart-k/ical-rs?rev=f1ad6456fd6cbd1e6da095297febddd2cfe61422#f1ad6456fd6cbd1e6da095297febddd2cfe61422"
-dependencies = [
- "chrono",
- "chrono-tz",
- "derive_more",
- "itertools 0.14.0",
- "lazy_static",
- "phf 0.13.1",
- "regex",
- "rrule",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -2025,9 +2027,9 @@ checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
@@ -2200,9 +2202,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-integer"
@@ -2610,22 +2612,12 @@ dependencies = [
 
 [[package]]
 name = "phf_codegen"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbdcb6f01d193b17f0b9c3360fa7e0e620991b193ff08702f78b3ce365d7e61"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator 0.12.1",
+ "phf_generator",
- "phf_shared 0.12.1",
+ "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
-dependencies = [
- "fastrand",
- "phf_shared 0.12.1",
 ]
 
 [[package]]
@@ -2644,7 +2636,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "phf_generator 0.13.1",
+ "phf_generator",
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
@@ -2825,9 +2817,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.105"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -2934,9 +2926,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
@@ -3317,18 +3309,19 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "anyhow",
  "argon2",
  "async-trait",
  "axum",
  "axum-extra",
+ "caldata",
  "clap",
  "figment",
+ "futures-util",
  "headers",
  "http",
- "ical",
  "insta",
  "opentelemetry",
  "opentelemetry-otlp",
@@ -3352,6 +3345,7 @@ dependencies = [
  "similar-asserts",
  "sqlx",
  "tokio",
+ "tokio-util",
  "toml 0.9.11+spec-1.1.0",
  "tower",
  "tower-http",
@@ -3364,20 +3358,20 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "async-std",
  "async-trait",
  "axum",
  "axum-extra",
  "base64 0.22.1",
+ "caldata",
  "chrono",
  "chrono-tz",
  "derive_more",
  "futures-util",
  "headers",
  "http",
- "ical",
  "insta",
  "percent-encoding",
  "quick-xml",
@@ -3406,17 +3400,17 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "async-trait",
  "axum",
  "axum-extra",
  "base64 0.22.1",
+ "caldata",
  "chrono",
  "derive_more",
  "futures-util",
  "http",
- "ical",
  "insta",
  "percent-encoding",
  "quick-xml",
@@ -3440,16 +3434,16 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "async-trait",
  "axum",
  "axum-extra",
+ "caldata",
  "derive_more",
  "futures-util",
  "headers",
  "http",
- "ical",
  "itertools 0.14.0",
  "log",
  "matchit 0.9.1",
@@ -3466,7 +3460,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "async-trait",
  "axum",
@@ -3491,7 +3485,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "askama",
  "askama_web",
@@ -3527,13 +3521,13 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "axum",
+ "caldata",
  "chrono",
  "chrono-tz",
  "derive_more",
- "ical",
  "regex",
  "rrule",
  "rstest",
@@ -3546,7 +3540,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "async-trait",
  "axum",
@@ -3562,11 +3556,12 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "anyhow",
  "async-trait",
  "axum",
+ "caldata",
  "chrono",
  "chrono-tz",
  "clap",
@@ -3574,7 +3569,6 @@ dependencies = [
  "futures-core",
  "headers",
  "http",
- "ical",
  "regex",
  "rrule",
  "rstest",
@@ -3595,13 +3589,13 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "async-trait",
+ "caldata",
  "chrono",
  "criterion",
  "derive_more",
- "ical",
  "password-auth",
  "password-hash",
  "pbkdf2",
@@ -3620,7 +3614,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.18",
@@ -3980,9 +3974,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
 dependencies = [
  "libc",
  "windows-sys 0.60.2",
@@ -4356,9 +4350,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.45"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
+checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
 dependencies = [
  "deranged",
  "itoa",
@@ -4371,15 +4365,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
+checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4479,6 +4473,7 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
+ "futures-util",
  "pin-project-lite",
  "tokio",
 ]
@@ -4951,12 +4946,12 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vtimezones-rs"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6728de8767c8dea44f41b88115a205ed23adc3302e1b4342be59d922934dae5"
+checksum = "1e4e9cf6888a927b6cec4aa2416f379885b92dd2aa4476bc83718fe58051f67e"
 dependencies = [
  "glob",
- "phf 0.12.1",
+ "phf 0.13.1",
  "phf_codegen",
 ]
 
@@ -5442,7 +5437,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "xml_derive"
-version = "0.11.17"
+version = "0.12.3"
 dependencies = [
  "darling 0.23.0",
  "heck",
@@ -5563,6 +5558,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f63c051f4fe3c1509da62131a678643c5b6fbdc9273b2b79d4378ebda003d2"
+checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.11.17"
+version = "0.12.3"
 rust-version = "1.92"
 edition = "2024"
 description = "A CalDAV server"
@@ -32,8 +32,11 @@ opentelemetry = [
   "dep:tracing-opentelemetry",
 ]
 
-[profile.dev]
+[lib]
-debug = 0
+doc = true
+name = "rustical"
+path = "src/lib.rs"
+test = true
 
 [workspace.dependencies]
 rustical_dav = { path = "./crates/dav/", features = ["ical"] }
@@ -70,6 +73,7 @@ tokio = { version = "1.48", features = [
   "rt-multi-thread",
   "full",
 ] }
+tokio-util = { version = "0.7", features = ["rt"] }
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
@@ -107,9 +111,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 = [
+caldata = { version = "0.14.0", features = ["chrono-tz", "vtimezones-rs"] }
-  "chrono-tz",
-] }
 toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
@@ -139,7 +141,7 @@ reqwest = { version = "0.12", features = [
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
 matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "e18e65d7" }
-vtimezones-rs = "0.2"
+vtimezones-rs = "0.3"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }
@@ -161,10 +163,11 @@ rustical_store_sqlite.workspace = true
 rustical_caldav.workspace = true
 rustical_carddav.workspace = true
 rustical_frontend.workspace = true
-ical.workspace = true
+caldata.workspace = true
 toml.workspace = true
 serde.workspace = true
 tokio.workspace = true
+tokio-util.workspace = true
 tracing.workspace = true
 anyhow.workspace = true
 clap.workspace = true
@@ -203,3 +206,4 @@ tower-http.workspace = true
 axum-extra.workspace = true
 headers.workspace = true
 http.workspace = true
+futures-util.workspace = true

README.md

@@ -24,6 +24,7 @@ a CalDAV/CardDAV server
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
 - **OpenID Connect** support (with option to disable password login)
 - Group-based **sharing**
+- Partial [RFC 7809](https://datatracker.ietf.org/doc/html/rfc7809) support. RustiCal will accept timezones by reference and handle omitted timezones in objects.
 
 ## Getting Started
 

crates/caldav/Cargo.toml

@@ -34,7 +34,7 @@ rustical_store.workspace = true
 chrono.workspace = true
 chrono-tz.workspace = true
 sha2.workspace = true
-ical.workspace = true
+caldata.workspace = true
 percent-encoding.workspace = true
 rustical_xml.workspace = true
 uuid.workspace = true

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

@@ -3,11 +3,11 @@ use crate::calendar::CalendarResourceService;
 use axum::body::Body;
 use axum::extract::State;
 use axum::{extract::Path, response::Response};
+use caldata::component::IcalCalendar;
+use caldata::generator::Emitter;
+use caldata::parser::ContentLine;
 use headers::{ContentType, HeaderMapExt};
 use http::{HeaderValue, Method, StatusCode, header};
-use ical::component::IcalCalendar;
-use ical::generator::Emitter;
-use ical::property::ContentLine;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::str::FromStr;

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

@@ -4,8 +4,9 @@ use axum::{
     extract::{Path, State},
     response::{IntoResponse, Response},
 };
+use caldata::component::{Component, ComponentMut};
+use caldata::{IcalParser, parser::ParserOptions};
 use http::StatusCode;
-use ical::parser::{Component, ComponentMut};
 use rustical_dav::header::Overwrite;
 use rustical_ical::CalendarObjectType;
 use rustical_store::{
@@ -25,7 +26,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
         return Err(Error::Unauthorized);
     }
 
-    let parser = ical::IcalParser::from_slice(body.as_bytes());
+    let parser = IcalParser::from_slice(body.as_bytes());
     let mut cal = match parser.expect_one() {
         Ok(cal) => cal.mutable(),
         Err(err) => return Ok((StatusCode::BAD_REQUEST, err.to_string()).into_response()),
@@ -49,7 +50,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     cal.remove_property("X-WR-CALDESC");
     cal.remove_property("X-WR-CALCOLOR");
     cal.remove_property("X-WR-TIMEZONE");
-    let cal = cal.build(None).unwrap();
+    let cal = cal.build(&ParserOptions::default(), None).unwrap();
 
     // Make sure timezone is valid
     if let Some(timezone_id) = timezone_id.as_ref() {

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

@@ -1,10 +1,13 @@
+use std::str::FromStr;
+
 use crate::Error;
 use crate::calendar::CalendarResourceService;
 use crate::calendar::prop::SupportedCalendarComponentSet;
+use crate::error::Precondition;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
+use caldata::IcalParser;
 use http::{Method, StatusCode};
-use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
@@ -84,21 +87,33 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     }
 
     let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
+        if chrono_tz::Tz::from_str(&tzid).is_err() {
+            return Err(Error::PreconditionFailed(Precondition::CalendarTimezone(
+                "Invalid timezone ID in calendar-timezone-id",
+            )));
+        }
         Some(tzid)
     } else if let Some(tz) = request.calendar_timezone {
-        // TODO: Proper error (calendar-timezone precondition)
         let calendar = IcalParser::from_slice(tz.as_bytes())
             .next()
-            .ok_or_else(|| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?
+            .ok_or(Error::PreconditionFailed(Precondition::CalendarTimezone(
-            .map_err(|_| rustical_dav::Error::BadRequest("Error parsing timezone".to_owned()))?;
+                "No timezone data provided",
+            )))?
+            .map_err(|_| {
+                Error::PreconditionFailed(Precondition::CalendarTimezone("Error parsing timezone"))
+            })?;
 
-        let timezone = calendar.vtimezones.values().next().ok_or_else(|| {
+        let timezone = calendar
-            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+            .vtimezones
-        })?;
+            .values()
+            .next()
+            .ok_or(Error::PreconditionFailed(Precondition::CalendarTimezone(
+                "No timezone data provided",
+            )))?;
         let timezone: Option<chrono_tz::Tz> = timezone.into();
-        let timezone = timezone.ok_or_else(|| {
+        let timezone = timezone.ok_or(Error::PreconditionFailed(
-            rustical_dav::Error::BadRequest("Cannot translate VTIMEZONE into IANA TZID".to_owned())
+            Precondition::CalendarTimezone("No timezone data provided"),
-        })?;
+        ))?;
 
         Some(timezone.name().to_owned())
     } else {

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

@@ -2,9 +2,12 @@ use crate::calendar::methods::report::calendar_query::{
     TimeRangeElement,
     prop_filter::{PropFilterElement, PropFilterable},
 };
-use ical::{
+use caldata::{
-    component::{CalendarInnerData, IcalAlarm, IcalCalendarObject, IcalEvent, IcalTodo},
+    component::{
-    parser::{Component, ical::component::IcalTimeZone},
+        CalendarInnerData, Component, IcalAlarm, IcalCalendarObject, IcalEvent, IcalTimeZone,
+        IcalTodo,
+    },
+    parser::ContentLine,
 };
 use rustical_xml::XmlDeserialize;
 
@@ -112,10 +115,7 @@ impl CompFilterable for CalendarInnerData {
 }
 
 impl PropFilterable for IcalAlarm {
-    fn get_named_properties<'a>(
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
-        &'a self,
-        name: &'a str,
-    ) -> impl Iterator<Item = &'a ical::property::ContentLine> {
         Component::get_named_properties(self, name)
     }
 }
@@ -139,7 +139,7 @@ impl PropFilterable for CalendarInnerData {
     fn get_named_properties<'a>(
         &'a self,
         name: &'a str,
-    ) -> Box<dyn Iterator<Item = &'a ical::property::ContentLine> + 'a> {
+    ) -> Box<dyn Iterator<Item = &'a ContentLine> + 'a> {
         // TODO: If we were pedantic, we would have to do recurrence expansion first
         // and take into account the overrides :(
         match self {
@@ -151,10 +151,7 @@ impl PropFilterable for CalendarInnerData {
 }
 
 impl PropFilterable for IcalCalendarObject {
-    fn get_named_properties<'a>(
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
-        &'a self,
-        name: &'a str,
-    ) -> impl Iterator<Item = &'a ical::property::ContentLine> {
         Component::get_named_properties(self, name)
     }
 }
@@ -185,10 +182,7 @@ impl CompFilterable for IcalCalendarObject {
 }
 
 impl PropFilterable for IcalTimeZone {
-    fn get_named_properties<'a>(
+    fn get_named_properties<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a ContentLine> {
-        &'a self,
-        name: &'a str,
-    ) -> impl Iterator<Item = &'a ical::property::ContentLine> {
         Component::get_named_properties(self, name)
     }
 }

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

@@ -1,6 +1,6 @@
 use super::comp_filter::{CompFilterElement, CompFilterable};
 use crate::calendar_object::CalendarObjectPropWrapperName;
-use ical::{component::IcalCalendarObject, property::ContentLine};
+use caldata::{component::IcalCalendarObject, parser::ContentLine};
 use rustical_dav::xml::{PropfindType, TextMatchElement};
 use rustical_ical::UtcDateTime;
 use rustical_store::calendar_store::CalendarQuery;

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

@@ -1,5 +1,5 @@
 use super::{ParamFilterElement, TimeRangeElement};
-use ical::{property::ContentLine, types::CalDateTime};
+use caldata::{parser::ContentLine, types::CalDateTime};
 use rustical_dav::xml::TextMatchElement;
 use rustical_ical::UtcDateTime;
 use rustical_xml::XmlDeserialize;

crates/caldav/src/calendar/resource.rs

@@ -1,10 +1,10 @@
 use super::prop::{SupportedCalendarComponentSet, SupportedCalendarData};
 use crate::Error;
 use crate::calendar::prop::{ReportMethod, SupportedCollationSet};
+use caldata::IcalParser;
+use caldata::types::CalDateTime;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
-use ical::IcalParser;
-use ical::types::CalDateTime;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };

crates/caldav/src/calendar/service.rs

@@ -6,7 +6,7 @@ use crate::calendar::methods::report::route_report_calendar;
 use crate::calendar::resource::CalendarResource;
 use crate::calendar_object::CalendarObjectResourceService;
 use crate::calendar_object::resource::CalendarObjectResource;
-use crate::{CalDavPrincipalUri, Error};
+use crate::{CalDavConfig, CalDavPrincipalUri, Error};
 use async_trait::async_trait;
 use axum::Router;
 use axum::extract::Request;
@@ -23,6 +23,7 @@ use tower::Service;
 pub struct CalendarResourceService<C: CalendarStore, S: SubscriptionStore> {
     pub(crate) cal_store: Arc<C>,
     pub(crate) sub_store: Arc<S>,
+    pub(crate) config: Arc<CalDavConfig>,
 }
 
 impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C, S> {
@@ -30,15 +31,17 @@ impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C
         Self {
             cal_store: self.cal_store.clone(),
             sub_store: self.sub_store.clone(),
+            config: self.config.clone(),
         }
     }
 }
 
 impl<C: CalendarStore, S: SubscriptionStore> CalendarResourceService<C, S> {
-    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
+    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>, config: Arc<CalDavConfig>) -> Self {
         Self {
             cal_store,
             sub_store,
+            config,
         }
     }
 }
@@ -112,7 +115,8 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
         Router::new()
             .nest(
                 "/{object_id}",
-                CalendarObjectResourceService::new(self.cal_store.clone()).axum_router(),
+                CalendarObjectResourceService::new(self.cal_store.clone(), self.config.clone())
+                    .axum_router(),
             )
             .route_service("/", self.axum_service())
     }

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

@@ -12,7 +12,7 @@ PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Berlin
-LAST-MODIFIED:20250723T190331Z
+LAST-MODIFIED:20260124T185655Z
 X-LIC-LOCATION:Europe/Berlin
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD

crates/caldav/src/calendar_object/methods.rs

@@ -5,6 +5,7 @@ use axum::body::Body;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::TypedHeader;
+use caldata::parser::ParserOptions;
 use headers::{ContentType, ETag, HeaderMapExt, IfNoneMatch};
 use http::{HeaderMap, HeaderValue, Method, StatusCode};
 use rustical_ical::CalendarObject;
@@ -20,7 +21,10 @@ pub async fn get_event<C: CalendarStore>(
         calendar_id,
         object_id,
     }): Path<CalendarObjectPathComponents>,
-    State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
+    State(CalendarObjectResourceService {
+        cal_store,
+        config: _,
+    }): State<CalendarObjectResourceService<C>>,
     user: Principal,
     method: Method,
 ) -> Result<Response, Error> {
@@ -57,7 +61,9 @@ pub async fn put_event<C: CalendarStore>(
         calendar_id,
         object_id,
     }): Path<CalendarObjectPathComponents>,
-    State(CalendarObjectResourceService { cal_store }): State<CalendarObjectResourceService<C>>,
+    State(CalendarObjectResourceService { cal_store, config }): State<
+        CalendarObjectResourceService<C>,
+    >,
     user: Principal,
     mut if_none_match: Option<TypedHeader<IfNoneMatch>>,
     header_map: HeaderMap,
@@ -94,7 +100,12 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(body.clone()) {
+    let object = match CalendarObject::import(
+        &body,
+        Some(ParserOptions {
+            rfc7809: config.rfc7809,
+        }),
+    ) {
         Ok(object) => object,
         Err(err) => {
             warn!("invalid calendar data:\n{body}");

crates/caldav/src/calendar_object/resource.rs

@@ -3,8 +3,8 @@ use super::prop::{
     CalendarObjectPropWrapperName,
 };
 use crate::Error;
+use caldata::generator::Emitter;
 use derive_more::derive::{From, Into};
-use ical::generator::Emitter;
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
     privileges::UserPrivilegeSet,

crates/caldav/src/calendar_object/service.rs

@@ -1,5 +1,5 @@
 use crate::{
-    CalDavPrincipalUri, Error,
+    CalDavConfig, CalDavPrincipalUri, Error,
     calendar_object::{
         methods::{get_event, put_event},
         resource::CalendarObjectResource,
@@ -24,19 +24,21 @@ pub struct CalendarObjectPathComponents {
 
 pub struct CalendarObjectResourceService<C: CalendarStore> {
     pub(crate) cal_store: Arc<C>,
+    pub(crate) config: Arc<CalDavConfig>,
 }
 
 impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
     fn clone(&self) -> Self {
         Self {
             cal_store: self.cal_store.clone(),
+            config: self.config.clone(),
         }
     }
 }
 
 impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub const fn new(cal_store: Arc<C>) -> Self {
+    pub const fn new(cal_store: Arc<C>, config: Arc<CalDavConfig>) -> Self {
-        Self { cal_store }
+        Self { cal_store, config }
     }
 }
 

crates/caldav/src/error.rs

@@ -12,6 +12,9 @@ pub enum Precondition {
     #[error("valid-calendar-data")]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     ValidCalendarData,
+    #[error("calendar-timezone")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    CalendarTimezone(&'static str),
 }
 
 impl IntoResponse for Precondition {
@@ -23,7 +26,7 @@ impl IntoResponse for Precondition {
         if let Err(err) = error.serialize_root(&mut writer) {
             return rustical_dav::Error::from(err).into_response();
         }
-        let mut res = Response::builder().status(StatusCode::PRECONDITION_FAILED);
+        let mut res = Response::builder().status(StatusCode::FORBIDDEN);
         res.headers_mut().unwrap().typed_insert(ContentType::xml());
         res.body(Body::from(output)).unwrap()
     }
@@ -72,7 +75,10 @@ impl Error {
             Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
             Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
-            Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
+            // The correct status code for a failed precondition is not PreconditionFailed but
+            // Forbidden (or Conflict):
+            // https://datatracker.ietf.org/doc/html/rfc4791#section-1.3
+            Self::PreconditionFailed(_err) => StatusCode::FORBIDDEN,
         }
     }
 }
@@ -82,10 +88,7 @@ impl IntoResponse for Error {
         if let Self::PreconditionFailed(precondition) = self {
             return precondition.into_response();
         }
-        if matches!(
+        if matches!(self.status_code(), StatusCode::INTERNAL_SERVER_ERROR) {
-            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

@@ -8,6 +8,7 @@ use rustical_dav::resources::RootResourceService;
 use rustical_store::auth::middleware::AuthenticationLayer;
 use rustical_store::auth::{AuthenticationProvider, Principal};
 use rustical_store::{CalendarStore, SubscriptionStore};
+use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
 pub mod calendar;
@@ -34,6 +35,7 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
     store: Arc<C>,
     subscription_store: Arc<S>,
     simplified_home_set: bool,
+    config: Arc<CalDavConfig>,
 ) -> Router {
     Router::new().nest(
         prefix,
@@ -42,9 +44,27 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
             sub_store: subscription_store,
             cal_store: store,
             simplified_home_set,
+            config,
         })
         .axum_router()
         .layer(AuthenticationLayer::new(auth_provider))
         .layer(Extension(CalDavPrincipalUri(prefix))),
     )
 }
+
+const fn default_true() -> bool {
+    true
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(deny_unknown_fields, default)]
+pub struct CalDavConfig {
+    #[serde(default = "default_true")]
+    rfc7809: bool,
+}
+
+impl Default for CalDavConfig {
+    fn default() -> Self {
+        Self { rfc7809: true }
+    }
+}

crates/caldav/src/principal/service.rs

@@ -1,7 +1,7 @@
 use crate::calendar::CalendarResourceService;
 use crate::calendar::resource::CalendarResource;
 use crate::principal::PrincipalResource;
-use crate::{CalDavPrincipalUri, Error};
+use crate::{CalDavConfig, CalDavPrincipalUri, Error};
 use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::resource::{AxumMethods, ResourceService};
@@ -20,6 +20,7 @@ pub struct PrincipalResourceService<
     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,
+    pub(crate) config: Arc<CalDavConfig>,
 }
 
 impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
@@ -31,6 +32,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Clone
             sub_store: self.sub_store.clone(),
             cal_store: self.cal_store.clone(),
             simplified_home_set: self.simplified_home_set,
+            config: self.config.clone(),
         }
     }
 }
@@ -84,8 +86,12 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
         Router::new()
             .nest(
                 "/{calendar_id}",
-                CalendarResourceService::new(self.cal_store.clone(), self.sub_store.clone())
+                CalendarResourceService::new(
-                    .axum_router(),
+                    self.cal_store.clone(),
+                    self.sub_store.clone(),
+                    self.config.clone(),
+                )
+                .axum_router(),
             )
             .route_service("/", self.axum_service())
     }

crates/caldav/src/principal/tests.rs

@@ -27,6 +27,7 @@ async fn test_principal_resource(
         sub_store: Arc::new(sub_store),
         auth_provider: Arc::new(auth_provider),
         simplified_home_set: false,
+        config: Default::default(),
     };
 
     // We don't have any calendars here

crates/carddav/Cargo.toml

@@ -32,7 +32,7 @@ rustical_ical.workspace = true
 http.workspace = true
 tower-http.workspace = true
 percent-encoding.workspace = true
-ical.workspace = true
+caldata.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 rstest.workspace = true

crates/carddav/src/address_object/resource.rs

@@ -7,8 +7,8 @@ use crate::{
         AddressObjectPropWrapperName,
     },
 };
+use caldata::property::VcardFNProperty;
 use derive_more::derive::{From, Into};
-use ical::parser::VcardFNProperty;
 use rustical_dav::{
     extensions::CommonPropertiesExtension,
     privileges::UserPrivilegeSet,

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

@@ -4,11 +4,12 @@ use axum::{
     extract::{Path, State},
     response::{IntoResponse, Response},
 };
-use http::StatusCode;
+use caldata::{
-use ical::{
+    VcardParser,
-    parser::{Component, ComponentMut, vcard},
+    component::{Component, ComponentMut},
-    property::ContentLine,
+    parser::{ContentLine, ParserOptions},
 };
+use http::StatusCode;
 use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
 use tracing::instrument;
 
@@ -23,7 +24,7 @@ pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
         return Err(Error::Unauthorized);
     }
 
-    let parser = vcard::VcardParser::from_slice(body.as_bytes());
+    let parser = VcardParser::from_slice(body.as_bytes());
 
     let mut objects = vec![];
     for res in parser {
@@ -36,7 +37,7 @@ pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
                 value: Some(uuid::Uuid::new_v4().to_string()),
                 params: vec![].into(),
             });
-            card = card_mut.build(None).unwrap();
+            card = card_mut.build(&ParserOptions::default(), None).unwrap();
         }
         // TODO: Make nicer
         let uid = card.get_uid().unwrap();

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

@@ -2,8 +2,8 @@ use crate::{
     address_object::AddressObjectPropWrapperName,
     addressbook::methods::report::addressbook_query::PropFilterElement,
 };
+use caldata::parser::ContentLine;
 use derive_more::{From, Into};
-use ical::property::ContentLine;
 use rustical_dav::xml::{PropfindType, TextMatchElement};
 use rustical_ical::{AddressObject, UtcDateTime};
 use rustical_xml::{ValueDeserialize, XmlDeserialize, XmlRootTag};

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

@@ -1,5 +1,5 @@
 use super::{Allof, ParamFilterElement};
-use ical::{parser::Component, property::ContentLine};
+use caldata::{component::Component, parser::ContentLine};
 use rustical_dav::xml::TextMatchElement;
 use rustical_ical::AddressObject;
 use rustical_xml::XmlDeserialize;

crates/dav/Cargo.toml

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

crates/dav/src/error.rs

@@ -51,19 +51,18 @@ impl Error {
                 _ => StatusCode::BAD_REQUEST,
             },
             Self::PropReadOnly => StatusCode::CONFLICT,
-            Self::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
             Self::InternalError | Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
-            Self::Forbidden => StatusCode::FORBIDDEN,
+            // The correct status code for a failed precondition is not PreconditionFailed but
+            // Forbidden (or Conflict):
+            // https://datatracker.ietf.org/doc/html/rfc4791#section-1.3
+            Self::PreconditionFailed | Self::Forbidden => StatusCode::FORBIDDEN,
         }
     }
 }
 
 impl axum::response::IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
-        if matches!(
+        if matches!(self.status_code(), StatusCode::INTERNAL_SERVER_ERROR) {
-            self.status_code(),
-            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
-        ) {
             error!("{self}");
         }
 

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

@@ -71,6 +71,7 @@ pub async fn axum_route_proppatch<R: ResourceService>(
     route_proppatch(&path, uri.path(), &body, &principal, &resource_service).await
 }
 
+#[allow(clippy::too_many_lines)]
 pub async fn route_proppatch<R: ResourceService>(
     path_components: &R::PathComponents,
     path: &str,
@@ -116,12 +117,14 @@ pub async fn route_proppatch<R: ResourceService>(
                             }
                         }
                         SetPropertyPropWrapper::Invalid(invalid) => {
-                            let propname = invalid.tag_name();
+                            let Unparsed(propns, propname) = invalid;
 
                             if let Some(full_propname) = <R::Resource as Resource>::list_props()
                                 .into_iter()
                                 .find_map(|(ns, tag)| {
-                                    if tag == propname.as_str() {
+                                    if (ns, tag)
+                                        == (propns.as_ref().map(NamespaceOwned::as_ref), &propname)
+                                    {
                                         Some((ns.map(NamespaceOwned::from), tag.to_owned()))
                                     } else {
                                         None
@@ -133,7 +136,7 @@ pub async fn route_proppatch<R: ResourceService>(
                                 // - internal properties
                                 props_conflict.push(full_propname);
                             } else {
-                                props_not_found.push((None, propname));
+                                props_not_found.push((propns, propname));
                             }
                         }
                     }

crates/dav/src/xml/text_match.rs

@@ -1,4 +1,4 @@
-use ical::property::ContentLine;
+use caldata::parser::ContentLine;
 use rustical_xml::{ValueDeserialize, XmlDeserialize};
 use std::borrow::Cow;
 

crates/ical/Cargo.toml

@@ -15,7 +15,7 @@ chrono-tz.workspace = true
 thiserror.workspace = true
 derive_more.workspace = true
 rustical_xml.workspace = true
-ical.workspace = true
+caldata.workspace = true
 regex.workspace = true
 rrule.workspace = true
 serde.workspace = true

crates/ical/src/address_object.rs

@@ -1,20 +1,23 @@
 use crate::{CalendarObject, Error};
+use caldata::{
+    VcardParser,
+    component::{
+        CalendarInnerDataBuilder, ComponentMut, IcalAlarmBuilder, IcalCalendarObjectBuilder,
+        IcalEventBuilder, VcardContact,
+    },
+    generator::Emitter,
+    parser::{ContentLine, ParserOptions},
+    property::{
+        Calscale, IcalCALSCALEProperty, IcalDTENDProperty, IcalDTSTAMPProperty,
+        IcalDTSTARTProperty, IcalPRODIDProperty, IcalRRULEProperty, IcalSUMMARYProperty,
+        IcalUIDProperty, IcalVERSIONProperty, IcalVersion, VcardANNIVERSARYProperty,
+        VcardBDAYProperty, VcardFNProperty,
+    },
+    types::{CalDate, PartialDate, Timezone},
+};
 use chrono::{NaiveDate, Utc};
-use ical::component::{
-    CalendarInnerDataBuilder, IcalAlarmBuilder, IcalCalendarObjectBuilder, IcalEventBuilder,
-};
-use ical::generator::Emitter;
-use ical::parser::vcard::{self, component::VcardContact};
-use ical::parser::{
-    Calscale, ComponentMut, IcalCALSCALEProperty, IcalDTENDProperty, IcalDTSTAMPProperty,
-    IcalDTSTARTProperty, IcalPRODIDProperty, IcalRRULEProperty, IcalSUMMARYProperty,
-    IcalUIDProperty, IcalVERSIONProperty, IcalVersion, VcardANNIVERSARYProperty, VcardBDAYProperty,
-    VcardFNProperty,
-};
-use ical::property::ContentLine;
-use ical::types::{CalDate, PartialDate};
 use sha2::{Digest, Sha256};
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::str::FromStr;
 
 #[derive(Debug, Clone)]
@@ -32,7 +35,7 @@ impl From<VcardContact> for AddressObject {
 
 impl AddressObject {
     pub fn from_vcf(vcf: String) -> Result<Self, Error> {
-        let parser = vcard::VcardParser::from_slice(vcf.as_bytes());
+        let parser = VcardParser::from_slice(vcf.as_bytes());
         let vcard = parser.expect_one()?;
         Ok(Self { vcf, vcard })
     }
@@ -70,7 +73,7 @@ impl AddressObject {
         let Some(dtstart) = NaiveDate::from_ymd_opt(year.unwrap_or(1900), month, day) else {
             return Ok(None);
         };
-        let start_date = CalDate(dtstart, ical::types::Timezone::Local);
+        let start_date = CalDate(dtstart, Timezone::Local);
         let Some(end_date) = start_date.succ_opt() else {
             // start_date is MAX_DATE, this should never happen but FAPP also not raise an error
             return Ok(None);
@@ -131,9 +134,9 @@ impl AddressObject {
                     .into(),
                 ],
                 inner: Some(CalendarInnerDataBuilder::Event(vec![event])),
-                vtimezones: HashMap::default(),
+                vtimezones: BTreeMap::default(),
             }
-            .build(None)?
+            .build(&ParserOptions::default(), None)?
             .into(),
         ))
     }

crates/ical/src/calendar_object.rs

@@ -1,9 +1,13 @@
+use std::sync::OnceLock;
+
 use crate::Error;
+use caldata::{
+    IcalObjectParser,
+    component::{CalendarInnerData, IcalCalendarObject},
+    generator::Emitter,
+    parser::ParserOptions,
+};
 use derive_more::Display;
-use ical::IcalObjectParser;
-use ical::component::CalendarInnerData;
-use ical::component::IcalCalendarObject;
-use ical::generator::Emitter;
 use serde::Deserialize;
 use serde::Serialize;
 use sha2::{Digest, Sha256};
@@ -64,15 +68,35 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
 #[derive(Debug, Clone)]
 pub struct CalendarObject {
     inner: IcalCalendarObject,
-    ics: String,
+    ics: OnceLock<String>,
 }
 
 impl CalendarObject {
+    // This function parses iCalendar data but doesn't cache it
+    // This is meant for iCalendar data coming from outside that might need to be normalised.
+    // For example if timezones are omitted this can be fixed by this function.
+    pub fn import(ics: &str, options: Option<ParserOptions>) -> Result<Self, Error> {
+        let parser =
+            IcalObjectParser::from_slice(ics.as_bytes()).with_options(options.unwrap_or_default());
+        let inner = parser.expect_one()?;
+
+        Ok(Self {
+            inner,
+            ics: OnceLock::new(),
+        })
+    }
+
+    // This function parses iCalendar data and then caches the parsed iCalendar data.
+    // This function is only meant for loading data from a data store where we know the iCalendar
+    // is already in the desired form.
     pub fn from_ics(ics: String) -> Result<Self, Error> {
         let parser = IcalObjectParser::from_slice(ics.as_bytes());
         let inner = parser.expect_one()?;
 
-        Ok(Self { inner, ics })
+        Ok(Self {
+            inner,
+            ics: ics.into(),
+        })
     }
 
     #[must_use]
@@ -95,7 +119,7 @@ impl CalendarObject {
 
     #[must_use]
     pub fn get_ics(&self) -> &str {
-        &self.ics
+        self.ics.get_or_init(|| self.inner.generate())
     }
 
     #[must_use]
@@ -113,7 +137,7 @@ impl From<CalendarObject> for IcalCalendarObject {
 impl From<IcalCalendarObject> for CalendarObject {
     fn from(value: IcalCalendarObject) -> Self {
         Self {
-            ics: value.generate(),
+            ics: value.generate().into(),
             inner: value,
         }
     }

crates/ical/src/lib.rs

@@ -1,7 +1,7 @@
 #![warn(clippy::all, clippy::pedantic, clippy::nursery)]
 #![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 mod timestamp;
-use ical::parser::ParserError;
+use caldata::parser::ParserError;
 pub use timestamp::*;
 
 mod calendar_object;

crates/store/Cargo.toml

@@ -13,7 +13,7 @@ anyhow.workspace = true
 async-trait.workspace = true
 serde.workspace = true
 sha2.workspace = true
-ical.workspace = true
+caldata.workspace = true
 chrono.workspace = true
 regex.workspace = true
 thiserror.workspace = true

crates/store/src/error.rs

@@ -26,7 +26,7 @@ pub enum Error {
     Other(#[from] anyhow::Error),
 
     #[error(transparent)]
-    IcalError(#[from] ical::parser::ParserError),
+    IcalError(#[from] caldata::parser::ParserError),
 }
 
 impl Error {
@@ -36,7 +36,6 @@ impl Error {
             Self::NotFound => StatusCode::NOT_FOUND,
             Self::AlreadyExists => StatusCode::CONFLICT,
             Self::ReadOnly => StatusCode::FORBIDDEN,
-            // TODO: Can also be Bad Request, depending on when this is raised
             Self::IcalError(_err) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::InvalidPrincipalType(_) => StatusCode::BAD_REQUEST,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
@@ -53,9 +52,7 @@ impl IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
         if matches!(
             self.status_code(),
-            StatusCode::INTERNAL_SERVER_ERROR
+            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::CONFLICT
-                | StatusCode::PRECONDITION_FAILED
-                | StatusCode::CONFLICT
         ) {
             error!("{self}");
         }

crates/store_sqlite/Cargo.toml

@@ -20,7 +20,7 @@ rstest.workspace = true
 criterion.workspace = true
 
 [dependencies]
-ical.workspace = true
+caldata.workspace = true
 tokio.workspace = true
 rustical_store.workspace = true
 async-trait.workspace = true

crates/store_sqlite/src/addressbook_store/birthday_calendar.rs

@@ -338,7 +338,7 @@ impl CalendarStore for SqliteAddressbookStore {
                 out_objects.push((format!("{object_id}-birthday"), birthday));
             }
             if let Some(anniversary) = object.get_anniversary_object()? {
-                out_objects.push((format!("{object_id}-anniversayr"), anniversary));
+                out_objects.push((format!("{object_id}-anniversary"), anniversary));
             }
         }
 
@@ -382,7 +382,7 @@ impl CalendarStore for SqliteAddressbookStore {
                 objects.push((format!("{object_id}-birthday"), birthday));
             }
             if let Some(anniversary) = object.get_anniversary_object()? {
-                objects.push((format!("{object_id}-anniversayr"), anniversary));
+                objects.push((format!("{object_id}-anniversary"), anniversary));
             }
         }
         Ok(objects)

crates/store_sqlite/src/addressbook_store/mod.rs

@@ -1,8 +1,8 @@
 use super::ChangeOperation;
 use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
+use caldata::parser::ParserError;
 use derive_more::derive::Constructor;
-use ical::parser::ParserError;
 use rustical_ical::AddressObject;
 use rustical_store::{
     Addressbook, AddressbookStore, CollectionMetadata, CollectionOperation,

crates/store_sqlite/src/calendar_store.rs

@@ -1,10 +1,10 @@
 use super::ChangeOperation;
 use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
+use caldata::parser::ParserError;
+use caldata::types::CalDateTime;
 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;

crates/store_sqlite/src/lib.rs

@@ -37,11 +37,11 @@ impl SqliteStore {
 }
 
 pub async fn create_db_pool(db_url: &str, migrate: bool) -> Result<Pool<Sqlite>, sqlx::Error> {
+    let options: SqliteConnectOptions = db_url.parse()?;
+
     let db = SqlitePool::connect_with(
-        SqliteConnectOptions::new()
+        options
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(sqlx::sqlite::SqliteSynchronous::Normal)
-            .filename(db_url)
             .create_if_missing(true),
     )
     .await?;

crates/store_sqlite/src/tests/mod.rs

@@ -1,6 +1,6 @@
 use crate::{
     SqliteStore, addressbook_store::SqliteAddressbookStore, calendar_store::SqliteCalendarStore,
-    principal_store::SqlitePrincipalStore,
+    create_db_pool, principal_store::SqlitePrincipalStore,
 };
 use rstest::fixture;
 use rustical_store::auth::{AuthenticationProvider, Principal, PrincipalType};
@@ -9,12 +9,23 @@ use sqlx::SqlitePool;
 mod addressbook_store;
 mod calendar_store;
 
-async fn get_test_db() -> SqlitePool {
+#[derive(Debug, Clone)]
-    let db = SqlitePool::connect("sqlite::memory:").await.unwrap();
+pub struct TestStoreContext {
-    sqlx::migrate!("./migrations").run(&db).await.unwrap();
+    pub db: SqlitePool,
+    pub addr_store: SqliteAddressbookStore,
+    pub cal_store: SqliteCalendarStore,
+    pub principal_store: SqlitePrincipalStore,
+    pub sub_store: SqliteStore,
+}
+
+#[fixture]
+pub async fn test_store_context() -> TestStoreContext {
+    let (send_addr, _recv) = tokio::sync::mpsc::channel(1);
+    let (send_cal, _recv) = tokio::sync::mpsc::channel(1);
+    let db = create_db_pool(":memory:", true).await.unwrap();
 
-    // Populate with test data
     let principal_store = SqlitePrincipalStore::new(db.clone());
+    // Populate with test data
     principal_store
         .insert_principal(
             Principal {
@@ -33,28 +44,11 @@ async fn get_test_db() -> SqlitePool {
         .await
         .unwrap();
 
-    db
-}
-
-#[derive(Debug, Clone)]
-pub struct TestStoreContext {
-    pub db: SqlitePool,
-    pub addr_store: SqliteAddressbookStore,
-    pub cal_store: SqliteCalendarStore,
-    pub principal_store: SqlitePrincipalStore,
-    pub sub_store: SqliteStore,
-}
-
-#[fixture]
-pub async fn test_store_context() -> TestStoreContext {
-    let (send_addr, _recv) = tokio::sync::mpsc::channel(1);
-    let (send_cal, _recv) = tokio::sync::mpsc::channel(1);
-    let db = get_test_db().await;
     TestStoreContext {
         db: db.clone(),
         addr_store: SqliteAddressbookStore::new(db.clone(), send_addr, false),
         cal_store: SqliteCalendarStore::new(db.clone(), send_cal, false),
-        principal_store: SqlitePrincipalStore::new(db.clone()),
+        principal_store,
         sub_store: SqliteStore::new(db),
     }
 }

crates/xml/src/namespace.rs

@@ -1,6 +1,6 @@
 use quick_xml::name::Namespace;
 
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
 pub struct NamespaceOwned(pub Vec<u8>);
 
 impl<'a> From<Namespace<'a>> for NamespaceOwned {

crates/xml/src/unparsed.rs

@@ -1,18 +1,21 @@
 use std::io::BufRead;
 
-use quick_xml::events::BytesStart;
+use quick_xml::{events::BytesStart, name::ResolveResult};
 
-use crate::{XmlDeserialize, XmlError};
+use crate::{NamespaceOwned, XmlDeserialize, XmlError};
 
-// TODO: actually implement
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Unparsed(String);
+pub struct Unparsed(pub Option<NamespaceOwned>, pub String);
 
 impl Unparsed {
     #[must_use]
-    pub fn tag_name(&self) -> String {
+    pub const fn ns(&self) -> Option<&NamespaceOwned> {
-        // TODO: respect namespace?
+        self.0.as_ref()
-        self.0.clone()
+    }
+
+    #[must_use]
+    pub const fn tag_name(&self) -> &str {
+        self.1.as_str()
     }
 }
 
@@ -27,7 +30,12 @@ impl XmlDeserialize for Unparsed {
             let mut buf = vec![];
             reader.read_to_end_into(start.name(), &mut buf)?;
         }
-        let tag_name = String::from_utf8_lossy(start.local_name().as_ref()).to_string();
+        let (ns, tag_name) = reader.resolver().resolve_element(start.name());
-        Ok(Self(tag_name))
+        let ns: Option<NamespaceOwned> = match ns {
+            ResolveResult::Bound(ns) => Some(ns.into()),
+            ResolveResult::Unbound | ResolveResult::Unknown(_) => None,
+        };
+        let tag_name = String::from_utf8_lossy(tag_name.as_ref()).to_string();
+        Ok(Self(ns, tag_name))
     }
 }

docs/installation/index.md

@@ -48,3 +48,26 @@ Since the app tokens are random they use the faster `pbkdf2` algorithm.
 ```sh
 cargo install --locked --git https://github.com/lennart-k/rustical
 ```
+
+## NixOS (community-maintained by [@PopeRigby](https://github.com/PopeRigby))
+
+!!! warning
+    The NixOS package is not maintained by myself but since I appreciate [@PopeRigby](https://github.com/PopeRigby)'s work on it I want to mention it.
+    Since rustical's development is still quite active I **strongly** recommend installing from the `nixpkgs-unstable` branch.
+
+In the `nixpkgs-unstable` you'll find a `rustical` package you can install.
+
+There's also a service that has not been merged yet. If you know how to add modules from PRs in Nix
+you can already install it <https://github.com/NixOS/nixpkgs/pull/424188>
+and then setup rustical as a service:
+
+```nix title="In your configuration.nix"
+services.rustical = {
+    enable = true;
+    package = inputs.rustical.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rustical;
+    settings = {
+        # Settings the same as in config.toml but in Nix syntax
+        # http.port = 3002;
+    };
+};
+```

src/app.rs

@@ -9,7 +9,7 @@ use axum_extra::TypedHeader;
 use headers::{HeaderMapExt, UserAgent};
 use http::header::CONNECTION;
 use http::{HeaderValue, StatusCode};
-use rustical_caldav::caldav_router;
+use rustical_caldav::{CalDavConfig, caldav_router};
 use rustical_carddav::carddav_router;
 use rustical_frontend::nextcloud_login::nextcloud_login_router;
 use rustical_frontend::{FrontendConfig, frontend_router};
@@ -32,7 +32,8 @@ use tracing::field::display;
 #[allow(
     clippy::too_many_arguments,
     clippy::too_many_lines,
-    clippy::cognitive_complexity
+    clippy::cognitive_complexity,
+    clippy::missing_panics_doc
 )]
 pub fn make_app<
     AS: AddressbookStore + PrefixedCalendarStore,
@@ -45,6 +46,7 @@ pub fn make_app<
     auth_provider: Arc<impl AuthenticationProvider>,
     frontend_config: FrontendConfig,
     oidc_config: Option<OidcConfig>,
+    caldav_config: CalDavConfig,
     nextcloud_login_config: &NextcloudLoginConfig,
     dav_push_enabled: bool,
     session_cookie_samesite_strict: bool,
@@ -54,6 +56,8 @@ pub fn make_app<
     let combined_cal_store =
         Arc::new(CombinedCalendarStore::new(cal_store).with_store(birthday_store));
 
+    let caldav_config = Arc::new(caldav_config);
+
     let mut router = Router::new()
         // endpoint to be used by healthcheck to see if rustical is online
         .route("/ping", axum::routing::get(async || "Pong!"))
@@ -63,6 +67,7 @@ pub fn make_app<
             combined_cal_store.clone(),
             subscription_store.clone(),
             false,
+            caldav_config.clone(),
         ))
         .merge(caldav_router(
             "/caldav-compat",
@@ -70,6 +75,7 @@ pub fn make_app<
             combined_cal_store.clone(),
             subscription_store.clone(),
             true,
+            caldav_config,
         ))
         .route(
             "/.well-known/caldav",
@@ -104,9 +110,9 @@ pub fn make_app<
         options(async || {
             let mut resp = Response::builder().status(StatusCode::OK);
             resp.headers_mut()
-                .unwrap()
+                .expect("this always works")
                 .insert("DAV", HeaderValue::from_static("1"));
-            resp.body(Body::empty()).unwrap()
+            resp.body(Body::empty()).expect("empty body always works")
         }),
     );
 

src/commands/health.rs

@@ -7,6 +7,7 @@ pub struct HealthArgs {}
 
 /// Healthcheck for running rustical instance
 /// Currently just pings to see if it's reachable via HTTP
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 pub async fn cmd_health(http_config: HttpConfig, _health_args: HealthArgs) -> anyhow::Result<()> {
     let client = reqwest::ClientBuilder::new().build().unwrap();
 

src/commands/membership.rs

@@ -33,7 +33,8 @@ pub struct MembershipArgs {
     command: MembershipCommand,
 }
 
-pub async fn handle_membership_command(
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
+pub async fn cmd_membership(
     user_store: &impl AuthenticationProvider,
     MembershipArgs { command }: MembershipArgs,
 ) -> anyhow::Result<()> {

src/commands/mod.rs

@@ -3,18 +3,24 @@ use crate::config::{
     SqliteDataStoreConfig, TracingConfig,
 };
 use clap::Parser;
+use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 
-pub mod health;
+mod health;
 pub mod membership;
-pub mod principals;
+mod principals;
+
+pub use health::{HealthArgs, cmd_health};
+pub use principals::{PrincipalsArgs, cmd_principals};
 
 #[derive(Debug, Parser)]
 pub struct GenConfigArgs {}
 
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 pub fn cmd_gen_config(_args: GenConfigArgs) -> anyhow::Result<()> {
     let config = Config {
         http: HttpConfig::default(),
+        caldav: CalDavConfig::default(),
         data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
             db_url: "/var/lib/rustical/db.sqlite3".to_owned(),
             run_repairs: true,

src/commands/principals.rs

@@ -1,5 +1,5 @@
-use super::membership::{MembershipArgs, handle_membership_command};
+use super::membership::MembershipArgs;
-use crate::{config::Config, get_data_stores};
+use crate::{config::Config, get_data_stores, membership::cmd_membership};
 use clap::{Parser, Subcommand};
 use figment::{
     Figment,
@@ -58,6 +58,7 @@ enum Command {
     Membership(MembershipArgs),
 }
 
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
     let config: Config = Figment::new()
         .merge(Toml::file(&args.config_file))
@@ -152,7 +153,7 @@ pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
             println!("Principal {id} updated");
         }
         Command::Membership(args) => {
-            handle_membership_command(principal_store.as_ref(), args).await?;
+            cmd_membership(principal_store.as_ref(), args).await?;
         }
     }
     Ok(())

src/config.rs

@@ -1,3 +1,4 @@
+use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 use rustical_oidc::OidcConfig;
 use serde::{Deserialize, Serialize};
@@ -97,4 +98,6 @@ pub struct Config {
     pub dav_push: DavPushConfig,
     #[serde(default)]
     pub nextcloud_login: NextcloudLoginConfig,
+    #[serde(default)]
+    pub caldav: CalDavConfig,
 }

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__delete_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__mkcalendar_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__0_import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__1_import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__get_body.snap

@@ -1,107 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:RustiCal
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060104T140000
-DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060104T120000
-SUMMARY:Event #2 bis
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001102Z
-DTSTART;TZID=US/Eastern:20060102T100000
-DURATION:PT1H
-SUMMARY:Event #1
-Description:Go Steelers!
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060102T120000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=5
-SUMMARY:Event #2
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-DTSTAMP:20060206T001220Z
-DTSTART;TZID=US/Eastern:20060104T100000
-DURATION:PT1H
-LAST-MODIFIED:20060206T001330Z
-ORGANIZER:mailto:cyrus@example.com
-SEQUENCE:1
-STATUS:TENTATIVE
-SUMMARY:Event #3
-UID:[UID]
-END:VEVENT
-BEGIN:VTODO
-DTSTAMP:20060205T235335Z
-DUE;VALUE=DATE:20060104
-STATUS:NEEDS-ACTION
-SUMMARY:Task #1
-UID:[UID]
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-BEGIN:VTODO
-DTSTAMP:20060205T235300Z
-DUE;VALUE=DATE:20060106
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:NEEDS-ACTION
-SUMMARY:Task #2
-UID:[UID]
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-BEGIN:VTODO
-COMPLETED:20051223T122322Z
-DTSTAMP:20060205T235400Z
-DUE;VALUE=DATE:20051225
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:COMPLETED
-SUMMARY:Task #3
-UID:[UID]
-END:VTODO
-BEGIN:VTODO
-DTSTAMP:20060205T235600Z
-DUE;VALUE=DATE:20060101
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:CANCELLED
-SUMMARY:Task #4
-UID:[UID]
-END:VTODO
-END:VCALENDAR

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__delete_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__get_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook_import__get_body.snap

@@ -1,13 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook_import.rs
-expression: body
----
-BEGIN:VCARD
-VERSION:4.0
-FN:Simon Perreault
-N:Perreault;Simon;;;ing. jr,M.Sc.
-BDAY:--0203
-GENDER:M
-EMAIL;TYPE=work:simon.perreault@viagenie.ca
-UID:[UID]
-END:VCARD

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook_import__import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook_import.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root-2.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/mod.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/mod.rs
-expression: body
----
-

src/lib.rs

@@ -0,0 +1,162 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+use crate::config::Config;
+use anyhow::Result;
+use app::make_app;
+use axum::ServiceExt;
+use axum::extract::Request;
+use clap::{Parser, Subcommand};
+use config::{DataStoreConfig, SqliteDataStoreConfig};
+use rustical_dav_push::DavPushController;
+use rustical_store::auth::AuthenticationProvider;
+use rustical_store::{
+    AddressbookStore, CalendarStore, CollectionOperation, PrefixedCalendarStore, SubscriptionStore,
+};
+use rustical_store_sqlite::addressbook_store::SqliteAddressbookStore;
+use rustical_store_sqlite::calendar_store::SqliteCalendarStore;
+use rustical_store_sqlite::principal_store::SqlitePrincipalStore;
+use rustical_store_sqlite::{SqliteStore, create_db_pool};
+use setup_tracing::setup_tracing;
+use std::sync::Arc;
+use tokio::sync::Notify;
+use tokio::sync::mpsc::Receiver;
+use tower::Layer;
+use tower_http::normalize_path::NormalizePathLayer;
+use tracing::{info, warn};
+
+pub mod app;
+mod commands;
+pub use commands::*;
+pub mod config;
+mod setup_tracing;
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+pub struct Args {
+    #[arg(short, long, env, default_value = "/etc/rustical/config.toml")]
+    pub config_file: String,
+    #[arg(long, env, help = "Do no run database migrations (only for sql store)")]
+    pub no_migrations: bool,
+
+    #[command(subcommand)]
+    pub command: Option<Command>,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum Command {
+    GenConfig(commands::GenConfigArgs),
+    Principals(PrincipalsArgs),
+    #[command(
+        about = "Healthcheck for running instance (Used for HEALTHCHECK in Docker container)"
+    )]
+    Health(HealthArgs),
+}
+
+#[allow(clippy::missing_errors_doc)]
+pub async fn get_data_stores(
+    migrate: bool,
+    config: &DataStoreConfig,
+) -> Result<(
+    Arc<impl AddressbookStore + PrefixedCalendarStore>,
+    Arc<impl CalendarStore>,
+    Arc<impl SubscriptionStore>,
+    Arc<impl AuthenticationProvider>,
+    Receiver<CollectionOperation>,
+)> {
+    Ok(match &config {
+        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+            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(
+                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?;
+                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,
+                subscription_store,
+                principal_store,
+                recv,
+            )
+        }
+    })
+}
+
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
+pub async fn cmd_default(
+    args: Args,
+    config: Config,
+    start_notifier: Option<Arc<Notify>>,
+) -> Result<()> {
+    setup_tracing(&config.tracing);
+
+    let (addr_store, cal_store, subscription_store, principal_store, update_recv) =
+        get_data_stores(!args.no_migrations, &config.data_store).await?;
+
+    let mut tasks = vec![];
+
+    if config.dav_push.enabled {
+        let dav_push_controller = DavPushController::new(
+            config.dav_push.allowed_push_servers,
+            subscription_store.clone(),
+        );
+        tasks.push(tokio::spawn(async move {
+            dav_push_controller.notifier(update_recv).await;
+        }));
+    }
+
+    let app = make_app(
+        addr_store.clone(),
+        cal_store.clone(),
+        subscription_store.clone(),
+        principal_store.clone(),
+        config.frontend.clone(),
+        config.oidc.clone(),
+        config.caldav,
+        &config.nextcloud_login,
+        config.dav_push.enabled,
+        config.http.session_cookie_samesite_strict,
+        config.http.payload_limit_mb,
+    );
+    let app = ServiceExt::<Request>::into_make_service(
+        NormalizePathLayer::trim_trailing_slash().layer(app),
+    );
+
+    let address = format!("{}:{}", config.http.host, config.http.port);
+    let listener = tokio::net::TcpListener::bind(&address).await?;
+    tasks.push(tokio::spawn(async move {
+        info!("RustiCal serving on http://{address}");
+        if let Some(start_notifier) = start_notifier {
+            start_notifier.notify_waiters();
+        }
+        axum::serve(listener, app).await.unwrap();
+    }));
+
+    for task in tasks {
+        task.await?;
+    }
+    Ok(())
+}

src/main.rs

@@ -1,112 +1,12 @@
 #![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-use crate::commands::health::{HealthArgs, cmd_health};
-use crate::config::Config;
 use anyhow::Result;
-use app::make_app;
+use clap::Parser;
-use axum::ServiceExt;
-use axum::extract::Request;
-use clap::{Parser, Subcommand};
-use commands::cmd_gen_config;
-use commands::principals::{PrincipalsArgs, cmd_principals};
-use config::{DataStoreConfig, SqliteDataStoreConfig};
 use figment::Figment;
 use figment::providers::{Env, Format, Toml};
-use rustical_dav_push::DavPushController;
+use rustical::config::Config;
-use rustical_store::auth::AuthenticationProvider;
+use rustical::{Args, Command};
-use rustical_store::{
+use rustical::{cmd_default, cmd_gen_config, cmd_health, cmd_principals};
-    AddressbookStore, CalendarStore, CollectionOperation, PrefixedCalendarStore, SubscriptionStore,
+use tracing::warn;
-};
-use rustical_store_sqlite::addressbook_store::SqliteAddressbookStore;
-use rustical_store_sqlite::calendar_store::SqliteCalendarStore;
-use rustical_store_sqlite::principal_store::SqlitePrincipalStore;
-use rustical_store_sqlite::{SqliteStore, create_db_pool};
-use setup_tracing::setup_tracing;
-use std::sync::Arc;
-use tokio::sync::mpsc::Receiver;
-use tower::Layer;
-use tower_http::normalize_path::NormalizePathLayer;
-use tracing::{info, warn};
-
-mod app;
-mod commands;
-mod config;
-#[cfg(test)]
-pub mod integration_tests;
-mod setup_tracing;
-
-#[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    #[arg(short, long, env, default_value = "/etc/rustical/config.toml")]
-    config_file: String,
-    #[arg(long, env, help = "Do no run database migrations (only for sql store)")]
-    no_migrations: bool,
-
-    #[command(subcommand)]
-    command: Option<Command>,
-}
-
-#[derive(Debug, Subcommand)]
-enum Command {
-    GenConfig(commands::GenConfigArgs),
-    Principals(PrincipalsArgs),
-    #[command(
-        about = "Healthcheck for running instance (Used for HEALTHCHECK in Docker container)"
-    )]
-    Health(HealthArgs),
-}
-
-async fn get_data_stores(
-    migrate: bool,
-    config: &DataStoreConfig,
-) -> Result<(
-    Arc<impl AddressbookStore + PrefixedCalendarStore>,
-    Arc<impl CalendarStore>,
-    Arc<impl SubscriptionStore>,
-    Arc<impl AuthenticationProvider>,
-    Receiver<CollectionOperation>,
-)> {
-    Ok(match &config {
-        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
-            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(
-                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?;
-                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,
-                subscription_store,
-                principal_store,
-                recv,
-            )
-        }
-    })
-}
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<()> {
@@ -120,59 +20,15 @@ async fn main() -> Result<()> {
     };
 
     match args.command {
-        Some(Command::GenConfig(gen_config_args)) => cmd_gen_config(gen_config_args)?,
+        Some(Command::GenConfig(gen_config_args)) => cmd_gen_config(gen_config_args),
-        Some(Command::Principals(principals_args)) => cmd_principals(principals_args).await?,
+        Some(Command::Principals(principals_args)) => cmd_principals(principals_args).await,
         Some(Command::Health(health_args)) => {
             let config: Config = parse_config()?;
-            cmd_health(config.http, health_args).await?;
+            cmd_health(config.http, health_args).await
         }
         None => {
             let config: Config = parse_config()?;
-
+            cmd_default(args, config, None).await
-            setup_tracing(&config.tracing);
-
-            let (addr_store, cal_store, subscription_store, principal_store, update_recv) =
-                get_data_stores(!args.no_migrations, &config.data_store).await?;
-
-            let mut tasks = vec![];
-
-            if config.dav_push.enabled {
-                let dav_push_controller = DavPushController::new(
-                    config.dav_push.allowed_push_servers,
-                    subscription_store.clone(),
-                );
-                tasks.push(tokio::spawn(async move {
-                    dav_push_controller.notifier(update_recv).await;
-                }));
-            }
-
-            let app = make_app(
-                addr_store.clone(),
-                cal_store.clone(),
-                subscription_store.clone(),
-                principal_store.clone(),
-                config.frontend.clone(),
-                config.oidc.clone(),
-                &config.nextcloud_login,
-                config.dav_push.enabled,
-                config.http.session_cookie_samesite_strict,
-                config.http.payload_limit_mb,
-            );
-            let app = ServiceExt::<Request>::into_make_service(
-                NormalizePathLayer::trim_trailing_slash().layer(app),
-            );
-
-            let address = format!("{}:{}", config.http.host, config.http.port);
-            let listener = tokio::net::TcpListener::bind(&address).await?;
-            tasks.push(tokio::spawn(async move {
-                info!("RustiCal serving on http://{address}");
-                axum::serve(listener, app).await.unwrap();
-            }));
-
-            for task in tasks {
-                task.await?;
-            }
         }
     }
-    Ok(())
 }

tests/common/mod.rs

@@ -0,0 +1,72 @@
+use rustical::{
+    Args, cmd_default,
+    config::{Config, DataStoreConfig, HttpConfig, SqliteDataStoreConfig},
+};
+use std::{
+    net::{Ipv4Addr, SocketAddrV4, TcpListener},
+    sync::Arc,
+    thread::{self, JoinHandle},
+};
+use tokio::sync::Notify;
+use tokio_util::sync::CancellationToken;
+
+pub fn find_free_port() -> Option<u16> {
+    let mut port = 15000;
+    // Frees the socket on drop such that this function returns a free port
+    while TcpListener::bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, port)).is_err() {
+        port += 1;
+
+        if port >= 16000 {
+            return None;
+        }
+    }
+    Some(port)
+}
+
+pub fn rustical_process() -> (CancellationToken, u16, JoinHandle<()>, Arc<Notify>) {
+    let port = find_free_port().unwrap();
+    let token = CancellationToken::new();
+    let cloned_token = token.clone();
+    let start_notify = Arc::new(Notify::new());
+    let cloned_start_notify = start_notify.clone();
+
+    let main_process = thread::spawn(move || {
+        let rt = tokio::runtime::Runtime::new().unwrap();
+        let fut = async {
+            cmd_default(
+                Args {
+                    config_file: "asldajldakjsdkj".to_owned(),
+                    no_migrations: false,
+                    command: None,
+                },
+                Config {
+                    data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+                        db_url: ":memory:".to_owned(),
+                        run_repairs: true,
+                        skip_broken: false,
+                    }),
+                    http: HttpConfig {
+                        host: "127.0.0.1".to_owned(),
+                        port,
+                        ..Default::default()
+                    },
+                    frontend: Default::default(),
+                    oidc: None,
+                    tracing: Default::default(),
+                    dav_push: Default::default(),
+                    nextcloud_login: Default::default(),
+                    caldav: Default::default(),
+                },
+                Some(cloned_start_notify),
+            )
+            .await
+        };
+        rt.block_on(async {
+            tokio::select! {
+                _ = cloned_token.cancelled() => {},
+                _ = fut => {}
+            }
+        });
+    });
+    (token, port, main_process, start_notify)
+}

tests/http_integration.rs

@@ -0,0 +1,44 @@
+// This integration test checks whether the HTTP server works by actually running rustical in a new
+// thread.
+use common::rustical_process;
+use http::StatusCode;
+use std::time::Duration;
+
+mod common;
+
+pub async fn test_runner<O, F>(inner: F)
+where
+    O: IntoFuture<Output = ()>,
+    // <O as IntoFuture>::IntoFuture: UnwindSafe,
+    F: FnOnce(String) -> O,
+{
+    // Start RustiCal process
+    let (token, port, main_process, start_notify) = rustical_process();
+    let origin = format!("http://localhost:{port}");
+
+    // Wait for RustiCal server to listen
+    tokio::time::timeout(Duration::new(2, 0), start_notify.notified())
+        .await
+        .unwrap();
+
+    // We use catch_unwind to make sure we'll always correctly stop RustiCal
+    // Otherwise, our process would just run indefinitely
+    inner(origin).into_future().await;
+
+    // Signal RustiCal to stop
+    token.cancel();
+    main_process.join().unwrap();
+}
+
+#[tokio::test]
+async fn test_ping() {
+    test_runner(async |origin| {
+        let resp = reqwest::get(origin.clone() + "/ping").await.unwrap();
+        assert_eq!(resp.status(), StatusCode::OK);
+
+        // Ensure that path normalisation works as intended
+        let resp = reqwest::get(origin + "/ping/").await.unwrap();
+        assert_eq!(resp.status(), StatusCode::OK);
+    })
+    .await
+}

tests/integration_tests/caldav/calendar.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/calendar_import.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/calendar_put.rs

@@ -1,3 +1,4 @@
+use super::{ResponseExtractString, calendar::mkcalendar_template, get_app};
 use axum::body::Body;
 use headers::{Authorization, HeaderMapExt};
 use http::{Request, StatusCode};
@@ -6,10 +7,6 @@ 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(
@@ -66,7 +63,7 @@ END:VCALENDAR";
         .typed_insert(Authorization::basic("user", "pass"));
 
     let response = app.clone().oneshot(request).await.unwrap();
-    assert_eq!(response.status(), StatusCode::PRECONDITION_FAILED);
+    assert_eq!(response.status(), StatusCode::FORBIDDEN);
     let body = response.extract_string().await;
     insta::assert_snapshot!(body, @r#"
     <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/calendar_report.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/mod.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__mkcalendar_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__multiget_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>
@@ -8,7 +8,7 @@ expression: body
         <href>/caldav/principal/user/calendar/qwue23489.ics</href>
         <propstat>
             <prop>
-                <getetag>&quot;aea50382a7775bb9742bfec277382e3a260b6066f503b5f5ae34548d7215ee46&quot;</getetag>
+                <getetag>&quot;f781224669f0db2674e9e45a9be2b01774c02136e3fb72792ef217bccf49fafa&quot;</getetag>
             </prop>
             <status>HTTP/1.1 200 OK</status>
         </propstat>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>
@@ -14,9 +14,10 @@ expression: body
 PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:America/New_York
+TZID:US/Eastern
-LAST-MODIFIED:20250723T190331Z
+TZID-ALIAS-OF:America/New_York
-X-LIC-LOCATION:America/New_York
+LAST-MODIFIED:20260124T185655Z
+X-LIC-LOCATION:US/Eastern
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
 TZNAME:EST

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__proppatch_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__0_get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_import.rs
+source: tests/integration_tests/caldav/calendar_import.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__0_import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar_import.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__1_get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_import.rs
+source: tests/integration_tests/caldav/calendar_import.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__1_import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar_import.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_report__0_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_report__1_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_report__2_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__propfind_depth_0.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__propfind_depth_1.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/addressbook.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/carddav/addressbook_import.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};
@@ -27,11 +27,10 @@ async fn test_import(
             .body(Body::from(
                 r"BEGIN:VCARD
 VERSION:4.0
-FN:Simon Perreault
+FN:John Doe
-N:Perreault;Simon;;;ing. jr,M.Sc.
+N:Doe;John;;;,
 BDAY:--0203
 GENDER:M
-EMAIL;TYPE=work:simon.perreault@viagenie.ca
 END:VCARD",
             ))
             .unwrap()

tests/integration_tests/carddav/mod.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__get_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__multiget_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__proppatch_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook_import__get_body.snap

@@ -0,0 +1,12 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+BEGIN:VCARD
+VERSION:4.0
+FN:John Doe
+N:Doe;John;;;,
+BDAY:--0203
+GENDER:M
+UID:[UID]
+END:VCARD