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

Include authentication headers and check queue quotas on Sieve message forwards

Browse Source
This commit is contained in:
mdecimus
2024-05-19 18:59:50 +02:00
parent b755357314
commit d8140dd0e1
8 changed files with 144 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/src/smtp/inbound/antispam.rs
View File

@@ -3,7 +3,6 @@ use std::{
collections::HashMap,
fs,
path::PathBuf,
sync::Arc,
time::{Duration, Instant},
};
@@ -414,7 +413,7 @@ async fn antispam() {
let mut params = session
.build_script_parameters("data")
.with_expected_variables(expected_variables)
.with_message(Arc::new(message.into_bytes()));
.with_message(message.as_bytes());
for (name, value) in variables {
params = params.set_variable(name, value);
}

9
tests/src/smtp/inbound/scripts.rs
View File

@@ -275,7 +275,7 @@ async fn sieve_scripts() {
qr.read_event().await.assert_reload();
let messages = qr.read_queued_messages().await;
assert_eq!(messages.len(), 2);
let mut messages = messages.into_iter().rev();
let mut messages = messages.into_iter();
let notification = messages.next().unwrap();
assert_eq!(notification.return_path, "");
assert_eq!(notification.recipients.len(), 2);
@@ -322,7 +322,7 @@ async fn sieve_scripts() {
qr.read_event().await.assert_reload();
let messages = qr.read_queued_messages().await;
assert_eq!(messages.len(), 2);
let mut messages = messages.into_iter().rev();
let mut messages = messages.into_iter();
messages
.next()
@@ -370,6 +370,7 @@ async fn sieve_scripts() {
.assert_contains("To: Suzie Q <suzie@shopping.example.net>")
.assert_contains("Subject: Is dinner ready?")
.assert_contains("Message-ID: <20030712040037.46341.5F8J@football.example.com>")
.assert_contains("Received: ")
.assert_not_contains("From: Joe SixPack <joe@football.example.com>");
qr.assert_no_events();
@@ -397,7 +398,9 @@ async fn sieve_scripts() {
.assert_contains("To: Suzie Q <suzie@shopping.example.net>")
.assert_contains("Subject: Is dinner ready?")
.assert_contains("Message-ID: <20030712040037.46341.5F8J@football.example.com>")
.assert_contains("From: Joe SixPack <joe@football.example.com>");
.assert_contains("From: Joe SixPack <joe@football.example.com>")
.assert_contains("Received: ")
.assert_contains("Authentication-Results: ");
qr.assert_no_events();
// Test pipes

1
tests/src/smtp/session.rs
View File

@@ -274,6 +274,7 @@ impl TestSession for Session<DummyIo> {
dsn_info: None,
},
],
self.core.inner.snowflake_id.generate().unwrap(),
)
.await;
assert_eq!(