Legal holds, step 3: deleted items in a held account are kept
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:
@@ -92,10 +92,8 @@ impl MailboxDestroy for Server {
|
||||
|
||||
let mut deleted_ids = RoaringBitmap::new();
|
||||
let mut thread_ids = RoaringBitmap::new();
|
||||
// inbuxa: UD-1, UD-6a: the retention in force now
|
||||
let retention = inbuxa_features::undelete::settings::retention(self.registry())
|
||||
.await?
|
||||
.items;
|
||||
// inbuxa: UD-1, UD-6a, LH-4: how this account's deletions are kept
|
||||
let keeping = self.keeping(account_id).await?;
|
||||
self.archives(
|
||||
account_id,
|
||||
Collection::Email,
|
||||
@@ -125,10 +123,10 @@ impl MailboxDestroy for Server {
|
||||
deleted_ids.insert(message_id);
|
||||
thread_ids.insert(prev_message_data.inner.thread_id.to_native());
|
||||
// inbuxa: UD-1, UD-4: a deleted message is noted for archiving
|
||||
if let Some(retention) = retention {
|
||||
if keeping.keeps_anything() {
|
||||
inbuxa_features::undelete::email::note(
|
||||
&mut batch,
|
||||
retention,
|
||||
&keeping,
|
||||
account_id,
|
||||
message_id,
|
||||
prev_message_data.inner.size.to_native() as u64,
|
||||
|
||||
@@ -69,10 +69,8 @@ impl EmailDeletion for Server {
|
||||
batch
|
||||
.with_account_id(account_id)
|
||||
.with_collection(Collection::Email);
|
||||
// inbuxa: UD-1, UD-6a: the retention in force now
|
||||
let retention = inbuxa_features::undelete::settings::retention(self.registry())
|
||||
.await?
|
||||
.items;
|
||||
// inbuxa: UD-1, UD-6a, LH-4: how this account's deletions are kept
|
||||
let keeping = self.keeping(account_id).await?;
|
||||
self.archives(
|
||||
account_id,
|
||||
Collection::Email,
|
||||
@@ -90,10 +88,10 @@ impl EmailDeletion for Server {
|
||||
}
|
||||
thread_ids.insert(metadata.inner.thread_id.to_native());
|
||||
// inbuxa: UD-1, UD-4: a deleted message is noted for archiving
|
||||
if let Some(retention) = retention {
|
||||
if keeping.keeps_anything() {
|
||||
inbuxa_features::undelete::email::note(
|
||||
batch,
|
||||
retention,
|
||||
&keeping,
|
||||
account_id,
|
||||
document_id,
|
||||
metadata.inner.size.to_native() as u64,
|
||||
|
||||
@@ -44,12 +44,12 @@ impl SieveScriptDelete for Server {
|
||||
))
|
||||
.await?
|
||||
{
|
||||
// inbuxa: UD-1: a deleted script is kept, when archiving is on
|
||||
if let Some(retention) =
|
||||
inbuxa_features::undelete::settings::retention(self.registry())
|
||||
.await?
|
||||
.items
|
||||
{
|
||||
// inbuxa: UD-1, LH-4: a deleted script is kept, when archiving
|
||||
// is on or a hold covers the account (whole: scripts have no date)
|
||||
let keeping = self.keeping(account_id).await?;
|
||||
let now = store::write::now();
|
||||
if let Some(until) = keeping.until(now, keeping.is_held()) {
|
||||
let retention = until.saturating_sub(now);
|
||||
let script = obj_
|
||||
.deserialize::<SieveScript>()
|
||||
.caused_by(trc::location!())?;
|
||||
|
||||
Reference in New Issue
Block a user