From: Andrew Lewis Date: Fri, 26 May 2017 11:19:05 +0000 (+0200) Subject: [Fix] Phishing: strict_domains X-Git-Tag: 1.5.9~9^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffadb2e1231134a8ae204de8c0d697ddf4e82a87;p=thirdparty%2Frspamd.git [Fix] Phishing: strict_domains --- diff --git a/src/plugins/lua/phishing.lua b/src/plugins/lua/phishing.lua index 74909e9da1..466d02b169 100644 --- a/src/plugins/lua/phishing.lua +++ b/src/plugins/lua/phishing.lua @@ -178,12 +178,14 @@ local function phishing_cb(task) rspamd_logger.debugm(N, task, "distance: %1 -> %2: %3", tld, ptld, dist) end - local function found_in_map(map) + local function found_in_map(map, furl, sweight) + if not furl then furl = url end + if not sweight then sweight = weight end if #map > 0 then for _,rule in ipairs(map) do - for _,dn in ipairs({url:get_tld(), url:get_host()}) do + for _,dn in ipairs({furl:get_tld(), furl:get_host()}) do if rule['map']:get_key(dn) then - task:insert_result(rule['symbol'], weight, ptld .. '->' .. dn) + task:insert_result(rule['symbol'], sweight, ptld .. '->' .. dn) return true end end