From 03e3d7063308dd169d5b1692ccd28403c16ddd76 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Wed, 16 Nov 2016 10:17:42 +0200 Subject: [PATCH] [Minor] Small polishes for Lua parts --- src/plugins/lua/antivirus.lua | 2 +- src/plugins/lua/asn.lua | 2 +- src/plugins/lua/dmarc.lua | 1 + src/plugins/lua/fann_classifier.lua | 2 +- src/plugins/lua/hfilter.lua | 8 +++++--- src/plugins/lua/multimap.lua | 1 + src/plugins/lua/phishing.lua | 2 +- src/plugins/lua/replies.lua | 4 ++-- src/plugins/lua/spamassassin.lua | 4 ++-- src/plugins/lua/trie.lua | 4 ++-- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua index c55305f2a..91ac61af6 100644 --- a/src/plugins/lua/antivirus.lua +++ b/src/plugins/lua/antivirus.lua @@ -346,7 +346,7 @@ local function clamav_check(task, rule) upstream:ok() data = tostring(data) - local s,_ = string.find(data, ' FOUND') + local s = string.find(data, ' FOUND') local cached = 'OK' if s then local vname = string.match(data:sub(1, s - 1), 'stream: (.+)') diff --git a/src/plugins/lua/asn.lua b/src/plugins/lua/asn.lua index 7fff000a4..91b5cc874 100644 --- a/src/plugins/lua/asn.lua +++ b/src/plugins/lua/asn.lua @@ -131,7 +131,7 @@ local function asn_check(task) end end - local ret,_,_ = rspamd_redis_make_request(task, + local ret = rspamd_redis_make_request(task, redis_params, -- connect params key, -- hash key false, -- is write diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua index cdbc8700e..400882755 100644 --- a/src/plugins/lua/dmarc.lua +++ b/src/plugins/lua/dmarc.lua @@ -116,6 +116,7 @@ local function dmarc_callback(task) local function dmarc_dns_cb(_, to_resolve, results, err) + task:inc_dns_req() local lookup_domain = string.sub(to_resolve, 8) if err and (err ~= 'requested record is not found' and err ~= 'no records with this name') then task:insert_result(dmarc_symbols['dnsfail'], 1.0, lookup_domain .. ' : ' .. err) diff --git a/src/plugins/lua/fann_classifier.lua b/src/plugins/lua/fann_classifier.lua index 770f244d8..ca6fb2026 100644 --- a/src/plugins/lua/fann_classifier.lua +++ b/src/plugins/lua/fann_classifier.lua @@ -282,7 +282,7 @@ if redis_params then maybe_load_fann(task, classify_cb, false) end, - learn = function(task, _, tokens, is_spam, _) + learn = function(task, _, tokens, is_spam) local function learn_cb(_, is_loaded) if not is_loaded then create_fann() diff --git a/src/plugins/lua/hfilter.lua b/src/plugins/lua/hfilter.lua index 6bf8358a9..0bcbc52ff 100644 --- a/src/plugins/lua/hfilter.lua +++ b/src/plugins/lua/hfilter.lua @@ -19,8 +19,7 @@ limitations under the License. -- Weight for checks_hellohost and checks_hello: 5 - very hard, 4 - hard, 3 - meduim, 2 - low, 1 - very low. -- From HFILTER_HELO_* and HFILTER_HOSTNAME_* symbols the maximum weight is selected in case of their actuating. - ---local dumper = require 'pl.pretty'.dump +local rspamd_logger = require "rspamd_logger" local rspamd_regexp = require "rspamd_regexp" local rspamc_local_helo = "rspamc.local" local checks_hellohost = { @@ -142,8 +141,11 @@ local function check_host(task, host, symbol_suffix, eq_ip, eq_host) local failed_address = 0 local resolved_address = {} - local function check_host_cb_mx(_, _, results) + local function check_host_cb_mx(_, to_resolve, results, err) task:inc_dns_req() + if err and (err ~= 'requested record is not found' and err ~= 'no records with this name') then + rspamd_logger.errx(task, 'error looking up %s: %s', to_resolve, err) + end if not results then task:insert_result('HFILTER_' .. symbol_suffix .. '_NORES_A_OR_MX', 1.0) else diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua index 9783e99cb..0e0ead474 100644 --- a/src/plugins/lua/multimap.lua +++ b/src/plugins/lua/multimap.lua @@ -528,6 +528,7 @@ local function multimap_callback(task, rule) match_rule(rule, ip) else local cb = function (_, to_resolve, results, err) + task:inc_dns_req() if err and (err ~= 'requested record is not found' and err ~= 'no records with this name') then rspamd_logger.errx(task, 'error looking up %s: %s', to_resolve, err) end diff --git a/src/plugins/lua/phishing.lua b/src/plugins/lua/phishing.lua index 015e079dd..1383fcd05 100644 --- a/src/plugins/lua/phishing.lua +++ b/src/plugins/lua/phishing.lua @@ -177,7 +177,7 @@ local function phishing_map(mapname, phishmap, id) xd[1] = opts[mapname] end for _,d in ipairs(xd) do - local s, _ = string.find(d, ':[^:]+$') + local s = string.find(d, ':[^:]+$') if s then local sym = string.sub(d, s + 1, -1) local map = string.sub(d, 1, s - 1) diff --git a/src/plugins/lua/replies.lua b/src/plugins/lua/replies.lua index 314f09083..c8e4bb6b6 100644 --- a/src/plugins/lua/replies.lua +++ b/src/plugins/lua/replies.lua @@ -65,7 +65,7 @@ local function replies_check(task) -- Create hash of in-reply-to and query redis local key = make_key(irt) - local ret,_,_ = rspamd_redis_make_request(task, + local ret = rspamd_redis_make_request(task, redis_params, -- connect params key, -- hash key false, -- is write @@ -96,7 +96,7 @@ local function replies_set(task) end -- Create hash of message-id and store to redis local key = make_key(msg_id) - local ret,_,_ = rspamd_redis_make_request(task, + local ret = rspamd_redis_make_request(task, redis_params, -- connect params key, -- hash key true, -- is write diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua index 07a80bb90..f6bb37fdf 100644 --- a/src/plugins/lua/spamassassin.lua +++ b/src/plugins/lua/spamassassin.lua @@ -1097,10 +1097,10 @@ local function apply_replacements(str) end local function replace_all_tags(s) - local sstr, _ + local sstr sstr = s fun.each(function(n, t) - sstr,_ = string.gsub(sstr, string.format("<%s>", n), + sstr = string.gsub(sstr, string.format("<%s>", n), string.format("%s%s%s", pre, t, post)) end, replace['tags']) diff --git a/src/plugins/lua/trie.lua b/src/plugins/lua/trie.lua index 443f2e5de..1be5b1d98 100644 --- a/src/plugins/lua/trie.lua +++ b/src/plugins/lua/trie.lua @@ -18,7 +18,7 @@ limitations under the License. local rspamd_logger = require "rspamd_logger" local rspamd_trie = require "rspamd_trie" -local _ = require "fun" +local fun = require "fun" local mime_trie local raw_trie @@ -122,7 +122,7 @@ local function process_trie_conf(symbol, cf) if cf['file'] then process_trie_file(symbol, cf) elseif cf['patterns'] then - _.each(function(pat) + fun.each(function(pat) process_single_pattern(pat, symbol, cf) end, cf['patterns']) end -- 2.39.5