stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2025-10-09 20:15:47 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default to ARC seal using just one signature

Browse source
This commit is contained in:
mdecimus 2024-05-20 18:25:46 +02:00
parent faf34ecde2
commit 6e5a92d882
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/common/src/config/smtp/auth.rs
View file

@ -103,7 +103,7 @@ impl Default for MailAuthConfig {
seal: IfBlock::new::<()>( seal: IfBlock::new::<()>(
"auth.arc.seal", "auth.arc.seal",
[], [],
"['rsa-' + key_get('default', 'domain'), 'ed25519-' + key_get('default', 'domain')]", "'rsa-' + key_get('default', 'domain')",
), ),
}, },
spf: SpfAuthConfig { spf: SpfAuthConfig {

13
tests/src/smtp/inbound/sign.rs
View file

@ -231,4 +231,17 @@ async fn sign_and_seal() {
.assert_contains( .assert_contains(
"ARC-Message-Signature: i=3; a=ed25519-sha256; s=ed; d=example.com; c=relaxed/simple;", "ARC-Message-Signature: i=3; a=ed25519-sha256; s=ed; d=example.com; c=relaxed/simple;",
); );
// Test ARC sealing of a DKIM signed message
session
.send_message("bill@foobar.org", &["jdoe@example.com"], "test:dkim", "250")
.await;
qr.expect_message()
.await
.read_lines(&qr)
.await
.assert_contains("ARC-Seal: i=1; a=ed25519-sha256; s=ed; d=example.com; cv=none;")
.assert_contains(
"ARC-Message-Signature: i=1; a=ed25519-sha256; s=ed; d=example.com; c=relaxed/simple;",
);
} }