chore(deps): lock file maintenance

chore: Release
server: add envelope_to support to DMARC report
2025-08-18 17:32:54 +00:00 · 2025-08-18 10:16:15 -07:00 · 2025-08-18 10:15:17 -07:00
9 changed files with 357 additions and 185 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.17.33"
+version = "0.17.34"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"

 [profile.dev]
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -29,8 +29,8 @@ flate2 = "1.1.2"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.33", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.33", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.34", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.34", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
--- a/server/src/email_extract.rs
+++ b/server/src/email_extract.rs
@ -362,7 +362,7 @@ pub fn extract_mixed(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body
        .subparts
        .iter()
        .map(|sp| sp.ctype.mimetype.as_str())
-        .filter(|mt| !handled_types.contains(&mt))
+        .filter(|mt| !handled_types.contains(mt))
        .collect();
    unhandled_types.sort();
    if !unhandled_types.is_empty() {
@ -500,7 +500,7 @@ pub fn extract_related(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Bo
        .subparts
        .iter()
        .map(|sp| sp.ctype.mimetype.as_str())
-        .filter(|mt| !handled_types.contains(&mt))
+        .filter(|mt| !handled_types.contains(mt))
        .collect();
    unhandled_types.sort();
    if !unhandled_types.is_empty() {
@ -774,6 +774,7 @@ pub struct FormattedRecord {
    pub source_ip: String,
    pub count: String,
    pub header_from: String,
+    pub envelope_to: String,
    pub disposition: String,
    pub dkim: String,
    pub spf: String,
@ -811,6 +812,7 @@ pub struct FormattedFeedback {
    pub report_metadata: Option<FormattedReportMetadata>,
    pub policy_published: Option<FormattedPolicyPublished>,
    pub record: Option<Vec<FormattedRecord>>,
+    pub has_envelope_to: bool,
 }

 #[derive(Debug, serde::Deserialize)]
@ -999,6 +1001,7 @@ pub struct FormattedTlsRptFailureDetails {
 #[derive(Debug, serde::Deserialize)]
 pub struct Identifiers {
    pub header_from: Option<String>,
+    pub envelope_to: Option<String>,
 }
 #[derive(Debug, serde::Deserialize)]
 pub struct AuthResults {
@ -1109,6 +1112,11 @@ pub fn parse_dmarc_report(xml: &str) -> Result<String, ServerError> {
                        .as_ref()
                        .and_then(|i| i.header_from.clone())
                        .unwrap_or_else(|| "".to_string()),
+                    envelope_to: rec
+                        .identifiers
+                        .as_ref()
+                        .and_then(|i| i.envelope_to.clone())
+                        .unwrap_or_else(|| "".to_string()),
                    disposition: rec
                        .row
                        .as_ref()
@ -1166,10 +1174,17 @@ pub fn parse_dmarc_report(xml: &str) -> Result<String, ServerError> {
                pct: pol.pct.unwrap_or_else(|| "".to_string()),
            });

+    let has_envelope_to = formatted_record
+        .as_ref()
+        .map_or(false, |r: &Vec<FormattedRecord>| {
+            r.iter().any(|rec| !rec.envelope_to.is_empty())
+        });
+
    let formatted_feedback = FormattedFeedback {
        report_metadata: formatted_report_metadata,
        policy_published: formatted_policy_published,
        record: formatted_record,
+        has_envelope_to,
    };

    let template = DmarcReportTemplate {
@ -1217,3 +1232,25 @@ pub fn pretty_print_xml_with_trimming(xml_input: &str) -> Result<String, ServerE
    let result = writer.into_inner().into_inner();
    Ok(String::from_utf8(result)?)
 }
+
+#[cfg(test)]
+mod tests {
+    use std::fs;
+
+    use super::*;
+
+    #[test]
+    fn test_parse_dmarc_report() {
+        let xml = fs::read_to_string("testdata/dmarc-example.xml").unwrap();
+        let html = parse_dmarc_report(&xml).unwrap();
+        assert!(html.contains("hotmail.com"));
+        assert!(html.contains("msn.com"));
+    }
+
+    #[test]
+    fn test_parse_dmarc_report_no_envelope_to() {
+        let xml = fs::read_to_string("testdata/dmarc-example-no-envelope-to.xml").unwrap();
+        let html = parse_dmarc_report(&xml).unwrap();
+        assert!(!html.contains("Envelope To"));
+    }
+}
--- a/server/templates/dmarc_report.html
+++ b/server/templates/dmarc_report.html
@ -40,6 +40,9 @@
                    <th style="border:1px solid #bbb;padding:4px 8px;">Source IP</th>
                    <th style="border:1px solid #bbb;padding:4px 8px;">Count</th>
                    <th style="border:1px solid #bbb;padding:4px 8px;">Header From</th>
+                    {% if report.has_envelope_to %}
+                    <th style="border:1px solid #bbb;padding:4px 8px;">Envelope To</th>
+                    {% endif %}
                    <th style="border:1px solid #bbb;padding:4px 8px;">Disposition</th>
                    <th style="border:1px solid #bbb;padding:4px 8px;">DKIM</th>
                    <th style="border:1px solid #bbb;padding:4px 8px;">SPF</th>
@ -52,6 +55,9 @@
                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.source_ip }}</td>
                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.count }}</td>
                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.header_from }}</td>
+                        {% if report.has_envelope_to %}
+                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.envelope_to }}</td>
+                        {% endif %}
                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.disposition }}</td>
                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.dkim }}</td>
                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.spf }}</td>
--- a/server/testdata/dmarc-example-no-envelope-to.xml
+++ b/server/testdata/dmarc-example-no-envelope-to.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<feedback>
+    <version>1.0</version>
+    <report_metadata>
+        <org_name>google.com</org_name>
+        <email>noreply-dmarc-support@google.com</email>
+        <extra_contact_info>https://support.google.com/a/answer/2466580</extra_contact_info>
+        <report_id>5142106658860834914</report_id>
+        <date_range>
+            <begin>1755302400</begin>
+            <end>1755388799</end>
+        </date_range>
+    </report_metadata>
+    <policy_published>
+        <domain>xinu.tv</domain>
+        <adkim>s</adkim>
+        <aspf>s</aspf>
+        <p>quarantine</p>
+        <sp>reject</sp>
+        <pct>100</pct>
+        <np>reject</np>
+    </policy_published>
+    <record>
+        <row>
+            <source_ip>74.207.253.222</source_ip>
+            <count>1</count>
+            <policy_evaluated>
+                <disposition>none</disposition>
+                <dkim>pass</dkim>
+                <spf>pass</spf>
+            </policy_evaluated>
+        </row>
+        <identifiers>
+            <header_from>xinu.tv</header_from>
+        </identifiers>
+        <auth_results>
+            <dkim>
+                <domain>xinu.tv</domain>
+                <result>pass</result>
+                <selector>mail</selector>
+            </dkim>
+            <spf>
+                <domain>xinu.tv</domain>
+                <result>pass</result>
+            </spf>
+        </auth_results>
+    </record>
+</feedback>
--- a/server/testdata/dmarc-example.xml
+++ b/server/testdata/dmarc-example.xml
@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<feedback xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <version>1.0</version>
+    <report_metadata>
+        <org_name>Outlook.com</org_name>
+        <email>dmarcreport@microsoft.com</email>
+        <report_id>e6c5a2ce6e074d7d8cd041a0d6f32a3d</report_id>
+        <date_range>
+            <begin>1755302400</begin>
+            <end>1755388800</end>
+        </date_range>
+    </report_metadata>
+    <policy_published>
+        <domain>xinu.tv</domain>
+        <adkim>s</adkim>
+        <aspf>s</aspf>
+        <p>quarantine</p>
+        <sp>reject</sp>
+        <pct>100</pct>
+        <fo>1</fo>
+    </policy_published>
+    <record>
+        <row>
+            <source_ip>74.207.253.222</source_ip>
+            <count>1</count>
+            <policy_evaluated>
+                <disposition>none</disposition>
+                <dkim>pass</dkim>
+                <spf>pass</spf>
+            </policy_evaluated>
+        </row>
+        <identifiers>
+            <envelope_to>msn.com</envelope_to>
+            <envelope_from>xinu.tv</envelope_from>
+            <header_from>xinu.tv</header_from>
+        </identifiers>
+        <auth_results>
+            <dkim>
+                <domain>xinu.tv</domain>
+                <selector>mail</selector>
+                <result>pass</result>
+            </dkim>
+            <spf>
+                <domain>xinu.tv</domain>
+                <scope>mfrom</scope>
+                <result>pass</result>
+            </spf>
+        </auth_results>
+    </record>
+    <record>
+        <row>
+            <source_ip>74.207.253.222</source_ip>
+            <count>1</count>
+            <policy_evaluated>
+                <disposition>none</disposition>
+                <dkim>pass</dkim>
+                <spf>pass</spf>
+            </policy_evaluated>
+        </row>
+        <identifiers>
+            <envelope_to>hotmail.com</envelope_to>
+            <envelope_from>xinu.tv</envelope_from>
+            <header_from>xinu.tv</header_from>
+        </identifiers>
+        <auth_results>
+            <dkim>
+                <domain>xinu.tv</domain>
+                <selector>mail</selector>
+                <result>pass</result>
+            </dkim>
+            <spf>
+                <domain>xinu.tv</domain>
+                <scope>mfrom</scope>
+                <result>pass</result>
+            </spf>
+        </auth_results>
+    </record>
+</feedback>
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@ -12,7 +12,7 @@ version.workspace = true

 [dependencies]
 build-info = "0.0.41"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.33", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.34", registry = "xinu" }
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@ -33,7 +33,7 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.16.0", features = [
  "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { path = "../shared/", version = "0.17.33", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17.34", registry = "xinu" }
 seed_hooks = { version = "0.4.1", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"
Author	SHA1	Message	Date
Renovate Bot	3ae09c1e17	chore(deps): lock file maintenance Some checks failed Continuous integration / Check (push) Successful in 2m4s Details Continuous integration / Test Suite (push) Failing after 3m44s Details Continuous integration / Trunk (push) Successful in 1m34s Details Continuous integration / Rustfmt (push) Failing after 39s Details Continuous integration / build (push) Successful in 4m45s Details Continuous integration / Disallow unused dependencies (push) Failing after 27m53s Details	2025-08-18 17:32:54 +00:00
Bill Thiede	834e873862	chore: Release Some checks failed Continuous integration / Check (push) Successful in 1m0s Details Continuous integration / Test Suite (push) Failing after 1m36s Details Continuous integration / Trunk (push) Successful in 54s Details Continuous integration / Rustfmt (push) Failing after 38s Details Continuous integration / build (push) Successful in 1m35s Details Continuous integration / Disallow unused dependencies (push) Failing after 27m45s Details	2025-08-18 10:16:15 -07:00
Bill Thiede	6c07b18eec	server: add envelope_to support to DMARC report	2025-08-18 10:15:17 -07:00