From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 29 Apr 2021 08:31:59 +0000 (+0200)
Subject: [Minor] Fix REPLYTO_ADDR_EQ_FROM for normalised addresses
X-Git-Tag: 3.0~452^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F3739%2Fhead;p=rspamd.git

[Minor] Fix REPLYTO_ADDR_EQ_FROM for normalised addresses
---

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index f0f64daff..4613a7dd7 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -214,7 +214,7 @@ local check_replyto_id = rspamd_config:register_symbol({
     end
 
     -- See if Reply-To matches From in some way
-    local from = task:get_from(2)
+    local from = task:get_from{'mime', 'orig'}
     local from_h = get_raw_header(task, 'From')
     if not (from and from[1]) then
       return false
diff --git a/test/functional/cases/280_rules.robot b/test/functional/cases/280_rules.robot
index 5bab11016..ec8e12fb2 100644
--- a/test/functional/cases/280_rules.robot
+++ b/test/functional/cases/280_rules.robot
@@ -110,6 +110,9 @@ PHISH_SENDER_ROUTING_PART
   Scan File  ${TESTDIR}/messages/phish_sender6.eml
   Expect Symbol  FROM_INVALID
 
+REPLYTO_ADDR_EQ_FROM
+  Scan File  ${TESTDIR}/messages/replyto_addr_eq_from.eml
+  Expect Symbol  REPLYTO_ADDR_EQ_FROM
 
 
 *** Keywords ***
diff --git a/test/functional/messages/replyto_addr_eq_from.eml b/test/functional/messages/replyto_addr_eq_from.eml
new file mode 100644
index 000000000..8d61078fb
--- /dev/null
+++ b/test/functional/messages/replyto_addr_eq_from.eml
@@ -0,0 +1,5 @@
+From: "OMG" <kewl.example.20210428@gmail.com>
+Reply-To: "GMO" <kewl.example.20210428@gmail.com>
+Content-type: text/plain
+
+hi