version 0.9.6

#125

Cargo.lock

@@ -3017,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "anyhow",
  "argon2",
@@ -3060,7 +3060,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3100,7 +3100,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -3132,7 +3132,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -3157,7 +3157,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -3182,7 +3182,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "askama",
  "askama_web",
@@ -3215,7 +3215,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "axum",
  "chrono",
@@ -3233,7 +3233,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -3248,7 +3248,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3282,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3303,7 +3303,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.9.5"
+version = "0.9.6"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.16",

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.9.5"
+version = "0.9.6"
 edition = "2024"
 description = "A CalDAV server"
 documentation = "https://lennart-k.github.io/rustical/"

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

@@ -9,6 +9,7 @@ use ical::{
     generator::Emitter,
     parser::{Component, ComponentMut},
 };
+use rustical_dav::header::Overwrite;
 use rustical_ical::{CalendarObject, CalendarObjectType};
 use rustical_store::{
     Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
@@ -21,6 +22,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, cal_id)): Path<(String, String)>,
     user: Principal,
     State(resource_service): State<CalendarResourceService<C, S>>,
+    overwrite: Overwrite,
     body: String,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
@@ -100,7 +102,9 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     };
 
     let cal_store = resource_service.cal_store;
-    cal_store.import_calendar(new_cal, objects, false).await?;
+    cal_store
+        .import_calendar(new_cal, objects, overwrite.is_true())
+        .await?;
 
     Ok(StatusCode::OK.into_response())
 }

crates/caldav/src/calendar_object/methods.rs

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