inbuxa/inbuxa-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 23 Wiki Activity

Legal holds, step 3: deleted items in a held account are kept

Browse Source 
Every way of deleting mail (JMAP, IMAP EXPUNGE, POP3, mailbox removal,
Trash emptying) and Sieve scripts, events, contacts and files now asks
how the account's deletions are kept: a hold keeps them with no expiry
(archivedUntil 9999-12-31), even with undelete off; otherwise undelete's
period applies as before (LH-4).

A hold's date range decides by the item's own date (LH-3). Mail is noted
as held at deletion and settled when it's archived, once its received
date is known; outside the range it gets undelete's deadline or isn't
kept. Events go by their start, with a day's slack for time zones;
recurring events, contacts, files and scripts are held whole.

A groupware item's note now stays until its archive succeeds, and a
failure retries the task instead of being logged and lost (LH-5).
This commit is contained in:
jcoffey-dev
2026-09-27 19:33:07 -07:00
parent 318783f444
commit 7b97efbb7f
11 changed files with 350 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/services/src/task_manager/index.rs
+27 -8
View File
@@ -229,11 +229,19 @@ impl SearchIndexTask for Server {
IndexDocumentType::Email => None,
} && let Err(err) = archive_noted(self, kind, account_id, document_id).await
{
// inbuxa: LH-5: the note stays, so the retry archives
// it; nothing a hold keeps is lost to a failure
trc::error!(
err.account_id(account_id)
.document_id(document_id)
.details("Failed to archive a deleted item")
);
results.push(IndexTaskResult {
task_type: TaskType::Delete,
index: task.document_type,
result: TaskResult::temporary("Failed to archive a deleted item"),
});
continue;
}
document_deletions[idx]
@@ -696,8 +704,9 @@ pub fn trace_search_document(
document
}
// inbuxa: UD-1, UD-4: archives a deleted file, event or contact noted at
// deletion, when archiving is on; otherwise its note is dropped
// inbuxa: UD-1, UD-4, LH-4: archives a deleted file, event or contact noted
// at deletion, when archiving is on or a hold covers it; otherwise its note is
// dropped. The note goes only once the item is archived.
async fn archive_noted(
server: &Server,
kind: undelete::groupware::Kind,
@@ -705,12 +714,22 @@ async fn archive_noted(
document_id: u32,
) -> trc::Result<()> {
let data = &server.core.storage.data;
let Some(note) = undelete::groupware::take(data, kind, account_id, document_id).await? else {
let Some(note) = undelete::groupware::peek(data, kind, account_id, document_id).await? else {
return Ok(());
};
let Some(retention) = undelete::settings::retention(server.registry()).await?.items else {
return Ok(());
// LH-3: events by their start; contacts and files whole
let keeping = server.keeping(account_id).await?;
let held = match kind {
undelete::groupware::Kind::CalendarEvent => {
keeping.covers_event(undelete::groupware::event_start(&note))
}
_ => keeping.covers(None),
};
let now = store::write::now();
let Some(until) = keeping.until(now, held) else {
return undelete::groupware::clear(data, kind, account_id, document_id).await;
};
let retention = until.saturating_sub(now);
let blob_hash = match (&note.content, &note.blob_hash) {
(Some(text), _) => {
server
@@ -723,11 +742,11 @@ async fn archive_noted(
.into_err()
.details("Invalid blob hash in undelete note")
})?,
(None, None) => return Ok(()),
(None, None) => return undelete::groupware::clear(data, kind, account_id, document_id).await,
};
undelete::groupware::archive(data, server.registry(), account_id, note, blob_hash, retention)
.await
.map(|_| ())
.await?;
undelete::groupware::clear(data, kind, account_id, document_id).await
}
async fn delete_email_metadata(