From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 27 Aug 2021 13:47:31 +0000 (+0100)
Subject: [Minor] Fix expressions priorities
X-Git-Tag: 3.1~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4685cc5b83bc5240aa15e77b6314bdda8853cb8a;p=thirdparty%2Frspamd.git

[Minor] Fix expressions priorities
---

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 06b590f518..dfeeaf9ac3 100644
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -1060,25 +1060,31 @@ rspamd_mime_expr_priority (rspamd_expression_atom_t *atom)
 	switch (mime_atom->type) {
 	case MIME_ATOM_INTERNAL_FUNCTION:
 		/* Prioritize internal functions slightly */
-		ret = 50;
+		ret = RSPAMD_EXPRESSION_MAX_PRIORITY - RSPAMD_EXPRESSION_MAX_PRIORITY / 8;
 		break;
 	case MIME_ATOM_LUA_FUNCTION:
 	case MIME_ATOM_LOCAL_LUA_FUNCTION:
-		ret = 50;
+		ret = RSPAMD_EXPRESSION_MAX_PRIORITY - RSPAMD_EXPRESSION_MAX_PRIORITY / 4;
 		break;
 	case MIME_ATOM_REGEXP:
 		switch (mime_atom->d.re->type) {
 		case RSPAMD_RE_HEADER:
 		case RSPAMD_RE_RAWHEADER:
-			ret = 100;
+			ret = RSPAMD_EXPRESSION_MAX_PRIORITY - RSPAMD_EXPRESSION_MAX_PRIORITY / 16;
 			break;
 		case RSPAMD_RE_URL:
 		case RSPAMD_RE_EMAIL:
-			ret = 90;
+			ret = RSPAMD_EXPRESSION_MAX_PRIORITY - RSPAMD_EXPRESSION_MAX_PRIORITY / 8;
+			break;
+		case RSPAMD_RE_SELECTOR:
+			ret = RSPAMD_EXPRESSION_MAX_PRIORITY - RSPAMD_EXPRESSION_MAX_PRIORITY / 8;
 			break;
 		case RSPAMD_RE_MIME:
 		case RSPAMD_RE_RAWMIME:
-			ret = 10;
+		case RSPAMD_RE_WORDS:
+		case RSPAMD_RE_RAWWORDS:
+		case RSPAMD_RE_STEMWORDS:
+			ret = RSPAMD_EXPRESSION_MAX_PRIORITY - RSPAMD_EXPRESSION_MAX_PRIORITY / 2;
 			break;
 		default:
 			/* For message regexp */