Merge pull request 'CONDSTORE' (#71) from feat/condstore-try-2 into main

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/pulls/71

1 files changed, 96 insertions, 22 deletions

diff --git a/tests/behavior.rs b/tests/behavior.rs
index 17f3a72..205f5e1 100644
--- a/tests/behavior.rs
+++ b/tests/behavior.rs
@@ -2,6 +2,7 @@ use anyhow::Context;
 
 mod common;
 use crate::common::fragments::*;
+use crate::common::constants::*;
 
 fn main() {
     rfc3501_imap4rev1_base();
@@ -9,10 +10,12 @@ fn main() {
     rfc5161_imapext_enable();
     rfc6851_imapext_move();
     rfc7888_imapext_literal();
+    rfc4551_imapext_condstore();
+    println!("✅ SUCCESS 🌟🚀🥳🙏🥹");
 }
 
 fn rfc3501_imap4rev1_base() {
-    println!("rfc3501_imap4rev1_base");
+    println!("🧪 rfc3501_imap4rev1_base");
     common::aerogramme_provider_daemon_dev(|imap_socket, lmtp_socket| {
         connect(imap_socket).context("server says hello")?;
         capability(imap_socket, Extension::None).context("check server capabilities")?;
@@ -20,20 +23,26 @@ fn rfc3501_imap4rev1_base() {
         create_mailbox(imap_socket, Mailbox::Archive).context("created mailbox archive")?;
         // UNSUBSCRIBE IS NOT IMPLEMENTED YET
         //unsubscribe_mailbox(imap_socket).context("unsubscribe from archive")?;
-        select(imap_socket, Mailbox::Inbox, None).context("select inbox")?;
+        let select_res = select(imap_socket, Mailbox::Inbox, SelectMod::None).context("select inbox")?;
+        assert!(select_res.contains("* 0 EXISTS"));
+
         check(imap_socket).context("check must run")?;
-        status_mailbox(imap_socket, Mailbox::Archive).context("status of archive from inbox")?;
+        status(imap_socket, Mailbox::Archive, StatusKind::UidNext).context("status of archive from inbox")?;
         lmtp_handshake(lmtp_socket).context("handshake lmtp done")?;
         lmtp_deliver_email(lmtp_socket, Email::Multipart).context("mail delivered successfully")?;
-        noop_exists(imap_socket).context("noop loop must detect a new email")?;
-        fetch_rfc822(imap_socket, Selection::FirstId, Email::Multipart)
+        noop_exists(imap_socket, 1).context("noop loop must detect a new email")?;
+
+        let srv_msg = fetch(imap_socket, Selection::FirstId, FetchKind::Rfc822, FetchMod::None)
             .context("fetch rfc822 message, should be our first message")?;
+        let orig_email = std::str::from_utf8(EMAIL1)?;
+        assert!(srv_msg.contains(orig_email));
+        
         copy(imap_socket, Selection::FirstId, Mailbox::Archive)
             .context("copy message to the archive mailbox")?;
         append_email(imap_socket, Email::Basic).context("insert email in INBOX")?;
-        // SEARCH IS NOT IMPLEMENTED YET
-        //search(imap_socket).expect("search should return something");
-        add_flags_email(imap_socket, Selection::FirstId, Flag::Deleted)
+        noop_exists(imap_socket, 2).context("noop loop must detect a new email")?;
+        search(imap_socket, SearchKind::Text("OoOoO")).expect("search should return something");
+        store(imap_socket, Selection::FirstId, Flag::Deleted, StoreAction::AddFlags, StoreMod::None)
             .context("should add delete flag to the email")?;
         expunge(imap_socket).context("expunge emails")?;
         rename_mailbox(imap_socket, Mailbox::Archive, Mailbox::Drafts)
@@ -45,7 +54,7 @@ fn rfc3501_imap4rev1_base() {
 }
 
 fn rfc3691_imapext_unselect() {
-    println!("rfc3691_imapext_unselect");
+    println!("🧪 rfc3691_imapext_unselect");
     common::aerogramme_provider_daemon_dev(|imap_socket, lmtp_socket| {
         connect(imap_socket).context("server says hello")?;
 
@@ -54,18 +63,26 @@ fn rfc3691_imapext_unselect() {
 
         capability(imap_socket, Extension::Unselect).context("check server capabilities")?;
         login(imap_socket, Account::Alice).context("login test")?;
-        select(imap_socket, Mailbox::Inbox, None).context("select inbox")?;
-        noop_exists(imap_socket).context("noop loop must detect a new email")?;
-        add_flags_email(imap_socket, Selection::FirstId, Flag::Deleted)
+        let select_res = select(imap_socket, Mailbox::Inbox, SelectMod::None).context("select inbox")?;
+        assert!(select_res.contains("* 0 EXISTS"));
+
+        noop_exists(imap_socket, 1).context("noop loop must detect a new email")?;
+        store(imap_socket, Selection::FirstId, Flag::Deleted, StoreAction::AddFlags, StoreMod::None)
             .context("add delete flags to the email")?;
         unselect(imap_socket)
             .context("unselect inbox while preserving email with the \\Delete flag")?;
-        select(imap_socket, Mailbox::Inbox, Some(1)).context("select inbox again")?;
-        fetch_rfc822(imap_socket, Selection::FirstId, Email::Basic)
+        let select_res = select(imap_socket, Mailbox::Inbox, SelectMod::None).context("select inbox again")?;
+        assert!(select_res.contains("* 1 EXISTS"));
+
+        let srv_msg = fetch(imap_socket, Selection::FirstId, FetchKind::Rfc822, FetchMod::None)
             .context("message is still present")?;
+        let orig_email = std::str::from_utf8(EMAIL2)?;
+        assert!(srv_msg.contains(orig_email));
+
         close(imap_socket).context("close inbox and expunge message")?;
-        select(imap_socket, Mailbox::Inbox, Some(0))
+        let select_res = select(imap_socket, Mailbox::Inbox, SelectMod::None)
             .context("select inbox again and check it's empty")?;
+        assert!(select_res.contains("* 0 EXISTS"));
 
         Ok(())
     })
@@ -73,7 +90,7 @@ fn rfc3691_imapext_unselect() {
 }
 
 fn rfc5161_imapext_enable() {
-    println!("rfc5161_imapext_enable");
+    println!("🧪 rfc5161_imapext_enable");
     common::aerogramme_provider_daemon_dev(|imap_socket, _lmtp_socket| {
         connect(imap_socket).context("server says hello")?;
         login(imap_socket, Account::Alice).context("login test")?;
@@ -87,26 +104,37 @@ fn rfc5161_imapext_enable() {
 }
 
 fn rfc6851_imapext_move() {
-    println!("rfc6851_imapext_move");
+    println!("🧪 rfc6851_imapext_move");
     common::aerogramme_provider_daemon_dev(|imap_socket, lmtp_socket| {
         connect(imap_socket).context("server says hello")?;
 
         capability(imap_socket, Extension::Move).context("check server capabilities")?;
         login(imap_socket, Account::Alice).context("login test")?;
         create_mailbox(imap_socket, Mailbox::Archive).context("created mailbox archive")?;
-        select(imap_socket, Mailbox::Inbox, None).context("select inbox")?;
+        let select_res = select(imap_socket, Mailbox::Inbox, SelectMod::None).context("select inbox")?;
+        assert!(select_res.contains("* 0 EXISTS"));
 
         lmtp_handshake(lmtp_socket).context("handshake lmtp done")?;
         lmtp_deliver_email(lmtp_socket, Email::Basic).context("mail delivered successfully")?;
 
-        noop_exists(imap_socket).context("noop loop must detect a new email")?;
+        noop_exists(imap_socket, 1).context("noop loop must detect a new email")?;
         r#move(imap_socket, Selection::FirstId, Mailbox::Archive)
             .context("message from inbox moved to archive")?;
 
         unselect(imap_socket)
             .context("unselect inbox while preserving email with the \\Delete flag")?;
-        select(imap_socket, Mailbox::Archive, Some(1)).context("select archive")?;
-        fetch_rfc822(imap_socket, Selection::FirstId, Email::Basic).context("check mail exists")?;
+        let select_res = select(imap_socket, Mailbox::Archive, SelectMod::None).context("select archive")?;
+        assert!(select_res.contains("* 1 EXISTS"));
+
+        let srv_msg = fetch(
+            imap_socket, 
+            Selection::FirstId, 
+            FetchKind::Rfc822, 
+            FetchMod::None,
+        ).context("check mail exists")?;
+        let orig_email = std::str::from_utf8(EMAIL2)?;
+        assert!(srv_msg.contains(orig_email));
+
         logout(imap_socket).context("must quit")?;
 
         Ok(())
@@ -115,7 +143,7 @@ fn rfc6851_imapext_move() {
 }
 
 fn rfc7888_imapext_literal() {
-    println!("rfc7888_imapext_literal");
+    println!("🧪 rfc7888_imapext_literal");
     common::aerogramme_provider_daemon_dev(|imap_socket, _lmtp_socket| {
         connect(imap_socket).context("server says hello")?;
 
@@ -126,3 +154,49 @@ fn rfc7888_imapext_literal() {
     })
     .expect("test fully run");
 }
+
+fn rfc4551_imapext_condstore() {
+    println!("🧪 rfc4551_imapext_condstore");
+    common::aerogramme_provider_daemon_dev(|imap_socket, lmtp_socket| {
+        // Setup the test
+        connect(imap_socket).context("server says hello")?;
+
+        // RFC 3.1.1 Advertising Support for CONDSTORE
+        capability(imap_socket, Extension::Condstore).context("check server capabilities")?;
+        login(imap_socket, Account::Alice).context("login test")?;
+
+        // RFC 3.1.8.  CONDSTORE Parameter to SELECT and EXAMINE
+        let select_res = select(imap_socket, Mailbox::Inbox, SelectMod::Condstore).context("select inbox")?;
+        // RFC 3.1.2   New OK Untagged Responses for SELECT and EXAMINE
+        assert!(select_res.contains("[HIGHESTMODSEQ 1]"));
+
+        // RFC 3.1.3.  STORE and UID STORE Commands
+        lmtp_handshake(lmtp_socket).context("handshake lmtp done")?;
+        lmtp_deliver_email(lmtp_socket, Email::Basic).context("mail delivered successfully")?;
+        lmtp_deliver_email(lmtp_socket, Email::Multipart).context("mail delivered successfully")?;
+        noop_exists(imap_socket, 2).context("noop loop must detect a new email")?;
+        let store_res = store(imap_socket, Selection::All, Flag::Important, StoreAction::AddFlags, StoreMod::UnchangedSince(1))?;
+        assert!(store_res.contains("[MODIFIED 2]"));
+        assert!(store_res.contains("* 1 FETCH (FLAGS (\\Important) MODSEQ (3))"));
+        assert!(!store_res.contains("* 2 FETCH"));
+        assert_eq!(store_res.lines().count(), 2);
+
+        // RFC 3.1.4.  FETCH and UID FETCH Commands
+        let fetch_res = fetch(imap_socket, Selection::All, FetchKind::Rfc822Size, FetchMod::ChangedSince(2))?;
+        assert!(fetch_res.contains("* 1 FETCH (RFC822.SIZE 84 MODSEQ (3))"));
+        assert!(!fetch_res.contains("* 2 FETCH"));
+        assert_eq!(store_res.lines().count(), 2);
+
+        // RFC 3.1.5.  MODSEQ Search Criterion in SEARCH
+        let search_res = search(imap_socket, SearchKind::ModSeq(3))?;
+        // RFC 3.1.6.  Modified SEARCH Untagged Response
+        assert!(search_res.contains("* SEARCH 1 (MODSEQ 3)"));
+
+        // RFC 3.1.7   HIGHESTMODSEQ Status Data Items
+        let status_res = status(imap_socket, Mailbox::Inbox, StatusKind::HighestModSeq)?;
+        assert!(status_res.contains("HIGHESTMODSEQ 3"));
+
+        Ok(())
+    })
+    .expect("test fully run");
+}