From 6e5a92d88268ac45ee24b80a926e32c3f5721e79 Mon Sep 17 00:00:00 2001 From: mdecimus Date: Mon, 20 May 2024 18:25:46 +0200 Subject: [PATCH] Default to ARC seal using just one signature --- crates/common/src/config/smtp/auth.rs | 2 +- tests/src/smtp/inbound/sign.rs | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/crates/common/src/config/smtp/auth.rs b/crates/common/src/config/smtp/auth.rs index 64c67608..db461789 100644 --- a/crates/common/src/config/smtp/auth.rs +++ b/crates/common/src/config/smtp/auth.rs @@ -103,7 +103,7 @@ impl Default for MailAuthConfig { seal: IfBlock::new::<()>( "auth.arc.seal", [], - "['rsa-' + key_get('default', 'domain'), 'ed25519-' + key_get('default', 'domain')]", + "'rsa-' + key_get('default', 'domain')", ), }, spf: SpfAuthConfig { diff --git a/tests/src/smtp/inbound/sign.rs b/tests/src/smtp/inbound/sign.rs index d56fd490..d2a369dc 100644 --- a/tests/src/smtp/inbound/sign.rs +++ b/tests/src/smtp/inbound/sign.rs @@ -231,4 +231,17 @@ async fn sign_and_seal() { .assert_contains( "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;", + ); }