From: dzjaivnt <91220882+dzjaivnt@users.noreply.github.com>
Date: Thu, 12 Oct 2023 10:40:41 +0000 (+0200)
Subject: Update dmarc.lua
X-Git-Tag: 3.7.2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4640%2Fhead;p=thirdparty%2Frspamd.git

Update dmarc.lua

With name:

dmarc; dmarc.lua:191: munging debug: {[domain] = domain.tld [flags] = {[valid] = true, [braced] = true}, [name] = Name [domain.tld], [raw] = <user@domain.tld>, [addr] = user@domain.tld, [user] = user}

dmarc; dmarc.lua:234: munged DMARC header for domain.tld: Name [domain.tld] via mark <otheruser@otherdomain.tld> -> user@domain.tld

Without name:
dmarc; dmarc.lua:191: munging debug: {[domain] = domain.tld [flags] = {[valid] = true, [braced] = true}, [name] = , [raw] = <user@domain.tld>, [addr] = user@domain.tld, [user] = user}

dmarc.lua:234: munged DMARC header for domain.tld: user via otheruser <otheruser@otherdomain.tld> -> user@domain.tld
---

diff --git a/lualib/plugins/dmarc.lua b/lualib/plugins/dmarc.lua
index ff33626bf1..7791f4eb37 100644
--- a/lualib/plugins/dmarc.lua
+++ b/lualib/plugins/dmarc.lua
@@ -188,10 +188,10 @@ exports.gen_munging_callback = function(munging_opts, settings)
     local via_addr = rcpt_found.addr
     local via_name
 
-    if from.name != "" then
-      via_name = string.format('%s via %s', from.name, via_user)
-    else
+    if from.name == "" then
       via_name = string.format('%s via %s', from.user or 'unknown', via_user)
+    else
+      via_name = string.format('%s via %s', from.name, via_user)
     end
 
     local hdr_encoded = rspamd_util.fold_header('From',