[Minor] fix some warnings

diff --git a/conf/modules.d/external_services.conf b/conf/modules.d/external_services.conf
index a4f9a6aeaffab6a6a80e18c8d94928b621488916..98c79b4d03786364973a74d589623e02117417ba 100644 (file)
--- a/conf/modules.d/external_services.conf
+++ b/conf/modules.d/external_services.conf
@@ -29,7 +29,6 @@ external_services {
     # symbol will be yielded if a match is found. If no match is found, default symbol is yielded.
     patterns {
       # symbol_name = "pattern";
-      JUST_EICAR = "^Eicar-Test-Signature$";
     }
     # mime-part regex matching in content-type or filename
     mime_parts_filter_regex {
@@ -83,7 +82,6 @@ external_services {
     # symbol will be yielded if a match is found. If no match is found, default symbol is yielded.
     patterns {
       # symbol_name = "pattern";
-      JUST_EICAR = "^Eicar-Test-Signature$";
     }
     # `whitelist` points to a map of IP addresses. Mail from these addresses is not scanned.
     whitelist = "/etc/rspamd/antivirus.wl";

diff --git a/lualib/lua_scanners/oletools.lua b/lualib/lua_scanners/oletools.lua
index a17840305d35ca4fc0c1b8b1654cf0332445c4cb..d16c1877f45ec75b3b6394f23c919d2db5c57916 100644 (file)
--- a/lualib/lua_scanners/oletools.lua
+++ b/lualib/lua_scanners/oletools.lua
@@ -130,10 +130,10 @@ local function oletools_check(task, content, digest, rule)
           rspamd_logger.errx(task, '%s: Error message: %s',
               rule.log_prefix, result[2]['message'])
           oletools_requery(oletools_rc[result[3]['return_code']])
-        elseif #result[2]['analysis'] == 0 and #result[2]['macros'] == 0 then
+        elseif type(result[2]['analysis']) == 'table' and #result[2]['analysis'] == 0 and #result[2]['macros'] == 0 then
           rspamd_logger.warnx(task, '%s: maybe unhandled python or oletools error', rule.log_prefix)
           common.yield_result(task, rule, 'oletools unhandled error', 0.0, 'fail')
-        elseif result[2]['analysis'] == 'null' and #result[2]['macros'] == 0 then
+        elseif type(result[2]['analysis']) ~= 'table' and #result[2]['macros'] == 0 then
           common.save_av_cache(task, digest, rule, 'OK')
           common.log_clean(task, rule, 'No macro found')
         elseif #result[2]['macros'] > 0 then

diff --git a/src/plugins/lua/spamtrap.lua b/src/plugins/lua/spamtrap.lua
index 97107c2756f57d3cdf78c276da64720864ba3164..ab39b42e6a6111a8b9fefc4218e04c1bd76c3181 100644 (file)
--- a/src/plugins/lua/spamtrap.lua
+++ b/src/plugins/lua/spamtrap.lua
@@ -184,7 +184,7 @@ if opts then
 
   local id = rspamd_config:register_symbol({
     name = "SPAMTRAP_CHECK",
-    type = "postfilter",
+    type = "callback,postfilter",
     callback = spamtrap_cb
   })
   rspamd_config:register_symbol({