[Feature] Supprort FQDNs in phishing module maps

diff --git a/doc/markdown/modules/phishing.md b/doc/markdown/modules/phishing.md
index 5218cc908a71ad31af938445f737126b478d2fc2..cad513e8cad23d09360e04324ea440fd0575d292 100644 (file)
--- a/doc/markdown/modules/phishing.md
+++ b/doc/markdown/modules/phishing.md
@@ -58,6 +58,9 @@ payments system phishing.
 Finally, the default symbol is yielded- if `domains` is specified then
 only if the phished domain is found in the related map.
 
+Maps for this module can consist of effective second level domain parts (eTLD)
+or whole domain parts of the URLs (FQDN) as well.
+
 ## Openphish support
 
 Since version 1.3, there is [openphish](https://openphish.com) support in rspamd.

diff --git a/src/plugins/lua/phishing.lua b/src/plugins/lua/phishing.lua
index b3b3da12e8df71ff1bf43c5e177f2564879813c9..2e2b9224436cddc7310b7dc79ac8f3a853f0f501 100644 (file)
--- a/src/plugins/lua/phishing.lua
+++ b/src/plugins/lua/phishing.lua
@@ -90,7 +90,7 @@ local function phishing_cb(task)
 
         if #redirector_domains > 0 then
           for _,rule in ipairs(redirector_domains) do
-            if rule['map']:get_key(url:get_tld()) then
+            if rule['map']:get_key(tld) or rule['map']:get_key(url:get_host()) then
               task:insert_result(rule['symbol'], weight, ptld .. '->' .. tld)
               found = true
             end
@@ -98,7 +98,7 @@ local function phishing_cb(task)
         end
         if not found and #strict_domains > 0 then
           for _,rule in ipairs(strict_domains) do
-            if rule['map']:get_key(ptld) then
+            if rule['map']:get_key(ptld) or rule['map']:get_key(purl:get_host()) then
               task:insert_result(rule['symbol'], 1.0, ptld .. '->' .. tld)
               found = true
             end