Rework fuzzy check module.

- Now all checks are organized to rules.
- Allow to specify read_only rules to avoid problems on learning.
- Use better normalizer for fuzzy module and it now returns values
  from 0 to 1.0 (like bayes does).
- Update configuration accordingly.
- Drop legacy configuration support.
- Detect tanh as well and provide some reasonable (linear) fallback.

2 files changed, 24 insertions, 22 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 727bea6da..9dfdb1c00 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -408,22 +408,22 @@ metric {
         name = "BAYES_HAM";
     }
     symbol {
-        weight = 1.0;
+        weight = 10.0;
         description = "Generic fuzzy hash match";
         name = "R_FUZZY";
     }
     symbol {
-        weight = 1.0;
+        weight = 10.0;
         description = "Denied fuzzy hash";
         name = "FUZZY_DENIED";
     }
     symbol {
-        weight = 1.0;
+        weight = 5.0;
         description = "Probable fuzzy hash";
         name = "FUZZY_PROB";
     }
     symbol {
-        weight = 1.0;
+        weight = -2.1;
         description = "Whitelisted fuzzy hash";
         name = "FUZZY_WHITE";
     }
diff --git a/conf/modules.conf b/conf/modules.conf
index 2b7d5b8b8..b951d863f 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -1,24 +1,26 @@
 # Rspamd modules configuration
 fuzzy_check {
-    servers = "highsecure.ru:11335";
-    symbol = "R_FUZZY";
     min_bytes = 300;
-    max_score = 10;
-    mime_types = "application/pdf";
-    fuzzy_map = {
-        FUZZY_DENIED {
-            weight = 10.0;
-            flag = 1
-        }
-        FUZZY_PROB {
-            weight = 5.0;
-            flag = 2
-        }
-        FUZZY_WHITE {
-            weight = -2.1;
-            flag = 3
-        }
-    }
+	rule {
+		servers = "highsecure.ru:11335";
+		symbol = "R_FUZZY";
+		mime_types = "application/pdf";
+    	max_score = 10;
+		fuzzy_map = {
+			FUZZY_DENIED {
+				max_score = 10.0;
+				flag = 1
+			}
+			FUZZY_PROB {
+				max_score = 5.0;
+				flag = 2
+			}
+			FUZZY_WHITE {
+				max_score = 5.0;
+				flag = 3
+			}
+		}
+	}
 }
 forged_recipients {
     symbol_sender = "FORGED_SENDER";