From: Vsevolod Stakhov Date: Wed, 8 Dec 2021 13:07:44 +0000 (+0000) Subject: [Fix] Phishing: Deal with phishing + redirected URL X-Git-Tag: 3.2~180 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=857e16e9308f313e4af482035355e6e99f65a867;p=rspamd.git [Fix] Phishing: Deal with phishing + redirected URL --- diff --git a/src/plugins/lua/phishing.lua b/src/plugins/lua/phishing.lua index dac5e92e9..32efc9f7b 100644 --- a/src/plugins/lua/phishing.lua +++ b/src/plugins/lua/phishing.lua @@ -192,8 +192,9 @@ local function phishing_cb(task) end local urls = task:get_urls() or {} - for _,url in ipairs(urls) do + for _,url_iter in ipairs(urls) do local function do_loop_iter() -- to emulate continue + local url = url_iter if generic_service_hash then check_phishing_map(generic_service_data, url, generic_service_symbol) end @@ -206,8 +207,23 @@ local function phishing_cb(task) check_phishing_dns(phishtank_suffix, url, phishtank_symbol) end - if url:is_phished() and not url:is_redirected() then - local purl = url:get_phished() + if url:is_phished() then + local purl + + if url:is_redirected() then + local rspamd_url = require "rspamd_url" + -- Examine the real redirect target instead of the url + local redirected_url = url:get_redirected() + if not redirected_url then + return + end + + purl = rspamd_url.create(task:get_mempool(), url:get_visible()) + url = redirected_url + else + purl = url:get_phished() + end + if not purl then return