version 0.9.5

#124

Cargo.lock

@@ -32,12 +32,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -219,9 +213,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.2"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -476,9 +470,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.9.3"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 dependencies = [
  "serde",
 ]
@@ -540,10 +534,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.34"
+version = "1.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
@@ -561,17 +556,16 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -595,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.45"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
+checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -605,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.44"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
+checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -617,9 +611,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.45"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -842,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
 dependencies = [
  "powerfmt",
  "serde",
@@ -1008,12 +1002,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -1090,6 +1084,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+
 [[package]]
 name = "flume"
 version = "0.11.1"
@@ -1288,7 +1288,7 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.14.5+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
@@ -1339,7 +1339,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -1567,7 +1567,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -1737,9 +1737,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.5",
@@ -1811,9 +1811,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1873,9 +1873,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
@@ -1896,9 +1896,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 dependencies = [
  "value-bag",
 ]
@@ -1911,11 +1911,11 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1990,12 +1990,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
+ "windows-sys 0.52.0",
- "winapi",
 ]
 
 [[package]]
@@ -2262,12 +2261,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -2519,9 +2512,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "zerovec",
 ]
@@ -2606,18 +2599,18 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.37.5"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -2626,7 +2619,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.5.10",
+ "socket2",
  "thiserror 2.0.16",
  "tokio",
  "tracing",
@@ -2635,9 +2628,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
  "bytes",
  "getrandom 0.3.3",
@@ -2656,16 +2649,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2773,47 +2766,32 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relative-path"
@@ -2934,21 +2912,20 @@ dependencies = [
 
 [[package]]
 name = "rstest"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
+checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
 dependencies = [
  "futures-timer",
  "futures-util",
  "rstest_macros",
- "rustc_version",
 ]
 
 [[package]]
 name = "rstest_macros"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746"
+checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
 dependencies = [
  "cfg-if",
  "glob",
@@ -3040,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "anyhow",
  "argon2",
@@ -3083,7 +3060,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3123,7 +3100,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "async-trait",
  "axum",
@@ -3155,7 +3132,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "async-trait",
  "axum",
@@ -3180,7 +3157,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "async-trait",
  "axum",
@@ -3205,7 +3182,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "askama",
  "askama_web",
@@ -3238,7 +3215,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "axum",
  "chrono",
@@ -3256,7 +3233,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "async-trait",
  "axum",
@@ -3271,7 +3248,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3305,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3326,7 +3303,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.9.0"
+version = "0.9.5"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.16",
@@ -3335,15 +3312,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -3553,7 +3530,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "schemars 0.9.0",
  "schemars 1.0.4",
  "serde",
@@ -3652,16 +3629,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "socket2"
 version = "0.6.0"
@@ -3723,7 +3690,7 @@ dependencies = [
  "futures-util",
  "hashbrown 0.15.5",
  "hashlink",
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "log",
  "memchr",
  "once_cell",
@@ -4027,12 +3994,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -4042,15 +4008,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4096,7 +4062,7 @@ dependencies = [
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
- "socket2 0.6.0",
+ "socket2",
  "tokio-macros",
  "tracing",
  "windows-sys 0.59.0",
@@ -4165,7 +4131,7 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
 dependencies = [
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "serde",
  "serde_spanned 1.0.0",
  "toml_datetime 0.7.0",
@@ -4198,7 +4164,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
@@ -4261,7 +4227,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.11.0",
+ "indexmap 2.11.1",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
@@ -4443,14 +4409,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -4494,9 +4460,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unicode-normalization"
@@ -4551,9 +4517,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.18.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
  "getrandom 0.3.3",
  "js-sys",
@@ -4623,11 +4589,20 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.5+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4"
 dependencies = [
- "wit-bindgen-rt",
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.0+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24"
+dependencies = [
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -4638,21 +4613,22 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.100"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
 dependencies = [
  "bumpalo",
  "log",
@@ -4664,9 +4640,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4677,9 +4653,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4687,9 +4663,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4700,18 +4676,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4746,37 +4722,15 @@ dependencies = [
  "wasite",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -4785,7 +4739,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link",
+ "windows-link 0.1.3",
  "windows-result",
  "windows-strings",
 ]
@@ -4818,13 +4772,19 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
 [[package]]
 name = "windows-result"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -4833,7 +4793,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -4872,6 +4832,15 @@ dependencies = [
  "windows-targets 0.53.3",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -4909,7 +4878,7 @@ version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -5068,13 +5037,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
+name = "wit-bindgen"
-version = "0.39.0"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
-dependencies = [
- "bitflags",
-]
 
 [[package]]
 name = "writeable"
@@ -5125,18 +5091,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -2,9 +2,10 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.9.0"
+version = "0.9.5"
 edition = "2024"
 description = "A CalDAV server"
+documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"
 
@@ -16,7 +17,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = false
+publish = true
 
 [features]
 debug = ["opentelemetry"]
@@ -48,7 +49,7 @@ rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
 lazy_static = "1.5"
-rstest = "0.25"
+rstest = "0.26"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -61,7 +62,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.37" }
+quick-xml = { version = "0.38" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.89-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -45,4 +45,5 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000

README.md

@@ -4,14 +4,15 @@ a CalDAV/CardDAV server
 
 > [!WARNING]
   RustiCal is under **active development**!
-  While I've been successfully using RustiCal productively for a few weeks now,
+  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
   you'd still be one of the first testers so expect bugs and rough edges.
-  If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
+- Import your existing calendars in the frontend
 - **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)

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

@@ -43,24 +43,24 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
         .gregorian()
         .prodid("RustiCal");
-    if calendar.displayname.is_some() {
+    if let Some(displayname) = calendar.meta.displayname {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALNAME".to_owned(),
-            value: calendar.displayname,
+            value: Some(displayname),
             params: None,
         });
     }
-    if calendar.description.is_some() {
+    if let Some(description) = calendar.meta.description {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALDESC".to_owned(),
-            value: calendar.description,
+            value: Some(description),
             params: None,
         });
     }
-    if calendar.timezone_id.is_some() {
+    if let Some(timezone_id) = calendar.timezone_id {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-TIMEZONE".to_owned(),
-            value: calendar.timezone_id,
+            value: Some(timezone_id),
             params: None,
         });
     }

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

@@ -10,7 +10,9 @@ use ical::{
     parser::{Component, ComponentMut},
 };
 use rustical_ical::{CalendarObject, CalendarObjectType};
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore, auth::Principal};
+use rustical_store::{
+    Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
+};
 use std::io::BufReader;
 use tracing::instrument;
 
@@ -83,10 +85,12 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     let new_cal = Calendar {
         principal,
         id: cal_id,
-        displayname,
+        meta: CalendarMetadata {
-        order: 0,
+            displayname,
-        description,
+            order: 0,
-        color: None,
+            description,
+            color: None,
+        },
         timezone_id,
         deleted_at: None,
         synctoken: 0,

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

@@ -8,7 +8,7 @@ use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
@@ -46,7 +46,7 @@ pub struct PropElement {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcalendar")]
+#[xml(root = "mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -54,7 +54,7 @@ struct MkcalendarRequest {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -112,11 +112,13 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
-        order: request.calendar_order.unwrap_or(0),
+        meta: CalendarMetadata {
-        displayname: request.displayname,
+            order: request.calendar_order.unwrap_or(0),
+            displayname: request.displayname,
+            color: request.calendar_color,
+            description: request.calendar_description,
+        },
         timezone_id,
-        color: request.calendar_color,
-        description: request.calendar_description,
         deleted_at: None,
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),

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

@@ -116,19 +116,17 @@ impl CompFilterElement {
         // TODO: Implement prop-filter (and comp-filter?) at some point
 
         if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start {
+            if let Some(start) = &time_range.start
-                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
+                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
-                    if start.deref() > &last_occurence.utc() {
+                && start.deref() > &last_occurence.utc()
-                        return false;
+            {
-                    }
+                return false;
-                };
             }
-            if let Some(end) = &time_range.end {
+            if let Some(end) = &time_range.end
-                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
+                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
-                    if end.deref() < &first_occurence.utc() {
+                && end.deref() < &first_occurence.utc()
-                        return false;
+            {
-                    }
+                return false;
-                };
             }
         }
         true
@@ -156,15 +154,15 @@ impl From<&FilterElement> for CalendarQuery {
         for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
             // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
             // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
-                if let Some(time_range) = &comp_filter.time_range {
+                && let Some(time_range) = &comp_filter.time_range
-                    let start = time_range.start.as_ref().map(|start| start.date_naive());
+            {
-                    let end = time_range.end.as_ref().map(|end| end.date_naive());
+                let start = time_range.start.as_ref().map(|start| start.date_naive());
-                    return CalendarQuery {
+                let end = time_range.end.as_ref().map(|end| end.date_naive());
-                        time_start: start,
+                return CalendarQuery {
-                        time_end: end,
+                    time_start: start,
-                    };
+                    time_end: end,
-                }
+                };
             }
         }
         Default::default()

crates/caldav/src/calendar/resource.rs

@@ -128,10 +128,10 @@ impl Resource for CalendarResource {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                 CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.color.clone())
+                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
                 }
                 CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
                     CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
@@ -146,7 +146,7 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                 }
                 CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -187,11 +187,11 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
                 CalendarProp::CalendarColor(color) => {
-                    self.cal.color = color;
+                    self.cal.meta.color = color;
                     Ok(())
                 }
                 CalendarProp::CalendarDescription(description) => {
-                    self.cal.description = description;
+                    self.cal.meta.description = description;
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
@@ -225,18 +225,18 @@ impl Resource for CalendarResource {
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id {
+                    if let Some(tzid) = &timezone_id
-                        if !vtimezones_rs::VTIMEZONES.contains_key(tzid) {
+                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
-                            return Err(rustical_dav::Error::BadRequest(format!(
+                    {
-                                "Invalid timezone-id: {tzid}"
+                        return Err(rustical_dav::Error::BadRequest(format!(
-                            )));
+                            "Invalid timezone-id: {tzid}"
-                        }
+                        )));
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
                 }
                 CalendarProp::CalendarOrder(order) => {
-                    self.cal.order = order.unwrap_or_default();
+                    self.cal.meta.order = order.unwrap_or_default();
                     Ok(())
                 }
                 CalendarProp::SupportedCalendarComponentSet(comp_set) => {
@@ -264,11 +264,11 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
                 CalendarPropName::CalendarColor => {
-                    self.cal.color = None;
+                    self.cal.meta.color = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarDescription => {
-                    self.cal.description = None;
+                    self.cal.meta.description = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
@@ -277,7 +277,7 @@ impl Resource for CalendarResource {
                 }
                 CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                 CalendarPropName::CalendarOrder => {
-                    self.cal.order = 0;
+                    self.cal.meta.order = 0;
                     Ok(())
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
@@ -300,10 +300,10 @@ impl Resource for CalendarResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.cal.displayname.as_deref()
+        self.cal.meta.displayname.as_deref()
     }
     fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.displayname = name;
+        self.cal.meta.displayname = name;
         Ok(())
     }
 

crates/caldav/src/principal/prop.rs

@@ -16,13 +16,13 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     // PrincipalCollectionSet(HrefElement),

crates/caldav/src/principal/tests.rs

@@ -79,5 +79,5 @@ async fn test_propfind() {
         )
         .unwrap();
 
-    let output = response.serialize_to_string().unwrap();
+    let _output = response.serialize_to_string().unwrap();
 }

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

@@ -22,7 +22,7 @@ pub struct MkcolAddressbookProp {
     resourcetype: Option<Resourcetype>,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     displayname: Option<String>,
-    #[xml(rename = b"addressbook-description")]
+    #[xml(rename = "addressbook-description")]
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     description: Option<String>,
 }
@@ -34,7 +34,7 @@ pub struct PropElement<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/carddav/src/principal/prop.rs

@@ -8,14 +8,14 @@ use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
-    #[xml(rename = b"principal-URL")]
+    #[xml(rename = "principal-URL")]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalCollectionSet(HrefElement),

crates/dav/src/privileges.rs

@@ -20,13 +20,13 @@ impl XmlSerialize for UserPrivilegeSet {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
-            #[xml(rename = b"privilege", flatten)]
+            #[xml(rename = "privilege", flatten)]
             privileges: Vec<UserPrivilege>,
         }
 

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

@@ -60,11 +60,11 @@ pub async fn route_delete<R: ResourceService>(
             return Err(crate::Error::PreconditionFailed.into());
         }
     }
-    if let Some(if_none_match) = if_none_match {
+    if let Some(if_none_match) = if_none_match
-        if resource.satisfies_if_none_match(&if_none_match) {
+        && resource.satisfies_if_none_match(&if_none_match)
-            // Precondition failed
+    {
-            return Err(crate::Error::PreconditionFailed.into());
+        // Precondition failed
-        }
+        return Err(crate::Error::PreconditionFailed.into());
     }
     resource_service
         .delete_resource(path_components, !no_trash)

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

@@ -57,7 +57,7 @@ enum Operation<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"propertyupdate")]
+#[xml(root = "propertyupdate")]
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
 

crates/dav/src/xml/error.rs

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

crates/dav/src/xml/multistatus.rs

@@ -22,8 +22,8 @@ pub struct PropstatElement<PropType: XmlSerialize> {
 fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
@@ -40,13 +40,13 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = b"response")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
@@ -59,8 +59,8 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
 fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
@@ -86,18 +86,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub member_responses: Vec<ResponseElement<MemberPropType>>,
     pub sync_token: Option<String>,
 }

crates/dav/src/xml/propfind.rs

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

crates/dav/src/xml/resourcetype.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::{Resourcetype, ResourcetypeInner};
 
     #[derive(XmlSerialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         resourcetype: Resourcetype,
     }

crates/dav/src/xml/sync_collection.rs

@@ -60,7 +60,7 @@ pub struct NresultsElement(#[xml(ty = "text")] u64);
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub sync_token: String,

crates/dav/src/xml/tag_list.rs

@@ -13,8 +13,8 @@ impl XmlSerialize for TagList {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -22,23 +22,18 @@ impl XmlSerialize for TagList {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    format!("{prefix}:")
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname
-            .as_ref()
-            .map(|tagname| ::quick_xml::name::QName(tagname));
 
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname.as_ref() {
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            let mut bytes_start = BytesStart::new(tagname);
-            if !has_prefix {
+            if !has_prefix && let Some(ns) = &ns {
-                if let Some(ns) = &ns {
+                bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                }
             }
             writer.write_event(Event::Start(bytes_start))?;
         }
@@ -51,8 +46,8 @@ impl XmlSerialize for TagList {
             el.write_empty()?;
         }
 
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname.as_ref() {
-            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
         }
         Ok(())
     }

crates/dav_push/src/lib.rs

@@ -25,10 +25,10 @@ pub struct ContentUpdate {
 }
 
 #[derive(XmlSerialize, XmlRootTag, Debug)]
-#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
+#[xml(root = "push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
 #[xml(ns_prefix(
-    rustical_dav::namespace::NS_DAVPUSH = b"",
+    rustical_dav::namespace::NS_DAVPUSH = "",
-    rustical_dav::namespace::NS_DAV = b"D",
+    rustical_dav::namespace::NS_DAV = "D",
 ))]
 struct PushMessage {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

crates/dav_push/src/prop.rs

@@ -35,12 +35,12 @@ pub enum Trigger {
 
 #[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
 pub struct ContentUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 #[derive(XmlSerialize, PartialEq, Clone, Debug)]
 pub struct PropertyUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 impl XmlDeserialize for PropertyUpdate {
@@ -51,8 +51,8 @@ impl XmlDeserialize for PropertyUpdate {
     ) -> Result<Self, rustical_xml::XmlError> {
         #[derive(XmlDeserialize, PartialEq, Clone, Debug)]
         struct FakePropertyUpdate(
-            #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+            #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
-            #[xml(rename = b"prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
+            #[xml(rename = "prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
         );
         let FakePropertyUpdate(depth, _) = FakePropertyUpdate::deserialize(reader, start, empty)?;
         Ok(Self(depth))

crates/dav_push/src/register.rs

@@ -17,7 +17,7 @@ pub struct WebPushSubscription {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionPublicKey {
-    #[xml(ty = "attr", rename = b"type")]
+    #[xml(ty = "attr", rename = "type")]
     pub ty: String,
     #[xml(ty = "text")]
     pub key: String,
@@ -33,7 +33,7 @@ pub struct SubscriptionElement {
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"push-register")]
+#[xml(root = "push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

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

@@ -17,7 +17,7 @@ export class DeleteButton extends LitElement {
   }
 
   protected render() {
-    let text = this.trash ? 'Move to trash' : 'Delete'
+    let text = this.trash ? 'Trash' : 'Delete'
     return html`<button class="delete" @click=${e => this._onClick(e)}>${text}</button>`
   }
 

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

@@ -28,9 +28,9 @@ export class EditAddressbookForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

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

@@ -40,9 +40,9 @@ export class EditCalendarForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/js/delete-button.mjs

@@ -19,7 +19,7 @@ let DeleteButton = class extends i {
     return this;
   }
   render() {
-    let text = this.trash ? "Move to trash" : "Delete";
+    let text = this.trash ? "Trash" : "Delete";
     return x`<button class="delete" @click=${(e) => this._onClick(e)}>${text}</button>`;
   }
   async _onClick(event) {

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

@@ -27,9 +27,9 @@ let EditAddressbookForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

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

@@ -28,9 +28,9 @@ let EditCalendarForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/style.css

@@ -290,6 +290,7 @@ ul.collection-list {
       .color-chip {
         background: var(--color);
         grid-area: color-chip;
+        margin-left: 8px;
       }
 
       .actions {
@@ -346,6 +347,17 @@ select {
   }
 }
 
+form {
+
+  input[type="text"],
+  input[type="password"],
+  input[type="color"],
+  textarea,
+  select {
+    width: 100%;
+  }
+}
+
 svg.icon {
   stroke-width: 2px;
   color: var(--text-on-background-color);

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

@@ -1,13 +1,13 @@
 <h2>{{ user.id }}'s Calendars</h2>
 <ul class="collection-list">
   {% for (meta, calendar) in calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -15,7 +15,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       {% if let Some(subscription_url) = calendar.subscription_url %}
       <span class="subscription-url">{{ subscription_url }}</span>
@@ -29,9 +29,9 @@
           principal="{{ calendar.principal }}"
           cal_id="{{ calendar.id }}"
           timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
-          displayname="{{ calendar.displayname.as_deref().unwrap_or_default() }}"
+          displayname="{{ calendar.meta.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ calendar.description.as_deref().unwrap_or_default() }}"
+          description="{{ calendar.meta.description.as_deref().unwrap_or_default() }}"
-          color="{{ calendar.color.as_deref().unwrap_or_default() }}"
+          color="{{ calendar.meta.color.as_deref().unwrap_or_default() }}"
           components="{{ calendar.components | json }}"
         ></edit-calendar-form>
         <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
@@ -51,13 +51,13 @@
 <h3>Deleted Calendars</h3>
 <ul class="collection-list">
   {% for (meta, calendar) in deleted_calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -65,7 +65,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       <div class="actions">
         <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"

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

@@ -4,9 +4,9 @@
 {% endblock %}
 
 {% block content %}
-{% let name = calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
+{% let name = calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
 <h1>{{ calendar.principal }}/{{ name }}</h1>
-{% if let Some(description) = calendar.description %}<p>{{ description }}</p>{% endif%}
+{% if let Some(description) = calendar.meta.description %}<p>{{ description }}</p>{% endif%}
 
 {% if let Some(subscription_url) = calendar.subscription_url %}
 <h2>Subscription URL</h2>
@@ -25,9 +25,6 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
-{% if let Some(timezone) = calendar.get_vtimezone() %}
-<textarea rows="16" readonly>{{ timezone }}</textarea>
-{% endif %}
 
 <pre>{{ calendar|json }}</pre>
 

crates/frontend/src/assets.rs

@@ -13,6 +13,7 @@ use tower::Service;
 
 #[derive(Clone, RustEmbed, Default)]
 #[folder = "public/assets"]
+#[allow(dead_code)] // Since this is not used with the frontend-dev feature
 pub struct Assets;
 
 #[derive(Clone, Default)]

crates/oidc/src/lib.rs

@@ -192,20 +192,19 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
         .await
         .map_err(|e| OidcError::UserInfo(e.to_string()))?;
 
-    if let Some(require_group) = &oidc_config.require_group {
+    if let Some(require_group) = &oidc_config.require_group
-        if !user_info_claims
+        && !user_info_claims
             .additional_claims()
             .groups
             .clone()
             .unwrap_or_default()
             .contains(require_group)
-        {
+    {
-            return Ok((
+        return Ok((
-                StatusCode::UNAUTHORIZED,
+            StatusCode::UNAUTHORIZED,
-                "User is not in an authorized group to use RustiCal",
+            "User is not in an authorized group to use RustiCal",
-            )
+        )
-                .into_response());
+            .into_response());
-        }
     }
 
     let user_id = match oidc_config.claim_userid {

crates/store/src/auth/middleware.rs

@@ -72,12 +72,11 @@ where
         let mut inner = self.inner.clone();
 
         Box::pin(async move {
-            if let Some(session) = request.extensions().get::<Session>() {
+            if let Some(session) = request.extensions().get::<Session>()
-                if let Ok(Some(user_id)) = session.get::<String>("user").await {
+                && let Ok(Some(user_id)) = session.get::<String>("user").await
-                    if let Ok(Some(user)) = ap.get_principal(&user_id).await {
+                && let Ok(Some(user)) = ap.get_principal(&user_id).await
-                        request.extensions_mut().insert(user);
+            {
-                    }
+                request.extensions_mut().insert(user);
-                }
             }
 
             if let Some(auth) = auth_header {

crates/store/src/calendar.rs

@@ -6,13 +6,23 @@ use rustical_ical::CalendarObjectType;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
-pub struct Calendar {
+pub struct CalendarMetadata {
-    pub principal: String,
+    // Attributes that may be outsourced
-    pub id: String,
     pub displayname: Option<String>,
     pub order: i64,
     pub description: Option<String>,
     pub color: Option<String>,
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub struct Calendar {
+    // Attributes that may be outsourced
+    #[serde(flatten)]
+    pub meta: CalendarMetadata,
+
+    // Common calendar attributes
+    pub principal: String,
+    pub id: String,
     pub timezone_id: Option<String>,
     pub deleted_at: Option<NaiveDateTime>,
     pub synctoken: i64,

crates/store/src/combined_calendar_store.rs

@@ -1,282 +1,208 @@
+use crate::CalendarStore;
 use async_trait::async_trait;
-use derive_more::Constructor;
+use std::{collections::HashMap, sync::Arc};
-use rustical_ical::CalendarObject;
-use std::sync::Arc;
 
-use crate::{
+pub trait PrefixedCalendarStore: CalendarStore {
-    Calendar, CalendarStore, Error, calendar_store::CalendarQuery,
+    const PREFIX: &'static str;
-    contact_birthday_store::BIRTHDAYS_PREFIX,
-};
-
-#[derive(Debug, Constructor)]
-pub struct CombinedCalendarStore<CS: CalendarStore, BS: CalendarStore> {
-    cal_store: Arc<CS>,
-    birthday_store: Arc<BS>,
 }
 
-impl<CS: CalendarStore, BS: CalendarStore> Clone for CombinedCalendarStore<CS, BS> {
+#[derive(Clone)]
-    fn clone(&self) -> Self {
+pub struct CombinedCalendarStore {
+    stores: HashMap<&'static str, Arc<dyn CalendarStore>>,
+    default: Arc<dyn CalendarStore>,
+}
+
+impl CombinedCalendarStore {
+    pub fn new(default: Arc<dyn CalendarStore>) -> Self {
         Self {
-            cal_store: self.cal_store.clone(),
+            stores: HashMap::new(),
-            birthday_store: self.birthday_store.clone(),
+            default,
         }
     }
+
+    pub fn with_store<CS: PrefixedCalendarStore>(mut self, store: Arc<CS>) -> Self {
+        let store: Arc<dyn CalendarStore> = store;
+        self.stores.insert(CS::PREFIX, store);
+        self
+    }
+
+    fn store_for_id(&self, id: &str) -> Arc<dyn CalendarStore> {
+        self.stores
+            .iter()
+            .find(|&(prefix, _store)| id.starts_with(prefix))
+            .map(|(_prefix, store)| store.clone())
+            .unwrap_or(self.default.clone())
+    }
 }
 
 #[async_trait]
-impl<CS: CalendarStore, BS: CalendarStore> CalendarStore for CombinedCalendarStore<CS, BS> {
+impl CalendarStore for CombinedCalendarStore {
     #[inline]
     async fn get_calendar(
         &self,
         principal: &str,
         id: &str,
         show_deleted: bool,
-    ) -> Result<Calendar, Error> {
+    ) -> Result<crate::Calendar, crate::Error> {
-        if id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(id)
-            self.birthday_store
+            .get_calendar(principal, id, show_deleted)
-                .get_calendar(principal, id, show_deleted)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .get_calendar(principal, id, show_deleted)
-                .await
-        }
     }
 
-    #[inline]
     async fn update_calendar(
         &self,
         principal: String,
         id: String,
-        calendar: Calendar,
+        calendar: crate::Calendar,
     ) -> Result<(), crate::Error> {
-        if id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(&id)
-            self.birthday_store
+            .update_calendar(principal, id, calendar)
-                .update_calendar(principal, id, calendar)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .update_calendar(principal, id, calendar)
-                .await
-        }
     }
 
-    #[inline]
+    async fn insert_calendar(&self, calendar: crate::Calendar) -> Result<(), crate::Error> {
-    async fn insert_calendar(&self, calendar: Calendar) -> Result<(), Error> {
+        self.store_for_id(&calendar.id)
-        if calendar.id.starts_with(BIRTHDAYS_PREFIX) {
+            .insert_calendar(calendar)
-            Err(Error::ReadOnly)
+            .await
-        } else {
-            self.cal_store.insert_calendar(calendar).await
-        }
     }
 
-    #[inline]
+    async fn delete_calendar(
-    async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
+        &self,
-        Ok([
+        principal: &str,
-            self.cal_store.get_calendars(principal).await?,
+        name: &str,
-            self.birthday_store.get_calendars(principal).await?,
+        use_trashbin: bool,
-        ]
+    ) -> Result<(), crate::Error> {
-        .concat())
+        self.store_for_id(name)
+            .delete_calendar(principal, name, use_trashbin)
+            .await
+    }
+
+    async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), crate::Error> {
+        self.store_for_id(name)
+            .restore_calendar(principal, name)
+            .await
+    }
+
+    async fn sync_changes(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        synctoken: i64,
+    ) -> Result<(Vec<rustical_ical::CalendarObject>, Vec<String>, i64), crate::Error> {
+        self.store_for_id(cal_id)
+            .sync_changes(principal, cal_id, synctoken)
+            .await
+    }
+
+    async fn import_calendar(
+        &self,
+        calendar: crate::Calendar,
+        objects: Vec<rustical_ical::CalendarObject>,
+        merge_existing: bool,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(&calendar.id)
+            .import_calendar(calendar, objects, merge_existing)
+            .await
+    }
+
+    async fn calendar_query(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        query: crate::calendar_store::CalendarQuery,
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+        self.store_for_id(cal_id)
+            .calendar_query(principal, cal_id, query)
+            .await
+    }
+
+    async fn restore_object(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        object_id: &str,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(cal_id)
+            .restore_object(principal, cal_id, object_id)
+            .await
+    }
+
+    async fn calendar_metadata(
+        &self,
+        principal: &str,
+        cal_id: &str,
+    ) -> Result<crate::CollectionMetadata, crate::Error> {
+        self.store_for_id(cal_id)
+            .calendar_metadata(principal, cal_id)
+            .await
+    }
+
+    async fn get_objects(
+        &self,
+        principal: &str,
+        cal_id: &str,
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+        self.store_for_id(cal_id)
+            .get_objects(principal, cal_id)
+            .await
+    }
+
+    async fn put_object(
+        &self,
+        principal: String,
+        cal_id: String,
+        object: rustical_ical::CalendarObject,
+        overwrite: bool,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(&cal_id)
+            .put_object(principal, cal_id, object, overwrite)
+            .await
     }
 
-    #[inline]
     async fn delete_object(
         &self,
         principal: &str,
         cal_id: &str,
         object_id: &str,
         use_trashbin: bool,
-    ) -> Result<(), Error> {
+    ) -> Result<(), crate::Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id)
-            self.birthday_store
+            .delete_object(principal, cal_id, object_id, use_trashbin)
-                .delete_object(principal, cal_id, object_id, use_trashbin)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .delete_object(principal, cal_id, object_id, use_trashbin)
-                .await
-        }
     }
 
-    #[inline]
     async fn get_object(
         &self,
         principal: &str,
         cal_id: &str,
         object_id: &str,
         show_deleted: bool,
-    ) -> Result<CalendarObject, Error> {
+    ) -> Result<rustical_ical::CalendarObject, crate::Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id)
-            self.birthday_store
+            .get_object(principal, cal_id, object_id, show_deleted)
-                .get_object(principal, cal_id, object_id, show_deleted)
+            .await
-                .await
-        } else {
-            self.cal_store
-                .get_object(principal, cal_id, object_id, show_deleted)
-                .await
-        }
     }
 
-    #[inline]
+    async fn get_calendars(&self, principal: &str) -> Result<Vec<crate::Calendar>, crate::Error> {
-    async fn sync_changes(
+        let mut calendars = self.default.get_calendars(principal).await?;
+        for store in self.stores.values() {
+            calendars.extend(store.get_calendars(principal).await?);
+        }
+        Ok(calendars)
+    }
+
+    async fn get_deleted_calendars(
         &self,
         principal: &str,
-        cal_id: &str,
+    ) -> Result<Vec<crate::Calendar>, crate::Error> {
-        synctoken: i64,
+        let mut calendars = self.default.get_deleted_calendars(principal).await?;
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
+        for store in self.stores.values() {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+            calendars.extend(store.get_deleted_calendars(principal).await?);
-            self.birthday_store
-                .sync_changes(principal, cal_id, synctoken)
-                .await
-        } else {
-            self.cal_store
-                .sync_changes(principal, cal_id, synctoken)
-                .await
         }
+        Ok(calendars)
     }
 
-    #[inline]
-    async fn calendar_metadata(
-        &self,
-        principal: &str,
-        cal_id: &str,
-    ) -> Result<crate::CollectionMetadata, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .calendar_metadata(principal, cal_id)
-                .await
-        } else {
-            self.cal_store.calendar_metadata(principal, cal_id).await
-        }
-    }
-    #[inline]
-    async fn get_objects(
-        &self,
-        principal: &str,
-        cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.get_objects(principal, cal_id).await
-        } else {
-            self.cal_store.get_objects(principal, cal_id).await
-        }
-    }
-
-    #[inline]
-    async fn calendar_query(
-        &self,
-        principal: &str,
-        cal_id: &str,
-        query: CalendarQuery,
-    ) -> Result<Vec<CalendarObject>, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .calendar_query(principal, cal_id, query)
-                .await
-        } else {
-            self.cal_store
-                .calendar_query(principal, cal_id, query)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), Error> {
-        if name.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.restore_calendar(principal, name).await
-        } else {
-            self.cal_store.restore_calendar(principal, name).await
-        }
-    }
-
-    #[inline]
-    async fn import_calendar(
-        &self,
-        calendar: Calendar,
-        objects: Vec<CalendarObject>,
-        merge_existing: bool,
-    ) -> Result<(), Error> {
-        if calendar.id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .import_calendar(calendar, objects, merge_existing)
-                .await
-        } else {
-            self.cal_store
-                .import_calendar(calendar, objects, merge_existing)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn delete_calendar(
-        &self,
-        principal: &str,
-        name: &str,
-        use_trashbin: bool,
-    ) -> Result<(), Error> {
-        if name.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .delete_calendar(principal, name, use_trashbin)
-                .await
-        } else {
-            self.cal_store
-                .delete_calendar(principal, name, use_trashbin)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn get_deleted_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
-        Ok([
-            self.birthday_store.get_deleted_calendars(principal).await?,
-            self.cal_store.get_deleted_calendars(principal).await?,
-        ]
-        .concat())
-    }
-
-    #[inline]
-    async fn restore_object(
-        &self,
-        principal: &str,
-        cal_id: &str,
-        object_id: &str,
-    ) -> Result<(), Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .restore_object(principal, cal_id, object_id)
-                .await
-        } else {
-            self.cal_store
-                .restore_object(principal, cal_id, object_id)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn put_object(
-        &self,
-        principal: String,
-        cal_id: String,
-        object: CalendarObject,
-        overwrite: bool,
-    ) -> Result<(), Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .put_object(principal, cal_id, object, overwrite)
-                .await
-        } else {
-            self.cal_store
-                .put_object(principal, cal_id, object, overwrite)
-                .await
-        }
-    }
-
-    #[inline]
     fn is_read_only(&self, cal_id: &str) -> bool {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id).is_read_only(cal_id)
-            self.birthday_store.is_read_only(cal_id)
-        } else {
-            self.cal_store.is_read_only(cal_id)
-        }
     }
 }

crates/store/src/contact_birthday_store.rs

@@ -1,4 +1,7 @@
-use crate::{Addressbook, AddressbookStore, Calendar, CalendarStore, Error};
+use crate::{
+    Addressbook, AddressbookStore, Calendar, CalendarStore, Error, calendar::CalendarMetadata,
+    combined_calendar_store::PrefixedCalendarStore,
+};
 use async_trait::async_trait;
 use derive_more::derive::Constructor;
 use rustical_ical::{AddressObject, CalendarObject, CalendarObjectType};
@@ -10,16 +13,22 @@ pub(crate) const BIRTHDAYS_PREFIX: &str = "_birthdays_";
 #[derive(Constructor, Clone)]
 pub struct ContactBirthdayStore<AS: AddressbookStore>(Arc<AS>);
 
+impl<AS: AddressbookStore> PrefixedCalendarStore for ContactBirthdayStore<AS> {
+    const PREFIX: &'static str = BIRTHDAYS_PREFIX;
+}
+
 fn birthday_calendar(addressbook: Addressbook) -> Calendar {
     Calendar {
         principal: addressbook.principal,
         id: format!("{}{}", BIRTHDAYS_PREFIX, addressbook.id),
-        displayname: addressbook
+        meta: CalendarMetadata {
-            .displayname
+            displayname: addressbook
-            .map(|name| format!("{name} birthdays")),
+                .displayname
-        order: 0,
+                .map(|name| format!("{name} birthdays")),
-        description: None,
+            order: 0,
-        color: None,
+            description: None,
+            color: None,
+        },
         timezone_id: None,
         deleted_at: addressbook.deleted_at,
         synctoken: addressbook.synctoken,

crates/store/src/lib.rs

@@ -22,7 +22,7 @@ pub use secret::Secret;
 pub use subscription_store::*;
 
 pub use addressbook::Addressbook;
-pub use calendar::Calendar;
+pub use calendar::{Calendar, CalendarMetadata};
 
 #[derive(Debug, Clone)]
 pub enum CollectionOperationInfo {

crates/store_sqlite/src/addressbook_store.rs

@@ -433,14 +433,14 @@ impl AddressbookStore for SqliteAddressbookStore {
         Self::_delete_addressbook(&mut *tx, principal, addressbook_id, use_trashbin).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        if let Some(addressbook) = addressbook {
+        if let Some(addressbook) = addressbook
-            if let Err(err) = self.sender.try_send(CollectionOperation {
+            && let Err(err) = self.sender.try_send(CollectionOperation {
                 data: CollectionOperationInfo::Delete,
                 topic: addressbook.push_topic,
-            }) {
+            })
-                error!("Push notification about deleted addressbook failed: {err}");
+        {
-            };
+            error!("Push notification about deleted addressbook failed: {err}");
-        }
+        };
 
         Ok(())
     }

crates/store_sqlite/src/calendar_store.rs

@@ -5,7 +5,7 @@ use derive_more::derive::Constructor;
 use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
-use rustical_store::{Calendar, CalendarStore, CollectionMetadata, Error};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, CollectionMetadata, Error};
 use rustical_store::{CollectionOperation, CollectionOperationInfo};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
@@ -69,10 +69,12 @@ impl From<CalendarRow> for Calendar {
         Self {
             principal: value.principal,
             id: value.id,
-            displayname: value.displayname,
+            meta: CalendarMetadata {
-            order: value.order,
+                displayname: value.displayname,
-            description: value.description,
+                order: value.order,
-            color: value.color,
+                description: value.description,
+                color: value.color,
+            },
             timezone_id: value.timezone_id,
             deleted_at: value.deleted_at,
             synctoken: value.synctoken,
@@ -159,10 +161,10 @@ impl SqliteCalendarStore {
                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
             calendar.principal,
             calendar.id,
-            calendar.displayname,
+            calendar.meta.displayname,
-            calendar.description,
+            calendar.meta.description,
-            calendar.order,
+            calendar.meta.order,
-            calendar.color,
+            calendar.meta.color,
             calendar.subscription_url,
             calendar.timezone_id,
             calendar.push_topic,
@@ -189,10 +191,10 @@ impl SqliteCalendarStore {
                 WHERE (principal, id) = (?, ?)"#,
             calendar.principal,
             calendar.id,
-            calendar.displayname,
+            calendar.meta.displayname,
-            calendar.description,
+            calendar.meta.description,
-            calendar.order,
+            calendar.meta.order,
-            calendar.color,
+            calendar.meta.color,
             calendar.timezone_id,
             calendar.push_topic,
             comp_event, comp_todo, comp_journal,
@@ -351,7 +353,6 @@ impl SqliteCalendarStore {
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        // TODO: Prevent objects from being commited to a subscription calendar
         let (object_id, ics) = (object.get_id(), object.get_ics());
 
         let first_occurence = object
@@ -554,14 +555,14 @@ impl CalendarStore for SqliteCalendarStore {
         Self::_delete_calendar(&mut *tx, principal, id, use_trashbin).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        if let Some(cal) = cal {
+        if let Some(cal) = cal
-            if let Err(err) = self.sender.try_send(CollectionOperation {
+            && let Err(err) = self.sender.try_send(CollectionOperation {
                 data: CollectionOperationInfo::Delete,
                 topic: cal.push_topic,
-            }) {
+            })
-                error!("Push notification about deleted calendar failed: {err}");
+        {
-            };
+            error!("Push notification about deleted calendar failed: {err}");
-        }
+        };
         Ok(())
     }
 
@@ -667,11 +668,16 @@ impl CalendarStore for SqliteCalendarStore {
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        // TODO: Prevent objects from being commited to a subscription calendar
         let mut tx = self.db.begin().await.map_err(crate::Error::from)?;
 
         let object_id = object.get_id().to_owned();
 
+        let calendar = Self::_get_calendar(&mut *tx, &principal, &cal_id, true).await?;
+        if calendar.subscription_url.is_some() {
+            // We cannot commit an object to a subscription calendar
+            return Err(Error::ReadOnly);
+        }
+
         Self::_put_object(
             &mut *tx,
             principal.to_owned(),

crates/xml/derive/src/attrs.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use darling::{FromDeriveInput, FromField, FromMeta, FromVariant, util::Flag};
-use syn::{Ident, LitByteStr};
+use syn::{Ident, LitStr};
 
 #[derive(Debug, Default, FromMeta, Clone)]
 pub struct TagAttrs {
-    pub rename: Option<LitByteStr>,
+    pub rename: Option<LitStr>,
     pub ns: Option<syn::Path>,
 }
 
@@ -30,10 +30,10 @@ pub struct EnumAttrs {
 #[derive(Default, FromDeriveInput, Clone)]
 #[darling(attributes(xml))]
 pub struct StructAttrs {
-    pub root: Option<LitByteStr>,
+    pub root: Option<LitStr>,
     pub ns: Option<syn::Path>,
     #[darling(default)]
-    pub ns_prefix: HashMap<syn::Path, LitByteStr>,
+    pub ns_prefix: HashMap<syn::Path, LitStr>,
     pub allow_invalid: Flag,
 }
 

crates/xml/derive/src/field.rs

@@ -35,7 +35,7 @@ impl Field {
     }
 
     /// Field name in XML
-    pub fn xml_name(&self) -> syn::LitByteStr {
+    pub fn xml_name(&self) -> syn::LitStr {
         if let Some(rename) = self.attrs.common.rename.to_owned() {
             rename
         } else {
@@ -43,7 +43,7 @@ impl Field {
                 .field_ident()
                 .as_ref()
                 .expect("unnamed tag fields need a rename attribute");
-            syn::LitByteStr::new(ident.to_string().to_kebab_case().as_bytes(), ident.span())
+            syn::LitStr::new(ident.to_string().to_kebab_case().as_str(), ident.span())
         }
     }
 
@@ -174,6 +174,8 @@ impl Field {
             .map(|ns| quote! { if ns == #ns });
 
         let field_name = self.xml_name();
+        let b_field_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), field_name.span());
         let builder_field_ident = self.builder_field_ident();
         let deserializer = self.deserializer_type();
         let value = quote! { <#deserializer as rustical_xml::XmlDeserialize>::deserialize(reader, &start, empty)? };
@@ -186,7 +188,7 @@ impl Field {
         };
 
         Some(quote! {
-            (#namespace_match, #field_name) #namespace_condition => { #assignment; }
+            (#namespace_match, #b_field_name) #namespace_condition => { #assignment; }
         })
     }
 
@@ -231,6 +233,8 @@ impl Field {
         }
         let builder_field_ident = self.builder_field_ident();
         let field_name = self.xml_name();
+        let b_field_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), field_name.span());
 
         let value = wrap_option_if_no_default(
             quote! {
@@ -240,7 +244,7 @@ impl Field {
         );
 
         Some(quote! {
-            #field_name => {
+            #b_field_name => {
                 builder.#builder_field_ident = #value;
             }
         })
@@ -255,7 +259,6 @@ impl Field {
         let value = quote! {
             if let ::quick_xml::name::ResolveResult::Bound(ns) = &ns {
                 Some(ns.into())
-                // Some(rustical_xml::ValueDeserialize::deserialize(&String::from_utf8_lossy(ns.0.as_ref()))?)
             } else {
                 None
             }

crates/xml/derive/src/generic.rs

@@ -1,16 +1,12 @@
 pub(crate) fn get_generic_type(ty: &syn::Type) -> Option<&syn::Type> {
-    if let syn::Type::Path(syn::TypePath { path, .. }) = ty {
+    if let syn::Type::Path(syn::TypePath { path, .. }) = ty
-        if let Some(seg) = path.segments.last() {
+        && let Some(seg) = path.segments.last()
-            if let syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+        && let syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
-                args,
+            args, ..
-                ..
+        }) = &seg.arguments
-            }) = &seg.arguments
+        && let Some(syn::GenericArgument::Type(t)) = &args.first()
-            {
+    {
-                if let Some(syn::GenericArgument::Type(t)) = &args.first() {
+        return Some(t);
-                    return Some(t);
-                }
-            }
-        }
     }
     None
 }

crates/xml/derive/src/variant.rs

@@ -14,13 +14,13 @@ impl Variant {
         &self.variant.ident
     }
 
-    pub fn xml_name(&self) -> syn::LitByteStr {
+    pub fn xml_name(&self) -> syn::LitStr {
         self.attrs
             .common
             .rename
             .to_owned()
-            .unwrap_or(syn::LitByteStr::new(
+            .unwrap_or(syn::LitStr::new(
-                self.ident().to_string().to_kebab_case().as_bytes(),
+                self.ident().to_string().to_kebab_case().as_str(),
                 self.ident().span(),
             ))
     }
@@ -75,6 +75,8 @@ impl Variant {
         }
         let ident = self.ident();
         let variant_name = self.xml_name();
+        let b_variant_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), variant_name.span());
         let deserializer_type = self.deserializer_type();
 
         Some(
@@ -93,7 +95,7 @@ impl Variant {
                         panic!("tuple variants should contain exactly one element");
                     }
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             let val = Some(<#deserializer_type as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?);
                             Ok(Self::#ident(val))
                         }
@@ -104,7 +106,7 @@ impl Variant {
                         panic!("tuple variants should contain exactly one element");
                     }
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             let val = <#deserializer_type as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
                             Ok(Self::#ident(val))
                         }
@@ -112,7 +114,7 @@ impl Variant {
                 }
                 (false, Fields::Unit, _) => {
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             // Make sure that content is still consumed
                             <() as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
                             Ok(Self::#ident)

crates/xml/derive/src/xml_enum/impl_prop_name.rs

@@ -111,8 +111,7 @@ impl Enum {
                     Some(ns) => quote! { Some(#ns) },
                     None => quote! { None },
                 };
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 let out = quote! {(#ns, #xml_name)};
 
                 let ident = &variant.variant.ident;
@@ -134,8 +133,7 @@ impl Enum {
 
             let str_to_unit_branches = tagged_variants.iter().map(|variant| {
                 let ident = &variant.variant.ident;
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 if variant.attrs.prop.is_some() {
                     quote! { #xml_name => Ok(Self::#ident (Default::default())) }
                 } else {

crates/xml/derive/src/xml_enum/impl_se.rs

@@ -16,8 +16,8 @@ impl Enum {
                 fn serialize(
                     &self,
                     ns: Option<::quick_xml::name::Namespace>,
-                    tag: Option<&[u8]>,
+                    tag: Option<&str>,
-                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &[u8]>,
+                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &str>,
                     writer: &mut ::quick_xml::Writer<&mut Vec<u8>>
                 ) -> ::std::io::Result<()> {
                     use ::quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
@@ -25,19 +25,20 @@ impl Enum {
                     let prefix = ns
                         .map(|ns| namespaces.get(&ns))
                         .unwrap_or(None)
-                        .map(|prefix| if !prefix.is_empty() {
+                         .map(|prefix| {
-                            [*prefix, b":"].concat()
+                             if !prefix.is_empty() {
-                        } else {
+                                format!("{prefix}:")
-                            vec![]
+                             } else {
-                        });
+                                String::new()
+                             }
+                         });
                     let has_prefix = prefix.is_some();
                     let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-                    let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));
 
                     const enum_untagged: bool = #enum_untagged;
 
-                    if let Some(qname) = &qname {
+                    if let Some(tagname) = tagname.as_ref() {
-                        let mut bytes_start = BytesStart::from(qname.to_owned());
+                        let mut bytes_start = BytesStart::new(tagname);
                         if !has_prefix {
                             if let Some(ns) = &ns {
                                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
@@ -48,8 +49,8 @@ impl Enum {
 
                     #(#variant_serializers);*
 
-                    if let Some(qname) = &qname {
+                    if let Some(tagname) = tagname.as_ref() {
-                        writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+                        writer.write_event(Event::End(BytesEnd::new(tagname)))?;
                     }
                     Ok(())
                 }

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

@@ -66,6 +66,9 @@ impl Enum {
                             Event::CData(cdata) => {
                                 return Err(::rustical_xml::XmlError::UnsupportedEvent("CDATA"));
                             }
+                            Event::GeneralRef(_) => {
+                                return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
+                            }
                             Event::Decl(_) => { /* <?xml ... ?> ignore this */ }
                             Event::Comment(_) => { /* ignore */ }
                             Event::DocType(_) => { /* ignore */ }
@@ -108,8 +111,7 @@ impl Enum {
                     Some(ns) => quote! { Some(#ns) },
                     None => quote! { None },
                 };
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 quote! {(#ns, #xml_name)}
             });
 

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

@@ -33,7 +33,7 @@ impl NamedStruct {
                 let field_index = field.target_field_index();
                 quote! {
                     ::quick_xml::events::attributes::Attribute {
-                        key: ::quick_xml::name::QName(#field_name),
+                        key: ::quick_xml::name::QName(#field_name.as_bytes()),
                         value: ::std::borrow::Cow::from(::rustical_xml::ValueSerialize::serialize(&self.#field_index).into_bytes())
                     }
                 }
@@ -47,7 +47,7 @@ impl NamedStruct {
                 let field_index = field.target_field_index();
                 quote! {
                     let tag_str = self.#field_index.to_string();
-                    let tag = Some(tag.unwrap_or(tag_str.as_bytes()));
+                    let tag = Some(tag.unwrap_or(tag_str.as_str()));
                 }
             });
 
@@ -70,13 +70,12 @@ impl NamedStruct {
                 .ns_prefix
                 .iter()
                 .map(|(ns, prefix)| {
-                    let sep = if !prefix.value().is_empty() {
+                    let attr_name = if prefix.value().is_empty() {
-                        b":".to_vec()
+                        "xmlns".to_owned()
                     } else {
-                        b"".to_vec()
+                        format!("xmlns:{}", prefix.value())
                     };
-                    let attr_name = [b"xmlns".as_ref(), &sep, &prefix.value()].concat();
+                    let a = syn::LitByteStr::new(attr_name.as_bytes(), prefix.span());
-                    let a = syn::LitByteStr::new(&attr_name, prefix.span());
                     quote! {
                          bytes_start.push_attribute((#a.as_ref(), #ns.as_ref()));
                     }
@@ -91,8 +90,8 @@ impl NamedStruct {
                 fn serialize(
                     &self,
                     ns: Option<::quick_xml::name::Namespace>,
-                    tag: Option<&[u8]>,
+                    tag: Option<&str>,
-                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &[u8]>,
+                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &str>,
                     writer: &mut ::quick_xml::Writer<&mut Vec<u8>>
                 ) -> ::std::io::Result<()> {
                     use ::quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
@@ -105,17 +104,16 @@ impl NamedStruct {
                          .unwrap_or(None)
                          .map(|prefix| {
                              if !prefix.is_empty() {
-                                 [*prefix, b":"].concat()
+                                format!("{prefix}:")
                              } else {
-                                 Vec::new()
+                                String::new()
                              }
                          });
                      let has_prefix = prefix.is_some();
                      let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-                     let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));
+
-                    //
+                    if let Some(tagname) = tagname.as_ref() {
-                    if let Some(qname) = &qname {
+                        let mut bytes_start = BytesStart::new(tagname);
-                        let mut bytes_start = BytesStart::from(qname.to_owned());
                         if !has_prefix {
                             if let Some(ns) = &ns {
                                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
@@ -134,8 +132,8 @@ impl NamedStruct {
                     }
                     if !#is_empty {
                         #(#tag_writers);*
-                        if let Some(qname) = &qname {
+                        if let Some(tagname) = tagname.as_ref() {
-                            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+                            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
                         }
                     }
                     Ok(())

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

@@ -68,7 +68,7 @@ impl NamedStruct {
                 .ns_prefix
                 .iter()
                 .map(|(ns, prefix)| {
-                    quote! { (#ns, #prefix.as_ref()) }
+                    quote! { (#ns, #prefix) }
                 })
                 .collect()
         } else {
@@ -77,9 +77,9 @@ impl NamedStruct {
 
         quote! {
             impl #impl_generics ::rustical_xml::XmlRootTag for #ident #type_generics #where_clause {
-                fn root_tag() -> &'static [u8] { #root }
+                fn root_tag() -> &'static str { #root }
                 fn root_ns() -> Option<::quick_xml::name::Namespace<'static>> { #ns }
-                fn root_ns_prefixes() -> ::std::collections::HashMap<::quick_xml::name::Namespace<'static>, &'static [u8]> {
+                fn root_ns_prefixes() -> ::std::collections::HashMap<::quick_xml::name::Namespace<'static>, &'static str> {
                     ::std::collections::HashMap::from_iter(vec![
                         #(#prefixes),*
                     ])
@@ -148,6 +148,8 @@ impl NamedStruct {
                         }
                     }
 
+                    let mut string = String::new();
+
                     if !empty {
                         loop {
                             let event = reader.read_event_into(&mut buf)?;
@@ -167,12 +169,23 @@ impl NamedStruct {
                                     }
                                 }
                                 Event::Text(bytes_text) => {
-                                    let text = bytes_text.unescape()?;
+                                    let text = bytes_text.decode()?;
-                                    #(#text_field_branches)*
+                                    string.push_str(&text);
                                 }
                                 Event::CData(cdata) => {
                                     let text = String::from_utf8(cdata.to_vec())?;
-                                    #(#text_field_branches)*
+                                    string.push_str(&text);
+                                }
+                                Event::GeneralRef(gref) => {
+                                    if let Some(char) = gref.resolve_char_ref()? {
+                                        string.push(char);
+                                    } else if let Some(text) =
+                                        quick_xml::escape::resolve_xml_entity(&gref.xml_content()?)
+                                    {
+                                        string.push_str(text);
+                                    } else {
+                                        return Err(XmlError::UnsupportedEvent("invalid XML ref"));
+                                    }
                                 }
                                 Event::Decl(_) => { /* <?xml ... ?> ignore this */ }
                                 Event::Comment(_) => { /* ignore */ }
@@ -185,6 +198,9 @@ impl NamedStruct {
                         }
                     }
 
+                    let text = string;
+                    #(#text_field_branches)*
+
                     Ok(Self {
                         #(#builder_field_builds),*
                     })

crates/xml/src/de.rs

@@ -49,7 +49,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
                     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() => false,
+                        (_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,
                         // Wrong namespace
                         (Some(root_ns), ns, _) if &ResolveResult::Bound(root_ns) != ns => false,
                         _ => true,
@@ -60,7 +60,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
                             format!("{ns:?}"),
                             String::from_utf8_lossy(name.as_ref()).to_string(),
                             format!("{root_ns:?}"),
-                            String::from_utf8_lossy(Self::root_tag()).to_string(),
+                            Self::root_tag().to_owned(),
                         ));
                     };
 

crates/xml/src/error.rs

@@ -8,6 +8,8 @@ pub enum XmlError {
     #[error(transparent)]
     QuickXmlError(#[from] quick_xml::Error),
     #[error(transparent)]
+    QuickXmlEncodingError(#[from] quick_xml::encoding::EncodingError),
+    #[error(transparent)]
     QuickXmlAttrError(#[from] quick_xml::events::attributes::AttrError),
     #[error(transparent)]
     FromUtf8Error(#[from] FromUtf8Error),

crates/xml/src/lib.rs

@@ -23,9 +23,9 @@ pub use xml_derive::PropName;
 pub use xml_derive::XmlRootTag;
 
 pub trait XmlRootTag {
-    fn root_tag() -> &'static [u8];
+    fn root_tag() -> &'static str;
     fn root_ns() -> Option<Namespace<'static>>;
-    fn root_ns_prefixes() -> HashMap<Namespace<'static>, &'static [u8]>;
+    fn root_ns_prefixes() -> HashMap<Namespace<'static>, &'static str>;
 }
 
 #[derive(Debug)]

crates/xml/src/namespace.rs

@@ -28,7 +28,7 @@ impl<'a> From<&'a Namespace<'a>> for NamespaceOwned {
 }
 
 impl NamespaceOwned {
-    pub fn as_ref(&self) -> Namespace {
+    pub fn as_ref(&self) -> Namespace<'_> {
         Namespace(&self.0)
     }
 }

crates/xml/src/se.rs

@@ -1,7 +1,7 @@
 use crate::XmlRootTag;
 use quick_xml::{
     events::{BytesStart, Event, attributes::Attribute},
-    name::{Namespace, QName},
+    name::Namespace,
 };
 use std::collections::HashMap;
 pub use xml_derive::XmlSerialize;
@@ -10,8 +10,8 @@ pub trait XmlSerialize {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()>;
 
@@ -22,8 +22,8 @@ impl<T: XmlSerialize> XmlSerialize for Option<T> {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         if let Some(some) = self {
@@ -60,8 +60,8 @@ impl XmlSerialize for () {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -69,20 +69,17 @@ impl XmlSerialize for () {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    [*prefix, ":"].concat()
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname.as_ref().map(|tagname| QName(tagname));
+        if let Some(tagname) = tagname.as_ref() {
-        if let Some(qname) = &qname {
+            let mut bytes_start = BytesStart::new(tagname);
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            if !has_prefix && let Some(ns) = &ns {
-            if !has_prefix {
+                bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                if let Some(ns) = &ns {
-                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                }
             }
             writer.write_event(Event::Empty(bytes_start))?;
         }

crates/xml/src/value.rs

@@ -1,6 +1,6 @@
 use crate::{XmlDeserialize, XmlError, XmlSerialize};
 use quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
-use quick_xml::name::{Namespace, QName};
+use quick_xml::name::Namespace;
 use std::collections::HashMap;
 use std::num::{ParseFloatError, ParseIntError};
 use std::{convert::Infallible, io::BufRead};
@@ -77,20 +77,23 @@ impl<T: ValueDeserialize> XmlDeserialize for T {
             loop {
                 match reader.read_event_into(&mut buf)? {
                     Event::Text(bytes_text) => {
-                        let text = bytes_text.unescape()?;
+                        let text = bytes_text.decode()?;
-                        if !string.is_empty() {
+                        string.push_str(&text);
-                            // Content already written
-                            return Err(XmlError::UnsupportedEvent("content already written"));
-                        }
-                        string = text.to_string();
                     }
                     Event::CData(cdata) => {
                         let text = String::from_utf8(cdata.to_vec())?;
-                        if !string.is_empty() {
+                        string.push_str(&text);
-                            // Content already written
+                    }
-                            return Err(XmlError::UnsupportedEvent("content already written"));
+                    Event::GeneralRef(gref) => {
+                        if let Some(char) = gref.resolve_char_ref()? {
+                            string.push(char);
+                        } else if let Some(text) =
+                            quick_xml::escape::resolve_xml_entity(&gref.xml_content()?)
+                        {
+                            string.push_str(text);
+                        } else {
+                            return Err(XmlError::UnsupportedEvent("invalid XML ref"));
                         }
-                        string = text;
                     }
                     Event::End(_) => break,
                     Event::Eof => return Err(XmlError::Eof),
@@ -107,8 +110,8 @@ impl<T: ValueSerialize> XmlSerialize for T {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -116,26 +119,23 @@ impl<T: ValueSerialize> XmlSerialize for T {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    [*prefix, ":"].concat()
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname.as_ref().map(|tagname| QName(tagname));
+        if let Some(tagname) = tagname.as_ref() {
-        if let Some(qname) = &qname {
+            let mut bytes_start = BytesStart::new(tagname);
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            if !has_prefix && let Some(ns) = &ns {
-            if !has_prefix {
+                bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                if let Some(ns) = &ns {
-                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
-                }
             }
             writer.write_event(Event::Start(bytes_start))?;
         }
         writer.write_event(Event::Text(BytesText::new(&self.serialize())))?;
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname {
-            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
         }
         Ok(())
     }

crates/xml/tests/de_enum.rs

@@ -1,9 +1,9 @@
-use rustical_xml::{de::XmlDocument, XmlDeserialize, XmlRootTag};
+use rustical_xml::{XmlDeserialize, XmlRootTag, de::XmlDocument};
 
 #[test]
 fn test_struct_tagged_enum() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Propfind {
         prop: Prop,
     }
@@ -58,7 +58,7 @@ fn test_struct_tagged_enum() {
 #[test]
 fn test_tagged_enum_complex() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Propfind {
         prop: PropStruct,
     }
@@ -116,7 +116,7 @@ fn test_enum_document() {
 #[test]
 fn test_untagged_enum() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         prop: PropElement,
     }

crates/xml/tests/de_struct.rs

@@ -6,7 +6,7 @@ use std::collections::HashSet;
 #[test]
 fn test_struct_text_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "text")]
         text: String,
@@ -27,7 +27,7 @@ fn test_struct_text_field() {
 #[test]
 fn test_struct_document() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -52,9 +52,9 @@ fn test_struct_document() {
 #[test]
 fn test_struct_rename_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"ok-wow")]
+        #[xml(rename = "ok-wow")]
         child: Child,
     }
 
@@ -78,7 +78,7 @@ fn test_struct_rename_field() {
 #[test]
 fn test_struct_optional_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Option<Child>,
     }
@@ -96,9 +96,9 @@ fn test_struct_optional_field() {
 #[test]
 fn test_struct_vec() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"child", flatten)]
+        #[xml(rename = "child", flatten)]
         children: Vec<Child>,
     }
 
@@ -124,9 +124,9 @@ fn test_struct_vec() {
 #[test]
 fn test_struct_set() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"child", flatten)]
+        #[xml(rename = "child", flatten)]
         children: HashSet<Child>,
     }
 
@@ -154,7 +154,7 @@ fn test_struct_ns() {
     const NS_HELLO: Namespace = Namespace(b"hello");
 
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ns = "NS_HELLO")]
         child: (),
@@ -169,7 +169,7 @@ fn test_struct_attr() {
     const NS_HELLO: Namespace = Namespace(b"hello");
 
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ns = "NS_HELLO")]
         child: (),
@@ -196,7 +196,7 @@ fn test_struct_attr() {
 #[test]
 fn test_struct_generics() {
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document<T: XmlDeserialize> {
         #[allow(dead_code)]
         child: T,
@@ -217,7 +217,7 @@ fn test_struct_generics() {
 #[test]
 fn test_struct_unparsed() {
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[allow(dead_code)]
         child: Unparsed,
@@ -238,7 +238,7 @@ fn test_struct_unparsed() {
 #[test]
 fn test_xml_values() {
     #[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         href: String,
     }
@@ -262,7 +262,7 @@ fn test_xml_values() {
 #[test]
 fn test_xml_cdata() {
     #[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "text")]
         hello: String,
@@ -275,7 +275,7 @@ fn test_xml_cdata() {
         <document>
             <![CDATA[some text]]>
             <href><![CDATA[some stuff]]></href>
-            <okay>&gt;</okay>
+            <okay>nice&gt;text</okay>
         </document>
     "#,
     )
@@ -285,15 +285,29 @@ fn test_xml_cdata() {
         Document {
             hello: "some text".to_owned(),
             href: "some stuff".to_owned(),
-            okay: ">".to_owned()
+            okay: "nice>text".to_owned()
         }
     );
 }
 
+#[test]
+fn test_quickxml_bytesref() {
+    let gt = quick_xml::events::BytesRef::new("gt");
+    assert!(!gt.is_char_ref());
+    let result = if !gt.is_char_ref() {
+        quick_xml::escape::resolve_xml_entity(&gt.xml_content().unwrap())
+            .unwrap()
+            .to_string()
+    } else {
+        gt.xml_content().unwrap().to_string()
+    };
+    assert_eq!(result, ">");
+}
+
 #[test]
 fn test_struct_xml_decl() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -307,14 +321,14 @@ fn test_struct_xml_decl() {
     let doc = Document::parse_str(
         r#"
     <?xml version="1.0" encoding="utf-8"?>
-    <document><child>Hello!</child></document>"#,
+    <document><child>Hello!&amp;</child></document>"#,
     )
     .unwrap();
     assert_eq!(
         doc,
         Document {
             child: Child {
-                text: "Hello!".to_owned()
+                text: "Hello!&".to_owned()
             }
         }
     );
@@ -323,7 +337,7 @@ fn test_struct_xml_decl() {
 #[test]
 fn test_struct_tuple() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -348,7 +362,7 @@ fn test_struct_tuple() {
 #[test]
 fn test_struct_untagged_ns() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged")]
         child: Child,

crates/xml/tests/enum_variants.rs

@@ -29,7 +29,7 @@ enum CalendarProp {
     #[allow(dead_code)]
     Getcontenttype(&'static str),
 
-    #[xml(ns = "NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "NS_DAV", rename = "principal-URL")]
     #[allow(dead_code)]
     PrincipalUrl,
     #[allow(dead_code)]

crates/xml/tests/propertyupdate.rs

@@ -36,7 +36,7 @@ fn test_propertyupdate() {
     }
 
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"propertyupdate")]
+    #[xml(root = "propertyupdate")]
     struct PropertyupdateElement<T: XmlDeserialize> {
         #[xml(ty = "untagged", flatten)]
         #[allow(dead_code)]

crates/xml/tests/se_enum.rs

@@ -3,7 +3,7 @@ use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
 #[test]
 fn test_struct_value_tagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Document {
         prop: Prop,
     }

crates/xml/tests/se_struct.rs

@@ -7,7 +7,7 @@ use xml_derive::XmlDeserialize;
 #[test]
 fn test_struct_document() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -30,7 +30,7 @@ fn test_struct_document() {
 #[test]
 fn test_struct_untagged_attr() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "attr")]
         name: String,
@@ -57,7 +57,7 @@ fn test_struct_untagged_attr() {
 #[test]
 fn test_struct_value_tagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         href: String,
         num: usize,
@@ -82,7 +82,7 @@ fn test_struct_value_tagged() {
 #[test]
 fn test_struct_value_untagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged")]
         href: String,
@@ -103,7 +103,7 @@ fn test_struct_value_untagged() {
 #[test]
 fn test_struct_vec() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(flatten)]
         href: Vec<String>,
@@ -127,7 +127,7 @@ fn test_struct_vec() {
 #[test]
 fn test_struct_serialize_with() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(serialize_with = "serialize_href")]
         href: String,
@@ -136,8 +136,8 @@ fn test_struct_serialize_with() {
     fn serialize_href(
         val: &str,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         val.to_uppercase().serialize(ns, tag, namespaces, writer)
@@ -160,7 +160,7 @@ fn test_struct_serialize_with() {
 #[test]
 fn test_struct_tag_list() {
     #[derive(Debug, XmlRootTag, XmlSerialize, XmlDeserialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged", flatten)]
         tags: Vec<Tag>,
@@ -194,9 +194,9 @@ fn test_struct_ns() {
     const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
 
     #[derive(Debug, XmlRootTag, XmlSerialize)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(ns = "NS", rename = b"okay")]
+        #[xml(ns = "NS", rename = "okay")]
         child: String,
     }
 
@@ -210,7 +210,7 @@ fn test_struct_ns() {
 #[test]
 fn test_struct_tuple() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -230,8 +230,8 @@ fn test_tuple_struct() {
     const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
 
     #[derive(Debug, XmlRootTag, XmlSerialize)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
-    struct Document(#[xml(ns = "NS", rename = b"okay")] String);
+    struct Document(#[xml(ns = "NS", rename = "okay")] String);
 
     Document("hello!".to_string())
         .serialize_to_string()

docs/index.md

@@ -3,10 +3,10 @@
 a CalDAV/CardDAV server
 
 !!! warning
-    RustiCal is under **active development**!
+  RustiCal is under **active development**!
-    While I've been successfully using RustiCal productively for a few weeks now,
+  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
-    you'd still be one of the first testers so expect bugs and rough edges.
+  you'd still be one of the first testers so expect bugs and rough edges.
-    If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 [Installation](installation/index.md){ .md-button }
 
@@ -14,6 +14,7 @@ a CalDAV/CardDAV server
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
+- Import your existing calendars in the frontend
 - **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)

docs/installation/index.md

@@ -9,7 +9,7 @@ docker run \
   -p 4000:4000 \
   -v YOUR_DATA_DIR:/var/lib/rustical/ \
   -v OPTIONAL_YOUR_CONFIG_TOML:/etc/rustical/config.toml \ # (1)!
-  -e RUSTICAL__CONFIG_OPTION="asd" \  # (2)!
+  -e RUSTICAL_CONFIG_OPTION="asd" \  # (2)!
   ghcr.io/lennart-k/rustical
 ```
 

docs/installation/notes.md

@@ -0,0 +1,11 @@
+# Notes
+
+## Kubernetes setup
+
+If you setup RustiCal with Kubernetes and call the deployment `rustical`
+Kubernetes will by default expose some environment variables starting with `RUSTICAL_`
+that will be rejected by RustiCal.
+So for now the solutions are either not calling the deployment `rustical` or setting
+`enableServiceLinks: false`, see <https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service>.
+
+For the corresponding issue see <https://github.com/lennart-k/rustical/issues/122>

mkdocs.yml

@@ -68,6 +68,7 @@ nav:
   - Installation:
       - installation/index.md
       - Configuration: installation/configuration.md
+      - Notes: installation/notes.md
   - Client Setup: setup/client.md
   - OpenID Connect: setup/oidc.md
   - Developers:

src/app.rs

@@ -1,7 +1,7 @@
 use crate::config::NextcloudLoginConfig;
 use axum::Router;
 use axum::body::{Body, HttpBody};
-use axum::extract::Request;
+use axum::extract::{DefaultBodyLimit, Request};
 use axum::middleware::Next;
 use axum::response::{Redirect, Response};
 use axum::routing::{any, options};
@@ -38,11 +38,12 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
     oidc_config: Option<OidcConfig>,
     nextcloud_login_config: NextcloudLoginConfig,
     dav_push_enabled: bool,
+    session_cookie_samesite_strict: bool,
+    payload_limit_mb: usize,
 ) -> Router<()> {
-    let combined_cal_store = Arc::new(CombinedCalendarStore::new(
+    let birthday_store = Arc::new(ContactBirthdayStore::new(addr_store.clone()));
-        cal_store.clone(),
+    let combined_cal_store =
-        ContactBirthdayStore::new(addr_store.clone()).into(),
+        Arc::new(CombinedCalendarStore::new(cal_store.clone()).with_store(birthday_store));
-    ));
 
     let mut router = Router::new()
         .merge(caldav_router(
@@ -128,7 +129,11 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
             SessionManagerLayer::new(session_store)
                 .with_name("rustical_session")
                 .with_secure(true)
-                .with_same_site(SameSite::Strict)
+                .with_same_site(if session_cookie_samesite_strict {
+                    SameSite::Strict
+                } else {
+                    SameSite::Lax
+                })
                 .with_expiry(Expiry::OnInactivity(
                     tower_sessions::cookie::time::Duration::hours(2),
                 )),
@@ -198,4 +203,5 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
                 response
             },
         ))
+        .layer(DefaultBodyLimit::max(payload_limit_mb * 1000 * 1000))
 }

src/config.rs

@@ -7,6 +7,8 @@ use serde::{Deserialize, Serialize};
 pub struct HttpConfig {
     pub host: String,
     pub port: u16,
+    pub session_cookie_samesite_strict: bool,
+    pub payload_limit_mb: usize,
 }
 
 impl Default for HttpConfig {
@@ -14,6 +16,8 @@ impl Default for HttpConfig {
         Self {
             host: "0.0.0.0".to_owned(),
             port: 4000,
+            session_cookie_samesite_strict: false,
+            payload_limit_mb: 4,
         }
     }
 }

src/main.rs

@@ -116,6 +116,8 @@ async fn main() -> Result<()> {
                 config.oidc.clone(),
                 config.nextcloud_login.clone(),
                 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),