Commit
Author: Mauro D [mauro@stalw.art]
Hash: 25abc977799d76dd3af4d2b71c4c95748c1e285e
Timestamp: Tue, 24 Jan 2023 17:09:30 +0000 (1 year ago)

+4 -5 +/-5 browse
Invalid Message-ID fix.
1diff --git a/src/dmarc/verify.rs b/src/dmarc/verify.rs
2index 1101a0d..9b230d9 100644
3--- a/src/dmarc/verify.rs
4+++ b/src/dmarc/verify.rs
5 @@ -126,7 +126,7 @@ impl Resolver {
6 if address.uri.ends_with(domain)
7 || match self
8 .txt_lookup::<Dmarc>(format!(
9- "{}.report.dmarc.{}.",
10+ "{}._report._dmarc.{}.",
11 domain,
12 address
13 .uri
14 diff --git a/src/lib.rs b/src/lib.rs
15index 866959e..dbe2e1e 100644
16--- a/src/lib.rs
17+++ b/src/lib.rs
18 @@ -259,7 +259,6 @@
19
20 use std::{
21 cell::Cell,
22- default,
23 fmt::Display,
24 io,
25 net::{IpAddr, Ipv4Addr, Ipv6Addr},
26 diff --git a/src/report/arf/generate.rs b/src/report/arf/generate.rs
27index a3c126c..ff3860c 100644
28--- a/src/report/arf/generate.rs
29+++ b/src/report/arf/generate.rs
30 @@ -93,7 +93,7 @@ impl<'x> Feedback<'x> {
31 .header("To", HeaderType::Text(to.into()))
32 .header("Auto-Submitted", HeaderType::Text("auto-generated".into()))
33 .message_id(format!(
34- "<{}@{}>",
35+ "{}@{}",
36 make_boundary("."),
37 self.reporting_mta().unwrap_or("localhost")
38 ))
39 diff --git a/src/report/dmarc/generate.rs b/src/report/dmarc/generate.rs
40index 9824b12..34c93eb 100644
41--- a/src/report/dmarc/generate.rs
42+++ b/src/report/dmarc/generate.rs
43 @@ -48,7 +48,7 @@ impl Report {
44 HeaderType::Address(Address::List(to.map(|to| (*to).into()).collect())),
45 )
46 .header("Auto-Submitted", HeaderType::Text("auto-generated".into()))
47- .message_id(format!("<{}@{}>", make_boundary("."), submitter))
48+ .message_id(format!("{}@{}", make_boundary("."), submitter))
49 .subject(format!(
50 "Report Domain: {} Submitter: {} Report-ID: <{}>",
51 self.domain(),
52 diff --git a/src/report/tlsrpt/generate.rs b/src/report/tlsrpt/generate.rs
53index f3be0af..f1518d4 100644
54--- a/src/report/tlsrpt/generate.rs
55+++ b/src/report/tlsrpt/generate.rs
56 @@ -51,7 +51,7 @@ impl TlsReport {
57 "To",
58 HeaderType::Address(Address::List(to.map(|to| (*to).into()).collect())),
59 )
60- .message_id(format!("<{}@{}>", make_boundary("."), submitter))
61+ .message_id(format!("{}@{}", make_boundary("."), submitter))
62 .header("TLS-Report-Domain", HeaderType::Text(report_domain.into()))
63 .header("TLS-Report-Submitter", HeaderType::Text(submitter.into()))
64 .header("Auto-Submitted", HeaderType::Text("auto-generated".into()))