diff options
author | Carsten Rosenberg <c.rosenberg@heinlein-support.de> | 2019-01-13 17:55:24 +0100 |
---|---|---|
committer | Carsten Rosenberg <c.rosenberg@heinlein-support.de> | 2019-01-13 17:55:24 +0100 |
commit | 2134040728963f49ce866fa8cd9158539bd9ee03 (patch) | |
tree | 21148bdc0e37e9ba77ce0c2bbc4fd704d607c784 /src/plugins/lua/antivirus.lua | |
parent | d68a5f42a33d8830d268c2cc581469fa0381fa6c (diff) | |
download | rspamd-2134040728963f49ce866fa8cd9158539bd9ee03.tar.gz rspamd-2134040728963f49ce866fa8cd9158539bd9ee03.zip |
[FIX] lua_scanners - duplicated fail symbol + luastyle
Diffstat (limited to 'src/plugins/lua/antivirus.lua')
-rw-r--r-- | src/plugins/lua/antivirus.lua | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua index 5ce6dfe06..0dde3e217 100644 --- a/src/plugins/lua/antivirus.lua +++ b/src/plugins/lua/antivirus.lua @@ -70,29 +70,29 @@ end local function add_antivirus_rule(sym, opts) - if not opts['type'] then + if not opts.type then rspamd_logger.errx(rspamd_config, 'unknown type for AV rule %s', sym) return nil end - if not opts['symbol'] then opts['symbol'] = sym:upper() end - local cfg = lua_antivirus[opts['type']] + if not opts.symbol then opts.symbol = sym:upper() end + local cfg = lua_antivirus[opts.type] if not cfg then rspamd_logger.errx(rspamd_config, 'unknown antivirus type: %s', - opts['type']) + opts.type) return nil end - if not opts['symbol_fail'] then - opts['symbol_fail'] = string.upper(opts['type']) .. '_FAIL' + if not opts.symbol_fail then + opts.symbol_fail = opts.symbol .. '_FAIL' end -- WORKAROUND for deprecated attachments_only - if opts['attachments_only'] ~= nil then - opts['scan_mime_parts'] = opts['attachments_only'] + if opts.attachments_only ~= nil then + opts.scan_mime_parts = opts.attachments_only rspamd_logger.warnx(rspamd_config, '%s [%s]: Using attachments_only is deprecated. '.. - 'Please use scan_mime_parts = %s instead', opts['symbol'], opts['type'], opts['attachments_only']) + 'Please use scan_mime_parts = %s instead', opts.symbol, opts.type, opts.attachments_only) end -- WORKAROUND for deprecated attachments_only @@ -103,14 +103,14 @@ local function add_antivirus_rule(sym, opts) if not rule then rspamd_logger.errx(rspamd_config, 'cannot configure %s for %s', - opts['type'], opts['symbol']) + opts.type, opts.symbol) return nil end rule.patterns = common.create_regex_table(opts.patterns or {}) - if opts['whitelist'] then - rule['whitelist'] = rspamd_config:add_hash_map(opts['whitelist']) + if opts.whitelist then + rule.whitelist = rspamd_config:add_hash_map(opts.whitelist) end return function(task) |