Browse Source

[Minor] Add more default scores :(

tags/2.6
Vsevolod Stakhov 4 years ago
parent
commit
6541d1c692
2 changed files with 16 additions and 7 deletions
  1. 2
    1
      src/plugins/lua/multimap.lua
  2. 14
    6
      src/plugins/lua/spamassassin.lua

+ 2
- 1
src/plugins/lua/multimap.lua View File

@@ -1260,7 +1260,8 @@ if opts and type(opts) == 'table' then
rspamd_config:register_symbol({
type = 'virtual',
name = s,
parent = id
parent = id,
score = 0, -- Default score
})
rule['symbols_set'][s] = 1
end, rule['symbols'])

+ 14
- 6
src/plugins/lua/spamassassin.lua View File

@@ -1532,6 +1532,7 @@ local function post_process()
if not expression then
rspamd_logger.errx(rspamd_config, 'Cannot parse expression ' .. r['meta'])
else

if r['score'] then
rspamd_config:set_metric_symbol{
name = k, score = r['score'],
@@ -1540,14 +1541,21 @@ local function post_process()
one_shot = true
}
scores_added[k] = 1
rspamd_config:register_symbol{
name = k,
weight = calculate_score(k, r),
callback = meta_cb
}
else
-- Add 0 score to avoid issues
rspamd_config:register_symbol{
name = k,
weight = calculate_score(k, r),
callback = meta_cb,
score = 0,
}
end

rspamd_config:register_symbol{
name = k,
weight = calculate_score(k, r),
callback = meta_cb
}

r['expression'] = expression

if not atoms[k] then

Loading…
Cancel
Save