Paragraph
Text
More
", - expectedText: "Text More", + expectedText: "TextMore", }, { name: "With style tag", html: "Text
More
", - expectedText: "Text More", + expectedText: "TextMore", }, { name: "Empty HTML", diff --git a/pkg/analyzer/dns.go b/pkg/analyzer/dns.go index cb1fa68..57226c6 100644 --- a/pkg/analyzer/dns.go +++ b/pkg/analyzer/dns.go @@ -22,6 +22,7 @@ package analyzer import ( + "net" "time" "git.happydns.org/happyDeliver/internal/api" @@ -30,26 +31,19 @@ import ( // DNSAnalyzer analyzes DNS records for email domains type DNSAnalyzer struct { Timeout time.Duration - resolver DNSResolver + resolver *net.Resolver } // NewDNSAnalyzer creates a new DNS analyzer with configurable timeout func NewDNSAnalyzer(timeout time.Duration) *DNSAnalyzer { - return NewDNSAnalyzerWithResolver(timeout, NewStandardDNSResolver()) -} - -// NewDNSAnalyzerWithResolver creates a new DNS analyzer with a custom resolver. -// If resolver is nil, a StandardDNSResolver will be used. -func NewDNSAnalyzerWithResolver(timeout time.Duration, resolver DNSResolver) *DNSAnalyzer { if timeout == 0 { timeout = 10 * time.Second // Default timeout } - if resolver == nil { - resolver = NewStandardDNSResolver() - } return &DNSAnalyzer{ - Timeout: timeout, - resolver: resolver, + Timeout: timeout, + resolver: &net.Resolver{ + PreferGo: true, + }, } } @@ -127,12 +121,6 @@ func (d *DNSAnalyzer) AnalyzeDNS(email *EmailMessage, authResults *api.Authentic // Check BIMI record (for From domain - branding is based on visible sender) results.BimiRecord = d.checkBIMIRecord(fromDomain, "default") - // Check DNSSEC status (for From domain) - dnssecEnabled, err := d.resolver.IsDNSSECEnabled(nil, fromDomain) - if err == nil { - results.DnssecEnabled = &dnssecEnabled - } - return results } @@ -155,12 +143,6 @@ func (d *DNSAnalyzer) AnalyzeDomainOnly(domain string) *api.DNSResults { // Check BIMI record with default selector results.BimiRecord = d.checkBIMIRecord(domain, "default") - // Check DNSSEC status - dnssecEnabled, err := d.resolver.IsDNSSECEnabled(nil, domain) - if err == nil { - results.DnssecEnabled = &dnssecEnabled - } - return results } @@ -216,16 +198,11 @@ func (d *DNSAnalyzer) CalculateDNSScore(results *api.DNSResults, senderIP string score := 0 - // DNSSEC: 10 points - if results.DnssecEnabled != nil && *results.DnssecEnabled { - score += 10 - } - // PTR and Forward DNS: 20 points score += 20 * d.calculatePTRScore(results, senderIP) / 100 - // MX Records: 10 points (5 for From domain, 5 for Return-Path domain) - score += 10 * d.calculateMXScore(results) / 100 + // MX Records: 20 points (10 for From domain, 10 for Return-Path domain) + score += 20 * d.calculateMXScore(results) / 100 // SPF Records: 20 points score += 20 * d.calculateSPFScore(results) / 100 diff --git a/pkg/analyzer/dns_resolver.go b/pkg/analyzer/dns_resolver.go deleted file mode 100644 index dcbca59..0000000 --- a/pkg/analyzer/dns_resolver.go +++ /dev/null @@ -1,237 +0,0 @@ -// This file is part of the happyDeliver (R) project. -// Copyright (c) 2025 happyDomain -// Authors: Pierre-Olivier Mercier, et al. -// -// This program is offered under a commercial and under the AGPL license. -// For commercial licensing, contact us at- DNSSEC (DNS Security Extensions) adds cryptographic signatures to DNS records to verify - their authenticity and integrity. It protects against DNS spoofing and cache poisoning - attacks, ensuring that DNS responses haven't been tampered with. -
- {#if domain} -{domain}
-