From c2f53048d6236c85fd76b08eb2ff484a0a7e2ec3 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 17 Mar 2016 12:15:44 +0000 Subject: [PATCH] [Feature] Allow regexp maps for mime types --- src/plugins/lua/mime_types.lua | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/plugins/lua/mime_types.lua b/src/plugins/lua/mime_types.lua index 7cc0043a1..0bfe42fe0 100644 --- a/src/plugins/lua/mime_types.lua +++ b/src/plugins/lua/mime_types.lua @@ -86,16 +86,19 @@ if opts then end if settings['file'] and #settings['file'] > 0 then - map = rspamd_config:add_kv_map (settings['file'], - 'mime types map') - if map then - local id = rspamd_config:register_callback_symbol(1.0, check_mime_type) - rspamd_config:register_virtual_symbol(settings['symbol_unknown'], 1.0, id) - rspamd_config:register_virtual_symbol(settings['symbol_bad'], 1.0, id) - rspamd_config:register_virtual_symbol(settings['symbol_good'], 1.0, id) + + if settings['regexp'] then + map = rspamd_config:add_map ({ + url = settings['file'], + type = 'regexp', + description = 'mime types map' + }) else - rspamd_logger.warnx(rspamd_config, 'Cannot add mime_types: map doesn\'t exists: %1', - settings['file']) + map = rspamd_config:add_map ({ + url = settings['file'], + type = 'map', + description = 'mime types map' + }) end local id = rspamd_config:register_callback_symbol(1.0, check_mime_type) rspamd_config:register_virtual_symbol(settings['symbol_unknown'], 1.0, id) -- 2.39.5