From: twesterhever <40121680+twesterhever@users.noreply.github.com>
Date: Sun, 28 Apr 2024 08:29:23 +0000 (+0000)
Subject: Revert "[Enhancement] Implement Message-ID RHS checks against DNSBLs"
X-Git-Tag: 3.9.0~49^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60499c0563dccc65ebf08adf33b9909f0941d0db;p=thirdparty%2Frspamd.git

Revert "[Enhancement] Implement Message-ID RHS checks against DNSBLs"

This reverts commit 5e84a82f8742ed2bcef65859759c0dd14aa9c4ca.
---

diff --git a/lualib/plugins/rbl.lua b/lualib/plugins/rbl.lua
index 9dacbaa420..af5d6bd91f 100644
--- a/lualib/plugins/rbl.lua
+++ b/lualib/plugins/rbl.lua
@@ -33,7 +33,6 @@ local check_types = {
   numeric_urls = {},
   emails = {},
   replyto = {},
-  mid = {},
   dkim = {},
   rdns = {
     connfilter = true,
@@ -119,7 +118,6 @@ local rule_schema_tbl = {
   received_min_pos = ts.number:is_optional(),
   received_nflags = ts.array_of(ts.string):is_optional(),
   replyto = ts.boolean:is_optional(),
-  mid = ts.boolean:is_optional(),
   requests_limit = (ts.integer + ts.string / tonumber):is_optional(),
   require_symbols = (
       ts.array_of(ts.string) + (ts.string / function(s)
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 065a58fda0..b2ccf86999 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -829,24 +829,6 @@ local function gen_rbl_callback(rule)
     return true
   end
 
-  local function check_mid(task, requests_table, whitelist)
-    local function get_raw_header(name)
-      return ((task:get_header_full(name) or {})[1] or {})['value']
-    end
-
-    local mid = get_raw_header('Message-ID')
-    if mid then
-      local md = rspamd_util.parse_mail_address(mid, task:get_mempool())
-      lua_util.debugm(N, task, 'check message-id %s', md[1])
-
-      if md and md[1] and (md[1].addr and #md[1].addr > 0) then
-        check_email_table(task, md[1], requests_table, whitelist, 'mid')
-      end
-    end
-
-    return true
-  end
-
   -- Create function pipeline depending on rbl settings
   local pipeline = {
     is_alive, -- check monitored status
@@ -884,10 +866,6 @@ local function gen_rbl_callback(rule)
     pipeline[#pipeline + 1] = check_replyto
     description[#description + 1] = 'replyto'
   end
-  if rule.mid then
-    pipeline[#pipeline + 1] = check_mid
-    description[#description + 1] = 'mid'
-  end
 
   if rule.urls or rule.content_urls or rule.images or rule.numeric_urls then
     pipeline[#pipeline + 1] = check_urls
@@ -1050,7 +1028,7 @@ local function add_rbl(key, rbl, global_opts)
   end
 
   -- Check if rbl is available for empty tasks
-  if not (rbl.emails or rbl.urls or rbl.dkim or rbl.received or rbl.selector or rbl.replyto or rbl.mid) or
+  if not (rbl.emails or rbl.urls or rbl.dkim or rbl.received or rbl.selector or rbl.replyto) or
       rbl.is_empty then
     flags_tbl[#flags_tbl + 1] = 'empty'
   end
@@ -1140,7 +1118,7 @@ local function add_rbl(key, rbl, global_opts)
   end
 
   if not rbl.whitelist and not rbl.ignore_url_whitelist and (global_opts.url_whitelist or rbl.url_whitelist) and
-      (rbl.urls or rbl.emails or rbl.dkim or rbl.replyto or rbl.mid) and
+      (rbl.urls or rbl.emails or rbl.dkim or rbl.replyto) and
       not (rbl.from or rbl.received) then
     local def_type = 'set'
     rbl.whitelist = lua_maps.map_add_from_ucl(rbl.url_whitelist or global_opts.url_whitelist, def_type,