diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-03-23 13:49:03 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-03-23 13:49:03 +0000 |
| commit | 825932dd1b39839007463a7e4e85302bce1a269f (patch) | |
| tree | 0c7833b1b7aab0cbc596e2de2439ca26c3fee1c8 | |
| parent | 29f1133ccbafbbfeddd9c16b8a22c3d0708a0939 (diff) | |
| download | rspamd-825932dd1b39839007463a7e4e85302bce1a269f.tar.gz rspamd-825932dd1b39839007463a7e4e85302bce1a269f.zip | |
[Feature] Parse else parts in SA rules
| -rw-r--r-- | src/plugins/lua/spamassassin.lua | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua index 149bd8a0e..bb80ce6b2 100644 --- a/src/plugins/lua/spamassassin.lua +++ b/src/plugins/lua/spamassassin.lua @@ -683,6 +683,8 @@ local function process_sa_conf(f) return end + -- Unbalanced if/endif + if if_nested < 0 then if_nested = 0 end if skip_to_endif then if string.match(l, '^endif') then if_nested = if_nested - 1 @@ -692,6 +694,9 @@ local function process_sa_conf(f) end elseif string.match(l, '^if') then if_nested = if_nested + 1 + elseif string.match(l, '^else') then + -- Else counterpart for if + skip_to_endif = false end return else @@ -703,8 +708,8 @@ local function process_sa_conf(f) return false end, known_plugins) then skip_to_endif = true - if_nested = 1 end + if_nested = if_nested + 1 elseif string.match(l, '^if !plugin%(') then local pname = string.match(l, '^if !plugin%(([A-Za-z:]+)%)') if fun.any(function(pl) @@ -712,12 +717,17 @@ local function process_sa_conf(f) return false end, known_plugins) then skip_to_endif = true - if_nested = 1 end + if_nested = if_nested + 1 elseif string.match(l, '^if') then -- Unknown if skip_to_endif = true - if_nested = 1 + if_nested = if_nested + 1 + elseif string.match(l, '^else') then + -- Else counterpart for if + skip_to_endif = true + elseif string.match(l, '^endif') then + if_nested = if_nested - 1 end end @@ -975,7 +985,10 @@ local function process_sa_conf(f) cur_rule['type'] = 'meta' cur_rule['symbol'] = words[2] cur_rule['meta'] = words_to_re(words, 2) - if cur_rule['meta'] and cur_rule['symbol'] then valid_rule = true end + if cur_rule['meta'] and cur_rule['symbol'] + and cur_rule['meta'] ~= '0' then + valid_rule = true + end elseif words[1] == "describe" and valid_rule then cur_rule['description'] = words_to_re(words, 2) elseif words[1] == "score" then |