unify rules scores and weights

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index 359975dc1346e133e120e1bb6a7dcf937cce9d80..dca68acb6dafc756f70eaabe9dba6f9a6c88a8ed 100644 (file)
--- 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 1cc7bfc22982f820bc4a0f91848534f80e98dcf8..03aa5a3a9f3688a9796ad113bed61deda36f66d7 100644 (file)
--- 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 4c457428ad4f1a6a07401c78f37885710a90496d..8ba6ea0576a949752a89ae9cfd472c6250a18832 100644 (file)
--- 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'
 }