Ver código fonte

Rename user to exclude_users and invert logic

tags/0.9.0
Andrew Lewis 9 anos atrás
pai
commit
c2a4fda0e3
3 arquivos alterados com 8 adições e 8 exclusões
  1. 1
    1
      conf/modules.conf
  2. 2
    2
      doc/markdown/modules/rbl.md
  3. 5
    5
      src/plugins/lua/rbl.lua

+ 1
- 1
conf/modules.conf Ver arquivo

@@ -86,7 +86,7 @@ rbl {

default_from = true;
default_received = false;
default_user = false;
default_exclude_users = true;

rbls {

+ 2
- 2
doc/markdown/modules/rbl.md Ver arquivo

@@ -49,9 +49,9 @@ Use this RBL to test parameters sent for HELO/EHLO at SMTP time.

If set to false, do not yield a result unless the response received from the RBL is defined in its related returncodes {} subsection, else return the default symbol for the RBL.

- default_user (true)
- default_exclude_users (false)

If set to false, do not use this RBL if the message sender is authenticated.
If set to true, do not use this RBL if the message sender is authenticated.

RBL-specific subsection is structured as follows:


+ 5
- 5
src/plugins/lua/rbl.lua Ver arquivo

@@ -63,7 +63,7 @@ local function rbl_cb (task)
for k,rbl in pairs(rbls) do

(function()
if rbl['user'] == false then
if rbl['exclude_users'] then
if not havegot['user'] and not notgot['user'] then
havegot['user'] = task:get_user()
if havegot['user'] == nil then
@@ -167,7 +167,7 @@ if type(rspamd_config.get_api_version) ~= 'nil' then
rspamd_config:register_module_option('rbl', 'default_rdns', 'string')
rspamd_config:register_module_option('rbl', 'default_helo', 'string')
rspamd_config:register_module_option('rbl', 'default_unknown', 'string')
rspamd_config:register_module_option('rbl', 'default_user', 'string')
rspamd_config:register_module_option('rbl', 'default_exclude_users', 'string')
end
end

@@ -197,11 +197,11 @@ end
if(opts['default_helo'] == nil) then
opts['default_helo'] = false
end
if(opts['default_user'] == nil) then
opts['default_user'] = true
if(opts['default_exclude_users'] == nil) then
opts['default_exclude_users'] = false
end
for key,rbl in pairs(opts['rbls']) do
local o = { "ipv4", "ipv6", "from", "received", "unknown", "rdns", "helo", "user" }
local o = { "ipv4", "ipv6", "from", "received", "unknown", "rdns", "helo", "exclude_users" }
for i=1,table.maxn(o) do
if(rbl[o[i]] == nil) then
rbl[o[i]] = opts['default_' .. o[i]]

Carregando…
Cancelar
Salvar