Merge pull request #2850 from heraklit256/rule-descr-cleanup

[Minor] unify rule scores and weights and improve descriptions

4 files changed, 23 insertions, 23 deletions

diff --git a/rules/forwarding.lua b/rules/forwarding.lua
index dfd197b50..f44cfb779 100644
--- a/rules/forwarding.lua
+++ b/rules/forwarding.lua
@@ -103,7 +103,7 @@ rspamd_config.FWD_SRS = {
     return false
   end,
   score = 0.0,
-  description = "Message was forwarded using SRS",
+  description = "Message was forwarded using Sender Rewriting Scheme (SRS)",
   group = "forwarding"
 }
 
diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index 359975dc1..279a51899 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -60,7 +60,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = 'No received',
+  description = 'Message has no Received headers',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -68,7 +68,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = 'One received',
+  description = 'Message has one Received header',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -76,7 +76,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = 'Two received',
+  description = 'Message has two Received headers',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -84,7 +84,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = '3-5 received',
+  description = 'Message has 3-5 Received headers',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -92,7 +92,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = '5-7 received',
+  description = 'Message has 5-7 Received headers',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -100,7 +100,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = '7-11 received',
+  description = 'Message has 7-11 Received headers',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -108,7 +108,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = rcvd_cb_id,
   type = 'virtual',
-  description = '12+ received',
+  description = 'Message has 12 or more Received headers',
   group = 'headers',
 }
 
@@ -144,7 +144,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = prio_cb_id,
   type = 'virtual',
-  description = 'Priority 0',
+  description = 'Message has X-Priority header set to 0',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -152,7 +152,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = prio_cb_id,
   type = 'virtual',
-  description = 'Priority 1',
+  description = 'Message has X-Priority header set to 1',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -160,7 +160,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = prio_cb_id,
   type = 'virtual',
-  description = 'Priority 2',
+  description = 'Message has X-Priority header set to 2',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -168,7 +168,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = prio_cb_id,
   type = 'virtual',
-  description = 'Priority 3-4',
+  description = 'Message has X-Priority header set to 3 or 4',
   group = 'headers',
 }
 rspamd_config:register_symbol{
@@ -176,7 +176,7 @@ rspamd_config:register_symbol{
   score = 0.0,
   parent = prio_cb_id,
   type = 'virtual',
-  description = 'Priority 5+',
+  description = 'Message has X-Priority header set to 5 or higher',
   group = 'headers',
 }
 
@@ -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 6c0738976..a01b8ecd1 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'
 }