diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2015-06-23 17:32:19 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2015-06-23 17:33:05 +0200 |
| commit | b077a882599d6f0a7ead3203509cb65218300150 (patch) | |
| tree | 8550d539ac92b3cd7ad2bac876be1edd1655d670 /src/plugins/lua/rbl.lua | |
| parent | 935c992ce705d3b978eb1e6defb9f3f64498a935 (diff) | |
| download | rspamd-b077a882599d6f0a7ead3203509cb65218300150.tar.gz rspamd-b077a882599d6f0a7ead3203509cb65218300150.zip | |
rbl.lua: Fix issues with application of whitelists
Diffstat (limited to 'src/plugins/lua/rbl.lua')
| -rw-r--r-- | src/plugins/lua/rbl.lua | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index c524c5bf1..62d1a8bd9 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -370,9 +370,13 @@ for key,rbl in pairs(opts['rbls']) do if not foundException then table.insert(white_symbols, s) end + else + table.insert(white_symbols, s) end else - table.insert(black_symbols, s) + if rbl['ignore_whitelists'] == false then + table.insert(black_symbols, s) + end end end end @@ -383,7 +387,24 @@ for key,rbl in pairs(opts['rbls']) do if type(rspamd_config.get_api_version) ~= 'nil' and rbl['symbol'] then rspamd_config:register_virtual_symbol(rbl['symbol'], 1, id) if(rbl['is_whitelist']) then - table.insert(white_symbols, rbl['symbol']) + if type(rbl['whitelist_exception']) == 'string' then + if (rbl['whitelist_exception'] ~= rbl['symbol']) then + table.insert(white_symbols, rbl['symbol']) + end + elseif type(rbl['whitelist_exception']) == 'table' then + local foundException = false + for _, e in pairs(rbl['whitelist_exception']) do + if e == s then + foundException = true + break + end + end + if not foundException then + table.insert(white_symbols, rbl['symbol']) + end + else + table.insert(white_symbols, rbl['symbol']) + end else if rbl['ignore_whitelists'] == false then table.insert(black_symbols, rbl['symbol']) |