fix docker builds

.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json

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

.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json

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

.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json

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

Cargo.lock

@@ -1787,7 +1787,7 @@ dependencies = [
 [[package]]
 name = "ical"
 version = "0.11.0"
-source = "git+https://github.com/lennart-k/ical-rs#dcd3b106758a054f46a5172103abb17972ad032d"
+source = "git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3#7c2ab1f3abdca768f22d8a36627eebbdd7947e29"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -3332,7 +3332,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "anyhow",
  "argon2",
@@ -3378,7 +3378,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3391,7 +3391,7 @@ dependencies = [
  "futures-util",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
+ "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)",
  "insta",
  "percent-encoding",
  "quick-xml",
@@ -3420,7 +3420,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "async-trait",
  "axum",
@@ -3430,7 +3430,7 @@ dependencies = [
  "derive_more",
  "futures-util",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
+ "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)",
  "insta",
  "percent-encoding",
  "quick-xml",
@@ -3454,7 +3454,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "async-trait",
  "axum",
@@ -3463,7 +3463,7 @@ dependencies = [
  "futures-util",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
+ "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)",
  "itertools 0.14.0",
  "log",
  "matchit 0.9.1",
@@ -3480,7 +3480,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "async-trait",
  "axum",
@@ -3505,7 +3505,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "askama",
  "askama_web",
@@ -3541,13 +3541,13 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "axum",
  "chrono",
  "chrono-tz",
  "derive_more",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
+ "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)",
  "regex",
  "rrule",
  "rstest",
@@ -3560,7 +3560,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "async-trait",
  "axum",
@@ -3576,7 +3576,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3588,7 +3588,7 @@ dependencies = [
  "futures-core",
  "headers",
  "http",
- "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)",
+ "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)",
  "regex",
  "rrule",
  "rstest",
@@ -3609,7 +3609,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3618,6 +3618,7 @@ dependencies = [
  "password-auth",
  "password-hash",
  "pbkdf2",
+ "regex",
  "rstest",
  "rustical_ical",
  "rustical_store",
@@ -3632,7 +3633,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.17",
@@ -5456,7 +5457,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "xml_derive"
-version = "0.11.11"
+version = "0.11.15"
 dependencies = [
  "darling 0.23.0",
  "heck",

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.11.11"
+version = "0.11.15"
 rust-version = "1.92"
 edition = "2024"
 description = "A CalDAV server"
@@ -107,9 +107,7 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { git = "https://github.com/lennart-k/ical-rs", features = [
+ical = { git = "https://github.com/lennart-k/ical-rs", rev = "7c2ab1f3" }
-  "chrono-tz",
-] }
 toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [

crates/store_sqlite/Cargo.toml

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

crates/store_sqlite/src/calendar_store.rs

@@ -3,6 +3,7 @@ use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
 use chrono::TimeDelta;
 use derive_more::derive::Constructor;
+use regex::Regex;
 use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
@@ -145,6 +146,83 @@ impl SqliteCalendarStore {
         }
     }
 
+    /// In the past exports generated objects with invalid VERSION:4.0
+    /// This repair sets them to VERSION:2.0
+    #[allow(clippy::missing_panics_doc)]
+    pub async fn repair_invalid_version_4_0(&self) -> Result<(), Error> {
+        struct Row {
+            principal: String,
+            cal_id: String,
+            id: String,
+            ics: String,
+        }
+
+        let mut tx = self
+            .db
+            .begin_with(BEGIN_IMMEDIATE)
+            .await
+            .map_err(crate::Error::from)?;
+
+        #[allow(clippy::missing_panics_doc)]
+        let version_pattern = Regex::new(r"(?mi)^VERSION:4.0").unwrap();
+
+        let repairs: Vec<Row> = sqlx::query_as!(
+            Row,
+            r#"SELECT principal, cal_id, id, ics FROM calendarobjects WHERE ics LIKE '%VERSION:4.0%';"#
+        )
+        .fetch_all(&mut *tx)
+        .await
+        .map_err(crate::Error::from)?
+            .into_iter()
+            .filter_map(|mut row| {
+                version_pattern.find(&row.ics)?;
+                let new_ics = version_pattern.replace(&row.ics, "VERSION:2.0");
+                // Safeguard that we really only changed the version
+                assert_eq!(row.ics.len(), new_ics.len());
+                row.ics = new_ics.to_string();
+                Some(row)
+            })
+            .collect();
+
+        if repairs.is_empty() {
+            return Ok(());
+        }
+        warn!(
+            "Found {} calendar objects with invalid VERSION:4.0. Repairing by setting to VERSION:2.0",
+            repairs.len()
+        );
+
+        for repair in &repairs {
+            // calendarobjectchangelog is used by sync-collection to fetch changes
+            // By deleting entries we will later regenerate new entries such that clients will notice
+            // the objects have changed
+            warn!(
+                "Repairing VERSION for {}/{}/{}.ics",
+                repair.principal, repair.cal_id, repair.id
+            );
+            sqlx::query!(
+                "DELETE FROM calendarobjectchangelog WHERE (principal, cal_id, object_id) = (?, ?, ?);",
+                repair.principal, repair.cal_id, repair.id
+            ).execute(&mut *tx).await
+            .map_err(crate::Error::from)?;
+
+            sqlx::query!(
+                "UPDATE calendarobjects SET ics = ? WHERE (principal, cal_id, id) = (?, ?, ?);",
+                repair.ics,
+                repair.principal,
+                repair.cal_id,
+                repair.id
+            )
+            .execute(&mut *tx)
+            .await
+            .map_err(crate::Error::from)?;
+        }
+
+        tx.commit().await.map_err(crate::Error::from)?;
+
+        Ok(())
+    }
+
     // Commit "orphaned" objects to the changelog table
     pub async fn repair_orphans(&self) -> Result<(), Error> {
         struct Row {

src/commands/mod.rs

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

src/config.rs

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

src/main.rs

@@ -70,15 +70,22 @@ async fn get_data_stores(
     Receiver<CollectionOperation>,
 )> {
     Ok(match &config {
-        DataStoreConfig::Sqlite(SqliteDataStoreConfig { db_url }) => {
+        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+            db_url,
+            run_repairs,
+        }) => {
             let db = create_db_pool(db_url, migrate).await?;
             // Channel to watch for changes (for DAV Push)
             let (send, recv) = tokio::sync::mpsc::channel(1000);
 
             let addressbook_store = Arc::new(SqliteAddressbookStore::new(db.clone(), send.clone()));
-            addressbook_store.repair_orphans().await?;
             let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send));
-            cal_store.repair_orphans().await?;
+            if *run_repairs {
+                info!("Running repair tasks");
+                addressbook_store.repair_orphans().await?;
+                cal_store.repair_invalid_version_4_0().await?;
+                cal_store.repair_orphans().await?;
+            }
             let subscription_store = Arc::new(SqliteStore::new(db.clone()));
             let principal_store = Arc::new(SqlitePrincipalStore::new(db));
             (
@@ -119,7 +126,9 @@ async fn main() -> Result<()> {
                 get_data_stores(!args.no_migrations, &config.data_store).await?;
 
             warn!(
-                "Validating calendar data against the next-version ical parser.\nIn the next major release these will be rejected and cause errors.\nIf any errors occur, please open an issue so they can be fixed before the next major release."
+                "Validating calendar data against the next-version ical parser.
+In the next major release these will be rejected and cause errors.
+If any errors occur, please open an issue so they can be fixed before the next major release."
             );
             validate_calendar_objects_0_12(principal_store.as_ref(), cal_store.as_ref()).await?;
             validate_address_objects_0_12(principal_store.as_ref(), addr_store.as_ref()).await?;

src/migration_0_12.rs

@@ -16,10 +16,6 @@ pub async fn validate_calendar_objects_0_12(
                     ical_dev::parser::ical::IcalObjectParser::new(object.get_ics().as_bytes())
                         .expect_one()
                 {
-                    if ical_dev::parser::ParserError::InvalidVersion == err {
-                        // This is a known issue that might cause a lot of spam in the logs
-                        continue;
-                    }
                     success = false;
                     error!(
                         "An error occured parsing a calendar object: principal={principal}, calendar={calendar}, object_id={object_id}: {err}",