chore: Release

server: add envelope_to support to DMARC report
chore: Release
2025-08-18 10:16:15 -07:00 · 2025-08-18 10:15:17 -07:00 · 2025-08-15 14:02:20 -07:00 · 2025-08-15 14:01:14 -07:00 · 2025-08-15 13:58:53 -07:00 · 2025-08-13 16:07:44 -07:00
11 changed files with 1417 additions and 1257 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3171,7 +3171,7 @@ dependencies = [

 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.30"
+version = "0.17.34"
 dependencies = [
 "itertools",
 "log",
@@ -3186,7 +3186,7 @@ dependencies = [

 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.30"
+version = "0.17.34"
 dependencies = [
 "anyhow",
 "clap",
@@ -3199,7 +3199,7 @@ dependencies = [

 [[package]]
 name = "letterbox-server"
-version = "0.17.30"
+version = "0.17.34"
 dependencies = [
 "ammonia",
 "anyhow",
@@ -3219,8 +3219,8 @@ dependencies = [
 "futures 0.3.31",
 "headers",
 "html-escape",
- "letterbox-notmuch 0.17.30",
- "letterbox-shared 0.17.30",
+ "letterbox-notmuch 0.17.34",
+ "letterbox-shared 0.17.34",
 "linkify",
 "lol_html",
 "mailparse",
@@ -3261,10 +3261,10 @@ dependencies = [

 [[package]]
 name = "letterbox-shared"
-version = "0.17.30"
+version = "0.17.34"
 dependencies = [
 "build-info",
- "letterbox-notmuch 0.17.30",
+ "letterbox-notmuch 0.17.34",
 "regex",
 "serde",
 "sqlx",
@@ -3274,7 +3274,7 @@ dependencies = [

 [[package]]
 name = "letterbox-web"
-version = "0.17.30"
+version = "0.17.34"
 dependencies = [
 "build-info",
 "build-info-build",
@@ -3286,7 +3286,7 @@ dependencies = [
 "graphql_client",
 "human_format",
 "itertools",
- "letterbox-shared 0.17.30",
+ "letterbox-shared 0.17.34",
 "log",
 "seed",
 "seed_hooks",
--- 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.30"
+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.30", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.30", 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
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,4 +1,5 @@
 pub mod config;
+pub mod email_extract;
 pub mod error;
 pub mod graphql;
 pub mod newsreader;
--- a/server/src/nm.rs
+++ b/server/src/nm.rs
--- 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.30", 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.30", 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
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
Bill Thiede	b191bcbddf	chore: Release Some checks failed Continuous integration / Check (push) Successful in 51s Details Continuous integration / Test Suite (push) Failing after 1m10s Details Continuous integration / Trunk (push) Successful in 1m19s Details Continuous integration / Rustfmt (push) Failing after 40s Details Continuous integration / build (push) Successful in 1m45s Details Continuous integration / Disallow unused dependencies (push) Failing after 27m44s Details	2025-08-15 14:02:20 -07:00
Bill Thiede	a1be436209	server: address lint	2025-08-15 14:01:14 -07:00
Bill Thiede	5b471b278c	server: fix tests	2025-08-15 13:58:53 -07:00
Bill Thiede	34bda32e30	chore: Release Some checks failed Continuous integration / Check (push) Successful in 49s Details Continuous integration / Test Suite (push) Failing after 1m5s Details Continuous integration / Trunk (push) Successful in 7m19s Details Continuous integration / Rustfmt (push) Failing after 40s Details Continuous integration / build (push) Successful in 1m28s Details Continuous integration / Disallow unused dependencies (push) Failing after 27m34s Details	2025-08-13 16:07:44 -07:00
Bill Thiede	501ee417c9	server: address lint	2025-08-13 16:07:35 -07:00
Bill Thiede	ecc0a88341	chore: Release	2025-08-13 16:05:02 -07:00
Bill Thiede	d36d508df0	server: move email extraction code into separate mod	2025-08-13 10:36:50 -07:00