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

SieveScripts and VacationResponse tests passing

Browse Source
This commit is contained in:
Mauro D
2023-05-21 10:50:25 +00:00
parent e7d57e84b0
commit 903f08575a
21 changed files with 370 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/src/jmap/email_submission.rs
View File

@@ -580,11 +580,11 @@ pub async fn assert_message_delivery(
) {
match tokio::time::timeout(Duration::from_millis(3000), event_rx.recv()).await {
Ok(Some(message)) => {
println!("Got message [{}]", message.message);
assert_eq!(message.mail_from, expected_message.mail_from);
assert_eq!(message.rcpt_to, expected_message.rcpt_to);
println!("Got message [{}]", message.message);
if let Some(needle) = expected_message.message.strip_prefix('@') {
assert!(
message.message.contains(needle),

13
tests/src/jmap/mod.rs
View File

@@ -83,8 +83,18 @@ type = "system"
[queue.outbound]
next-hop = [ { if = "rcpt-domain", in-list = "list/domains", then = "local" },
{ if = "rcpt-domain", eq = "remote.org", then = "mock-smtp" },
{ else = false } ]
[remote."mock-smtp"]
address = "localhost"
port = 9999
protocol = "smtp"
[remote."mock-smtp".tls]
implicit = false
allow-invalid-certs = true
[store]
db.path = "{TMP}/sqlite.db"
blob.path = "{TMP}"
@@ -172,7 +182,8 @@ pub async fn jmap_tests() {
//auth_oauth::test(params.server.clone(), &mut params.client).await;
//event_source::test(params.server.clone(), &mut params.client).await;
//push_subscription::test(params.server.clone(), &mut params.client).await;
sieve_script::test(params.server.clone(), &mut params.client).await;
//sieve_script::test(params.server.clone(), &mut params.client).await;
vacation_response::test(params.server.clone(), &mut params.client).await;
let websockets = "todo";

102
tests/src/jmap/sieve_script.rs
View File

@@ -1,6 +1,11 @@
use std::{fs, path::PathBuf, sync::Arc, time::Duration};
use std::{
fs,
path::PathBuf,
sync::Arc,
time::{Duration, Instant},
};
use jmap::{JMAP, SUPERUSER_ID};
use jmap::JMAP;
use jmap_client::{
client::Client,
core::set::{SetError, SetErrorType},
@@ -8,14 +13,13 @@ use jmap_client::{
sieve::query::{Comparator, Filter},
Error,
};
use jmap_proto::types::id::Id;
use crate::jmap::{
delivery::SmtpConnection,
email_submission::{assert_message_delivery, spawn_mock_smtp_server, MockMessage},
mailbox::destroy_all_mailboxes,
test_account_create,
};
use crate::smtp::session::VerifyResponse;
pub async fn test(server: Arc<JMAP>, client: &mut Client) {
println!("Running Sieve tests...");
@@ -134,10 +138,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.await
.unwrap();
lmtp.ingest(
"bill@example.com",
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: TPS Report\r\n",
"\r\n",
@@ -222,10 +226,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.await
.unwrap();
lmtp.ingest(
"bill@example.com",
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"Bcc: Undisclosed recipients;\r\n",
"Message-ID: <1234@example.com>\r\n",
"Subject: Holidays\r\n",
@@ -249,13 +253,20 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
// Let one sec duplicate ids expire
tokio::time::sleep(Duration::from_millis(1100)).await;
// Start mock SMTP server
let (mut smtp_rx, smtp_settings) = spawn_mock_smtp_server();
server.smtp.resolvers.dns.ipv4_add(
"localhost",
vec!["127.0.0.1".parse().unwrap()],
Instant::now() + Duration::from_secs(10),
);
// Run reject and duplicate check tests
let test = "fd";
/*lmtp.ingest_with_code(
"bill@example.com",
lmtp.ingest(
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"Bcc: Undisclosed recipients;\r\n",
"Message-ID: <1234@example.com>\r\n",
"Subject: Holidays\r\n",
@@ -263,10 +274,9 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
"Remember to file your T.P.S. reports before ",
"going on holidays."
),
5,
)
.await
.assert_contains("No soup for you");
.await;
assert_eq!(
client
.email_query(None::<email::query::Filter>, None::<Vec<_>>)
@@ -276,7 +286,14 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.len(),
1,
"Reject failed."
);*/
);
assert_message_delivery(
&mut smtp_rx,
MockMessage::new("<>", ["<bill@remote.org>"], "@No soup for you"),
false,
)
.await;
// Run include tests
client
@@ -287,11 +304,11 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.sieve_script_create("test_include", get_script("test_include"), true)
.await
.unwrap();
lmtp.ingest_with_code(
"bill@example.com",
lmtp.ingest(
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"Bcc: Undisclosed recipients;\r\n",
"Message-ID: <1234@example.com>\r\n",
"Subject: Holidays\r\n",
@@ -299,14 +316,19 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
"Remember to file your T.P.S. reports before ",
"going on holidays."
),
5,
)
.await
.assert_contains("Rejected from an included script");
.await;
// Start mock SMTP server
let coco = "fd";
/*let (mut smtp_rx, smtp_settings) = spawn_mock_smtp_server();
assert_message_delivery(
&mut smtp_rx,
MockMessage::new(
"<>",
["<bill@remote.org>"],
"@Rejected from an included script",
),
false,
)
.await;
// Run enclose + redirect tests
client
@@ -318,10 +340,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.await
.unwrap();
lmtp.ingest(
"bill@example.com",
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: TPS Report\r\n",
"\r\n",
@@ -334,7 +356,7 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
&mut smtp_rx,
MockMessage::new(
"<jdoe@example.com>",
["<jane@example.com>"],
["<jane@remote.org>"],
"@Attached you'll find",
),
false,
@@ -357,10 +379,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.await
.unwrap();
lmtp.ingest(
"bill@example.com",
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: Urgently I need those TPS Reports\r\n",
"\r\n",
@@ -374,7 +396,7 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
&mut smtp_rx,
MockMessage::new(
"<jdoe@example.com>",
["<sms_gateway@example.com>"],
["<sms_gateway@remote.org>"],
"@It's TPS-o-clock",
),
false,
@@ -436,19 +458,15 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
smtp_settings.lock().do_stop = true;
*/
// Remove test data
let todo = "fix";
/*for account_id in [&account_id, &domain_id] {
client
.set_default_account_id(Id::new(SUPERUSER_ID as u64))
.principal_destroy(account_id)
.await
.unwrap();
client.sieve_script_deactivate().await.unwrap();
let mut request = client.build();
request.query_sieve_script();
for id in request.send_query_sieve_script().await.unwrap().take_ids() {
client.sieve_script_destroy(&id).await.unwrap();
}
server.store.principal_purge().unwrap();
server.store.assert_is_empty();*/
destroy_all_mailboxes(client).await;
server.store.assert_is_empty().await;
}
fn get_script(name: &str) -> Vec<u8> {

67
tests/src/jmap/vacation_response.rs
View File

@@ -1,35 +1,34 @@
use std::sync::Arc;
use std::{sync::Arc, time::Instant};
use chrono::{Duration, Utc};
use jmap::{JMAP, SUPERUSER_ID};
use jmap::JMAP;
use jmap_client::client::Client;
use jmap_proto::types::id::Id;
use crate::jmap::{
delivery::SmtpConnection,
email_submission::{
assert_message_delivery, expect_nothing, spawn_mock_smtp_server, MockMessage,
},
mailbox::destroy_all_mailboxes,
test_account_create,
};
pub async fn test(server: Arc<JMAP>, client: &mut Client) {
println!("Running Vacation Response tests...");
// Create INBOX
let domain_id = client
.set_default_account_id(Id::new(SUPERUSER_ID as u64))
.domain_create("example.com")
// Create test account
let account_id = test_account_create(&server, "jdoe@example.com", "12345", "John Doe")
.await
.unwrap()
.take_id();
let account_id = client
.individual_create("jdoe@example.com", "12345", "John Doe")
.await
.unwrap()
.take_id();
.to_string();
client.set_default_account_id(&account_id);
// Start mock SMTP server
let (mut smtp_rx, smtp_settings) = spawn_mock_smtp_server();
server.smtp.resolvers.dns.ipv4_add(
"localhost",
vec!["127.0.0.1".parse().unwrap()],
Instant::now() + std::time::Duration::from_secs(10),
);
// Let people know that we'll be down in Kokomo
client
@@ -47,10 +46,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
// Send a message
lmtp.ingest(
"bill@example.com",
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: TPS Report\r\n",
"\r\n",
@@ -63,7 +62,7 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
// Await vacation response
assert_message_delivery(
&mut smtp_rx,
MockMessage::new("<jdoe@example.com>", ["<bill@example.com>"], "@Kokomo"),
MockMessage::new("<jdoe@example.com>", ["<bill@remote.org>"], "@Kokomo"),
false,
)
.await;
@@ -71,10 +70,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
// Further messages from the same recipient should not
// trigger a vacation response
lmtp.ingest(
"bill@example.com",
"bill@remote.org",
&["jdoe@example.com"],
concat!(
"From: bill@example.com\r\n",
"From: bill@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: TPS Report -- friendly reminder\r\n",
"\r\n",
@@ -88,7 +87,7 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
// Messages from MAILER-DAEMON should not
// trigger a vacation response
lmtp.ingest(
"MAILER-DAEMON@example.com",
"MAILER-DAEMON@remote.org",
&["jdoe@example.com"],
concat!(
"From: MAILER-DAEMON@example.com\r\n",
@@ -108,10 +107,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.await
.unwrap();
lmtp.ingest(
"jane_smith@example.com",
"jane_smith@remote.org",
&["jdoe@example.com"],
concat!(
"From: jane_smith@example.com\r\n",
"From: jane_smith@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: When were you going on holidays?\r\n",
"\r\n",
@@ -128,10 +127,10 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
.unwrap();
smtp_settings.lock().do_stop = true;
lmtp.ingest(
"jane_smith@example.com",
"jane_smith@remote.org",
&["jdoe@example.com"],
concat!(
"From: jane_smith@example.com\r\n",
"From: jane_smith@remote.org\r\n",
"To: jdoe@example.com\r\n",
"Subject: When were you going on holidays?\r\n",
"\r\n",
@@ -143,25 +142,13 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
assert_message_delivery(
&mut smtp_rx,
MockMessage::new(
"<jdoe@example.com>",
["<jane_smith@example.com>"],
"@Kokomo",
),
MockMessage::new("<jdoe@example.com>", ["<jane_smith@remote.org>"], "@Kokomo"),
false,
)
.await;
// Remove test data
let implement = "true";
/*for account_id in [&account_id, &domain_id] {
client
.set_default_account_id(Id::new(SUPERUSER_ID as u64))
.principal_destroy(account_id)
.await
.unwrap();
}
server.store.principal_purge().unwrap();
server.store.assert_is_empty();
*/
client.vacation_response_destroy().await.unwrap();
destroy_all_mailboxes(client).await;
server.store.assert_is_empty().await;
}

2
tests/src/lib.rs
View File

@@ -3,7 +3,7 @@ use std::path::PathBuf;
#[cfg(test)]
pub mod jmap;
#[cfg(test)]
pub mod smtp;
//pub mod smtp;
#[cfg(test)]
pub mod store;