nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2026-01-30 04:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

PUT object: Properly check If-None-Match header

Browse Source
This commit is contained in:
Lennart
2025-12-31 16:50:32 +01:00
parent 271fdfd686
commit 9784f2b53f
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/caldav/src/calendar_object/methods.rs
View File

@@ -73,7 +73,23 @@ pub async fn put_event<C: CalendarStore>(
}
let overwrite = if let Some(TypedHeader(if_none_match)) = if_none_match {
if_none_match == IfNoneMatch::any()
// TODO: Put into transaction?
let existing = match cal_store
.get_object(&principal, &calendar_id, &object_id, false)
.await
{
Ok(existing) => Some(existing),
Err(rustical_store::Error::NotFound) => None,
Err(err) => Err(err)?,
};
existing.is_none_or(|existing| {
if_none_match.precondition_passes(
&existing
.get_etag()
.parse()
.expect("We only generate valid ETags"),
)
})
} else {
true
};

18
crates/carddav/src/address_object/methods.rs
View File

@@ -82,7 +82,23 @@ pub async fn put_object<AS: AddressbookStore>(
}
let overwrite = if let Some(TypedHeader(if_none_match)) = if_none_match {
if_none_match == IfNoneMatch::any()
// TODO: Put into transaction?
let existing = match addr_store
.get_object(&principal, &addressbook_id, &object_id, false)
.await
{
Ok(existing) => Some(existing),
Err(rustical_store::Error::NotFound) => None,
Err(err) => Err(err)?,
};
existing.is_none_or(|existing| {
if_none_match.precondition_passes(
&existing
.get_etag()
.parse()
.expect("We only generate valid ETags"),
)
})
} else {
true
};