From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 18 Oct 2021 09:49:53 +0000 (+0100)
Subject: [Fix] Dmarc: Always lowercase domain
X-Git-Tag: 3.1~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d52a5896a9b795faffdd4142363a37582c8e346;p=thirdparty%2Frspamd.git

[Fix] Dmarc: Always lowercase domain

Issue: #3940
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index ffc37ae3d7..d5073377b2 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -131,7 +131,7 @@ local function dmarc_validate_policy(task, policy, hdrfromdom, dmarc_esld)
 
     for _,opt in ipairs(opts) do
       local check_res = string.sub(opt, -1)
-      local domain = string.sub(opt, 1, -3)
+      local domain = string.sub(opt, 1, -3):lower()
 
       if check_res == '+' then
         table.insert(dkim_results.pass, domain)
@@ -357,6 +357,8 @@ local function dmarc_callback(task)
 
   -- Do some initial sanity checks, detect tld domain if different
   if hfromdom and hfromdom ~= '' and not (from or E)[2] then
+    -- Lowercase domain as per #3940
+    hfromdom = hfromdom:lower()
     dmarc_domain = rspamd_util.get_tld(hfromdom)
   elseif (from or E)[2] then
     task:insert_result(settings.symbols['na'], 1.0, 'Duplicate From header')