happyDomain/happyDeliver
2
0
Fork 0
Code Issues 10 Pull requests 2 Projects Releases Packages Wiki Activity Actions

dmarc: implement RFC 7489 org-domain fallback and RFC 9091 PSD DMARC

Browse source 
DMARC lookup now follows the full RFC 7489 §6.6.3 fallback chain: exact
From domain → organizational domain (eTLD+1 via PSL) → public suffix
domain (RFC 9091, only when psd=y is present). DNS errors abort
immediately without triggering fallback; NXDOMAIN and missing v=DMARC1
records do trigger it. The found domain is exposed in the new
DMARCRecord.domain field for reporting purposes.

Also promote getOrganizationalDomain to a package-level function so both
HeaderAnalyzer and DNSAnalyzer can share it, and fix pre-existing
rbl_test.go compilation errors and stale score expectations.

Closes: #98
This commit is contained in:
nemunaire 2026-05-18 15:33:27 +08:00
commit 1516991057
7 changed files with 295 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pkg/analyzer/rbl_test.go
View file

@ -291,34 +291,38 @@ func TestGetBlacklistScore(t *testing.T) {
{
name: "Listed on 1 RBL",
results: &DNSListResults{
IPsChecked: []string{"198.51.100.1"},
ListedCount: 1,
IPsChecked: []string{"198.51.100.1"},
ListedCount: 1,
RelevantListedCount: 1,
},
expectedScore: 84, // 100 - 1*100/6 = 84 (integer division: 100/6=16)
expectedScore: 92, // 100 - 1*100/12 = 92 (12 scoring lists = 14 default - 2 informational)
},
{
name: "Listed on 2 RBLs",
results: &DNSListResults{
IPsChecked: []string{"198.51.100.1"},
ListedCount: 2,
IPsChecked: []string{"198.51.100.1"},
ListedCount: 2,
RelevantListedCount: 2,
},
expectedScore: 67, // 100 - 2*100/6 = 67 (integer division: 200/6=33)
expectedScore: 84, // 100 - 2*100/12 = 84
},
{
name: "Listed on 3 RBLs",
results: &DNSListResults{
IPsChecked: []string{"198.51.100.1"},
ListedCount: 3,
IPsChecked: []string{"198.51.100.1"},
ListedCount: 3,
RelevantListedCount: 3,
},
expectedScore: 50, // 100 - 3*100/6 = 50 (integer division: 300/6=50)
expectedScore: 75, // 100 - 3*100/12 = 75
},
{
name: "Listed on 4+ RBLs",
results: &DNSListResults{
IPsChecked: []string{"198.51.100.1"},
ListedCount: 4,
IPsChecked: []string{"198.51.100.1"},
ListedCount: 4,
RelevantListedCount: 4,
},
expectedScore: 34, // 100 - 4*100/6 = 34 (integer division: 400/6=66)
expectedScore: 67, // 100 - 4*100/12 = 67
},
}
@ -326,7 +330,7 @@ func TestGetBlacklistScore(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
score, _ := checker.CalculateScore(tt.results)
score, _ := checker.CalculateScore(tt.results, false)
if score != tt.expectedScore {
t.Errorf("GetBlacklistScore() = %v, want %v", score, tt.expectedScore)
}