filter expunge

This commit is contained in:
Quentin 2024-01-19 17:39:55 +01:00
parent 0cc38571f4
commit c2a518a997
Signed by: quentin
GPG key ID: E9602264D639FF68
3 changed files with 25 additions and 12 deletions

4
Cargo.lock generated
View file

@ -1807,7 +1807,7 @@ dependencies = [
[[package]] [[package]]
name = "imap-codec" name = "imap-codec"
version = "2.0.0" version = "2.0.0"
source = "git+https://github.com/superboum/imap-codec?branch=custom/aerogramme#b0a80c4826f3d8bf2d2e69f68443c261e62bb40f" source = "git+https://github.com/superboum/imap-codec?branch=custom/aerogramme#0f27fe2f10d16c96e0be18914fdbeda9df545beb"
dependencies = [ dependencies = [
"abnf-core", "abnf-core",
"base64 0.21.5", "base64 0.21.5",
@ -1834,7 +1834,7 @@ dependencies = [
[[package]] [[package]]
name = "imap-types" name = "imap-types"
version = "2.0.0" version = "2.0.0"
source = "git+https://github.com/superboum/imap-codec?branch=custom/aerogramme#b0a80c4826f3d8bf2d2e69f68443c261e62bb40f" source = "git+https://github.com/superboum/imap-codec?branch=custom/aerogramme#0f27fe2f10d16c96e0be18914fdbeda9df545beb"
dependencies = [ dependencies = [
"base64 0.21.5", "base64 0.21.5",
"bounded-static", "bounded-static",

View file

@ -59,7 +59,10 @@ pub async fn dispatch<'a>(
criteria, criteria,
uid, uid,
} => ctx.search(charset, criteria, uid).await, } => ctx.search(charset, criteria, uid).await,
CommandBody::Expunge => ctx.expunge().await, CommandBody::Expunge {
// UIDPLUS (rfc4315)
uid_sequence_set,
} => ctx.expunge(uid_sequence_set).await,
CommandBody::Store { CommandBody::Store {
sequence_set, sequence_set,
kind, kind,
@ -114,7 +117,7 @@ impl<'a> SelectedContext<'a> {
// We expunge messages, // We expunge messages,
// but we don't send the untagged EXPUNGE responses // but we don't send the untagged EXPUNGE responses
let tag = self.req.tag.clone(); let tag = self.req.tag.clone();
self.expunge().await?; self.expunge(&None).await?;
Ok(( Ok((
Response::build().tag(tag).message("CLOSE completed").ok()?, Response::build().tag(tag).message("CLOSE completed").ok()?,
flow::Transition::Unselect, flow::Transition::Unselect,
@ -223,13 +226,13 @@ impl<'a> SelectedContext<'a> {
)) ))
} }
async fn expunge(self) -> Result<(Response<'static>, flow::Transition)> { async fn expunge(self, uid_sequence_set: &Option<SequenceSet>) -> Result<(Response<'static>, flow::Transition)> {
if let Some(failed) = self.fail_read_only() { if let Some(failed) = self.fail_read_only() {
return Ok((failed, flow::Transition::None)); return Ok((failed, flow::Transition::None));
} }
let tag = self.req.tag.clone(); let tag = self.req.tag.clone();
let data = self.mailbox.expunge().await?; let data = self.mailbox.expunge(uid_sequence_set).await?;
Ok(( Ok((
Response::build() Response::build()

View file

@ -237,16 +237,26 @@ impl MailboxView {
self.update(UpdateParameters::default()).await self.update(UpdateParameters::default()).await
} }
pub async fn expunge(&mut self) -> Result<Vec<Body<'static>>> { pub async fn expunge(&mut self, maybe_seq_set: &Option<SequenceSet>) -> Result<Vec<Body<'static>>> {
// Get a recent view to apply our change
self.internal.sync().await?; self.internal.sync().await?;
let state = self.internal.peek().await; let state = self.internal.peek().await;
let idx = Index::new(&state)?;
// Build a default sequence set for the default case
use imap_codec::imap_types::sequence::{Sequence, SeqOrUid};
let seq = match maybe_seq_set {
Some(s) => s.clone(),
None => SequenceSet(vec![Sequence::Range(SeqOrUid::Value(NonZeroU32::MIN), SeqOrUid::Asterisk)].try_into().unwrap()),
};
let deleted_flag = Flag::Deleted.to_string(); let deleted_flag = Flag::Deleted.to_string();
let msgs = state let msgs = idx
.table .fetch_on_uid(&seq)
.iter() .into_iter()
.filter(|(_uuid, (_uid, _modseq, flags))| flags.iter().any(|x| *x == deleted_flag)) .filter(|midx| midx.flags.iter().any(|x| *x == deleted_flag))
.map(|(uuid, _)| *uuid); .map(|midx| midx.uuid);
for msg in msgs { for msg in msgs {
self.internal.mailbox.delete(msg).await?; self.internal.mailbox.delete(msg).await?;