[Minor] Glob patterns actually allow ranges

1 files changed, 32 insertions, 5 deletions

diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index 849d11a4f..86369909a 100644
--- a/src/libutil/str_util.c
+++ b/src/libutil/str_util.c
@@ -3203,7 +3203,6 @@ rspamd_str_regexp_escape (const gchar *pattern, gsize slen,
 		switch (t) {
 		case '[':
 		case ']':
-		case '-':
 		case '\\':
 		case '{':
 		case '}':
@@ -3219,6 +3218,36 @@ rspamd_str_regexp_escape (const gchar *pattern, gsize slen,
 				*d++ = '\\';
 			}
 			break;
+		case '-':
+			if (flags & RSPAMD_REGEXP_ESCAPE_GLOB) {
+				/*
+				 * For glob patterns, we need to ensure that a previous character is alphanumeric
+				 * and there is `[` symbol somewhere before
+				 */
+				bool seen_brace = false;
+				const char *search = p;
+
+				while (search > pattern) {
+					if (!g_ascii_isalnum(*search) && *search != '-') {
+						break;
+					}
+					if (*search == '[' ) {
+						seen_brace = true;
+						break;
+					}
+
+					search --;
+				}
+
+				if (!seen_brace) {
+					/* Escape `-` symbol */
+					*d++ = '\\';
+				}
+			}
+			else if (!(flags & RSPAMD_REGEXP_ESCAPE_RE)) {
+				*d++ = '\\';
+			}
+			break;
 		case '*':
 		case '?':
 		case '+':
@@ -3226,10 +3255,8 @@ rspamd_str_regexp_escape (const gchar *pattern, gsize slen,
 				/* Treat * as .* and ? as .? */
 				*d++ = '.';
 			}
-			else {
-				if (!(flags & RSPAMD_REGEXP_ESCAPE_RE)) {
-					*d++ = '\\';
-				}
+			else if (!(flags & RSPAMD_REGEXP_ESCAPE_RE)) {
+				*d++ = '\\';
 			}
 			break;
 		default: