diff options
| -rw-r--r-- | lualib/lua_scanners/oletools.lua | 2 | ||||
| -rw-r--r-- | src/plugins/lua/antivirus.lua | 24 | ||||
| -rw-r--r-- | src/plugins/lua/external_services.lua | 18 |
3 files changed, 22 insertions, 22 deletions
diff --git a/lualib/lua_scanners/oletools.lua b/lualib/lua_scanners/oletools.lua index 814fe368e..6e1a0fcc1 100644 --- a/lualib/lua_scanners/oletools.lua +++ b/lualib/lua_scanners/oletools.lua @@ -257,7 +257,7 @@ local function oletools_config(opts) oletools_conf.default_port) if oletools_conf.upstreams then - lua_util.add_debug_alias('antivirus', oletools_conf.module_name) + lua_util.add_debug_alias('external_services', oletools_conf.module_name) return oletools_conf end 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) diff --git a/src/plugins/lua/external_services.lua b/src/plugins/lua/external_services.lua index fb7aef709..8e101ab9a 100644 --- a/src/plugins/lua/external_services.lua +++ b/src/plugins/lua/external_services.lua @@ -112,22 +112,22 @@ end local function add_scanner_rule(sym, opts) - if not opts['type'] then + if not opts.type then rspamd_logger.errx(rspamd_config, 'unknown type for external scanner rule %s', sym) return nil end - if not opts['symbol'] then opts['symbol'] = sym:upper() end - local cfg = lua_scanners[opts['type']] + if not opts.symbol then opts.symbol = sym:upper() end + local cfg = lua_scanners[opts.type] if not cfg then rspamd_logger.errx(rspamd_config, 'unknown external scanner 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 local rule = cfg.configure(opts) @@ -137,7 +137,7 @@ local function add_scanner_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 @@ -153,8 +153,8 @@ local function add_scanner_rule(sym, opts) rule.mime_parts_filter_ext = common.create_regex_table(opts.mime_parts_filter_ext 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) |