From: heraklit256 <heraklit256@users.noreply.github.com>
Date: Tue, 5 Mar 2019 16:17:53 +0000 (+0100)
Subject: unify rules scores and weights
X-Git-Tag: 1.9.2~11^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=323580e25d9eb599d31c666c79d2c8ec8bfc41a4;p=rspamd.git

unify rules scores and weights
---

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index 359975dc1..dca68acb6 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -682,7 +682,7 @@ local check_from_id = rspamd_config:register_symbol{
 
 rspamd_config:register_symbol{
   name = 'FROM_NO_DN',
-  score = 0,
+  score = 0.0,
   group = 'headers',
   parent = check_from_id,
   type = 'virtual',
diff --git a/rules/misc.lua b/rules/misc.lua
index 1cc7bfc22..03aa5a3a9 100644
--- a/rules/misc.lua
+++ b/rules/misc.lua
@@ -503,7 +503,7 @@ rspamd_config:register_symbol{
   name = 'TAGGED_RCPT',
   description = 'SMTP recipients have plus tags',
   group = 'headers',
-  score = 0,
+  score = 0.0,
 }
 rspamd_config:register_symbol{
   type = 'virtual',
@@ -511,7 +511,7 @@ rspamd_config:register_symbol{
   name = 'TAGGED_FROM',
   description = 'SMTP from has plus tags',
   group = 'headers',
-  score = 0,
+  score = 0.0,
 }
 
 local check_from_display_name = rspamd_config:register_symbol{
@@ -560,7 +560,7 @@ rspamd_config:register_symbol{
   name = 'SPOOF_DISPLAY_NAME',
   description = 'Display name is being used to spoof and trick the recipient',
   group = 'headers',
-  score = 8,
+  score = 8.0,
 }
 
 rspamd_config:register_symbol{
@@ -569,7 +569,7 @@ rspamd_config:register_symbol{
   name = 'FROM_NEQ_DISPLAY_NAME',
   group = 'headers',
   description = 'Display name contains an email address different to the From address',
-  score = 4,
+  score = 4.0,
 }
 
 rspamd_config.SPOOF_REPLYTO = {
diff --git a/rules/regexp/upstream_spam_filters.lua b/rules/regexp/upstream_spam_filters.lua
index 4c457428a..8ba6ea057 100644
--- a/rules/regexp/upstream_spam_filters.lua
+++ b/rules/regexp/upstream_spam_filters.lua
@@ -28,21 +28,21 @@ reconf['PRECEDENCE_BULK'] = {
 reconf['MICROSOFT_SPAM'] = {
   -- https://technet.microsoft.com/en-us/library/dn205071(v=exchg.150).aspx
   re = 'X-Forefront-Antispam-Report=/SFV:SPM/H',
-  score = 4,
+  score = 4.0,
   description = "Microsoft says the message is spam",
   group = 'upstream_spam_filters'
 }
 
 reconf['AOL_SPAM'] = {
   re = 'X-AOL-Global-Disposition=/^S/H',
-  score = 5,
+  score = 5.0,
   description = "AOL says this message is spam",
   group = 'upstream_spam_filters'
 }
 
 reconf['KLMS_SPAM'] = {
   re = 'X-KLMS-AntiSpam-Status=/^spam/H',
-  score = 5,
+  score = 5.0,
   description = "Kaspersky Security for Mail Server says this message is spam",
   group = 'upstream_spam_filters'
 }
@@ -52,14 +52,14 @@ reconf['SPAM_FLAG'] = {
       'X-Spam-Flag=/^(?:yes|true)/Hi',
       'X-Spam=/^(?:yes|true)/Hi',
       'X-Spam-Status=/^(?:yes|true)/Hi'),
-  score = 5,
+  score = 5.0,
   description = "Message was already marked as spam",
   group = 'upstream_spam_filters'
 }
 
 reconf['UNITEDINTERNET_SPAM'] = {
   re = 'X-UI-Out-Filterresults=/^junk:/H',
-  score = 5,
+  score = 5.0,
   description = "United Internet says this message is spam",
   group = 'upstream_spam_filters'
 }