diff options
| author | Carsten Rosenberg <c.rosenberg@heinlein-support.de> | 2019-09-26 22:56:36 +0200 |
|---|---|---|
| committer | Carsten Rosenberg <c.rosenberg@heinlein-support.de> | 2019-09-26 22:56:36 +0200 |
| commit | cb1fb98db95bb42ba43c98b8c390748f7ac9c300 (patch) | |
| tree | d2400d79b2c04b9c1e35651c91b0db0fceb132a5 /lualib/lua_scanners/sophos.lua | |
| parent | 8bd1b26f6fef45b8d60ae9edd0bf7f891cf48e55 (diff) | |
| download | rspamd-cb1fb98db95bb42ba43c98b8c390748f7ac9c300.tar.gz rspamd-cb1fb98db95bb42ba43c98b8c390748f7ac9c300.zip | |
[Minor] lua_scanners - simplify need_check and dynamic_scan
Diffstat (limited to 'lualib/lua_scanners/sophos.lua')
| -rw-r--r-- | lualib/lua_scanners/sophos.lua | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/lualib/lua_scanners/sophos.lua b/lualib/lua_scanners/sophos.lua index 59facc845..ff47c262d 100644 --- a/lualib/lua_scanners/sophos.lua +++ b/lualib/lua_scanners/sophos.lua @@ -125,7 +125,7 @@ local function sophos_check(task, content, digest, rule) local vname = string.match(data, 'VIRUS (%S+) ') if vname then common.yield_result(task, rule, vname) - common.save_av_cache(task, digest, rule, vname) + common.save_cache(task, digest, rule, vname) else if string.find(data, 'DONE OK') then if rule['log_clean'] then @@ -134,7 +134,7 @@ local function sophos_check(task, content, digest, rule) lua_util.debugm(rule.name, task, '%s: message or mime_part is clean', rule.log_prefix) end - common.save_av_cache(task, digest, rule, 'OK') + common.save_cache(task, digest, rule, 'OK') -- not finished - continue elseif string.find(data, 'ACC') or string.find(data, 'OK SSSP') then conn:add_read(sophos_callback) @@ -157,14 +157,6 @@ local function sophos_check(task, content, digest, rule) end end - if rule.dynamic_scan then - local pre_check, pre_check_msg = common.check_metric_results(task, rule) - if pre_check then - rspamd_logger.infox(task, '%s: aborting: %s', rule.log_prefix, pre_check_msg) - return true - end - end - tcp.request({ task = task, host = addr:to_string(), @@ -175,13 +167,10 @@ local function sophos_check(task, content, digest, rule) }) end - if common.need_av_check(task, content, rule) then - if common.check_av_cache(task, digest, rule, sophos_check_uncached) then - return - else - sophos_check_uncached() - end + if common.need_check(task, content, rule, digest) then + sophos_check_uncached() end + end return { |