filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

IMAP4rev1 Recent flag support

Browse Source
This commit is contained in:
mdecimus
2023-11-27 15:21:43 +01:00
parent 8f6ac2d114
commit 0168c1dca8
14 changed files with 265 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
tests/src/imap/copy_move.rs
View File

@@ -25,59 +25,102 @@ use imap_proto::ResponseType;
use super::{AssertResult, ImapConnection, Type};
pub async fn test(imap: &mut ImapConnection, _imap_check: &mut ImapConnection) {
pub async fn test(_imap: &mut ImapConnection, imap_check: &mut ImapConnection) {
// Check status
imap.send("LIST \"\" % RETURN (STATUS (UIDNEXT MESSAGES UNSEEN SIZE))")
imap_check
.send("LIST \"\" % RETURN (STATUS (UIDNEXT MESSAGES UNSEEN SIZE RECENT))")
.await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("\"INBOX\" (UIDNEXT 11 MESSAGES 10 UNSEEN 10 SIZE 12193)");
.assert_contains("\"INBOX\" (UIDNEXT 11 MESSAGES 10 UNSEEN 10 SIZE 12193 RECENT 0)");
// Select INBOX
imap.send("SELECT INBOX").await;
imap.assert_read(Type::Tagged, ResponseType::Ok).await;
imap_check.send("SELECT INBOX").await;
imap_check.assert_read(Type::Tagged, ResponseType::Ok).await;
// Copying to the same mailbox should fail
imap.send("COPY 1:* INBOX").await;
imap.assert_read(Type::Tagged, ResponseType::No)
imap_check.send("COPY 1:* INBOX").await;
imap_check
.assert_read(Type::Tagged, ResponseType::No)
.await
.assert_response_code("CANNOT");
// Copying to a non-existent mailbox should fail
imap.send("COPY 1:* \"/dev/null\"").await;
imap.assert_read(Type::Tagged, ResponseType::No)
imap_check.send("COPY 1:* \"/dev/null\"").await;
imap_check
.assert_read(Type::Tagged, ResponseType::No)
.await
.assert_response_code("TRYCREATE");
// Create test folders
imap.send("CREATE \"Scamorza Affumicata\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok).await;
imap.send("CREATE \"Burrata al Tartufo\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok).await;
imap_check.send("CREATE \"Scamorza Affumicata\"").await;
imap_check.assert_read(Type::Tagged, ResponseType::Ok).await;
imap_check.send("CREATE \"Burrata al Tartufo\"").await;
imap_check.assert_read(Type::Tagged, ResponseType::Ok).await;
// Copy messages
imap.send("COPY 1,3,5,7 \"Scamorza Affumicata\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
imap_check
.send("COPY 1,3,5,7 \"Scamorza Affumicata\"")
.await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("COPYUID")
.assert_contains("1:4");
// Check status
imap.send("STATUS \"Scamorza Affumicata\" (UIDNEXT MESSAGES UNSEEN SIZE)")
imap_check
.send("STATUS \"Scamorza Affumicata\" (UIDNEXT MESSAGES UNSEEN SIZE RECENT)")
.await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("MESSAGES 4")
.assert_contains("RECENT 4")
.assert_contains("UNSEEN 4")
.assert_contains("UIDNEXT 5")
.assert_contains("SIZE 5851");
// Move all messages to Burrata
imap.send("SELECT \"Scamorza Affumicata\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok).await;
// Check \Recent flag
imap_check.send("SELECT \"Scamorza Affumicata\"").await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("* 4 RECENT");
imap_check.send("FETCH 1:* (UID FLAGS)").await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_count("\\Recent", 4);
imap_check.send("UNSELECT").await;
imap_check.assert_read(Type::Tagged, ResponseType::Ok).await;
imap_check
.send("STATUS \"Scamorza Affumicata\" (UIDNEXT MESSAGES UNSEEN SIZE RECENT)")
.await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("MESSAGES 4")
.assert_contains("RECENT 0")
.assert_contains("UNSEEN 4")
.assert_contains("UIDNEXT 5")
.assert_contains("SIZE 5851");
imap_check.send("SELECT \"Scamorza Affumicata\"").await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("* 0 RECENT");
imap_check.send("FETCH 1:* (UID FLAGS)").await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_count("\\Recent", 0);
imap.send("MOVE 1:* \"Burrata al Tartufo\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
// Move all messages to Burrata
imap_check.send("MOVE 1:* \"Burrata al Tartufo\"").await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("* OK [COPYUID")
.assert_contains("1:4")
@@ -87,20 +130,23 @@ pub async fn test(imap: &mut ImapConnection, _imap_check: &mut ImapConnection) {
.assert_contains("* 1 EXPUNGE");
// Check status
imap.send("LIST \"\" % RETURN (STATUS (UIDNEXT MESSAGES UNSEEN SIZE))")
imap_check
.send("LIST \"\" % RETURN (STATUS (UIDNEXT MESSAGES UNSEEN SIZE))")
.await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("\"Burrata al Tartufo\" (UIDNEXT 5 MESSAGES 4 UNSEEN 4 SIZE 5851)")
.assert_contains("\"Scamorza Affumicata\" (UIDNEXT 5 MESSAGES 0 UNSEEN 0 SIZE 0)")
.assert_contains("\"INBOX\" (UIDNEXT 11 MESSAGES 10 UNSEEN 10 SIZE 12193)");
// Move the messages back to Scamorza, UIDNEXT should increase.
imap.send("SELECT \"Burrata al Tartufo\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok).await;
imap_check.send("SELECT \"Burrata al Tartufo\"").await;
imap_check.assert_read(Type::Tagged, ResponseType::Ok).await;
imap.send("MOVE 1:* \"Scamorza Affumicata\"").await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
imap_check.send("MOVE 1:* \"Scamorza Affumicata\"").await;
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("* OK [COPYUID")
.assert_contains("5:8")
@@ -110,9 +156,11 @@ pub async fn test(imap: &mut ImapConnection, _imap_check: &mut ImapConnection) {
.assert_contains("* 1 EXPUNGE");
// Check status
imap.send("LIST \"\" % RETURN (STATUS (UIDNEXT MESSAGES UNSEEN SIZE))")
imap_check
.send("LIST \"\" % RETURN (STATUS (UIDNEXT MESSAGES UNSEEN SIZE))")
.await;
imap.assert_read(Type::Tagged, ResponseType::Ok)
imap_check
.assert_read(Type::Tagged, ResponseType::Ok)
.await
.assert_contains("\"Burrata al Tartufo\" (UIDNEXT 5 MESSAGES 0 UNSEEN 0 SIZE 0)")
.assert_contains("\"Scamorza Affumicata\" (UIDNEXT 9 MESSAGES 4 UNSEEN 4 SIZE 5851)")

3
tests/src/imap/fetch.rs
View File

@@ -144,7 +144,8 @@ pub async fn test(imap: &mut ImapConnection, _imap_check: &mut ImapConnection) {
.assert_contains("* 7 FETCH (UID 7 ")
.assert_contains("* 8 FETCH (UID 8 ")
.assert_contains("* 9 FETCH (UID 9 ")
.assert_contains("* 10 FETCH (UID 10 ");
.assert_contains("* 10 FETCH (UID 10 ")
.assert_count("\\Recent", 0);
imap.send("FETCH 7:* (UID FLAGS)").await;
imap.assert_read(Type::Tagged, ResponseType::Ok)

5
tests/src/imap/mod.rs
View File

@@ -560,10 +560,11 @@ impl AssertResult for Vec<String> {
assert_eq!(
self.iter().filter(|l| l.contains(text)).count(),
occurrences,
"Expected {} occurrences of {:?}, found {}.",
"Expected {} occurrences of {:?}, found {} in {:?}.",
occurrences,
text,
self.iter().filter(|l| l.contains(text)).count()
self.iter().filter(|l| l.contains(text)).count(),
self
);
self
}