From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 19 Mar 2020 13:37:31 +0000 (+0000)
Subject: [Minor] Use a more strict pattern for tld lookup
X-Git-Tag: 2.5~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=037260cf1cbc50a7e8953704d39cff327002f163;p=thirdparty%2Frspamd.git

[Minor] Use a more strict pattern for tld lookup
---

diff --git a/src/libutil/multipattern.c b/src/libutil/multipattern.c
index f243c1d8ab..c348ac6b28 100644
--- a/src/libutil/multipattern.c
+++ b/src/libutil/multipattern.c
@@ -97,13 +97,13 @@ rspamd_multipattern_escape_tld_hyperscan (const gchar *pattern, gsize slen,
 		gsize *dst_len)
 {
 	gsize len;
-	const gchar *p, *prefix;
+	const gchar *p, *prefix, *suffix;
 	gchar *res;
 
 	/*
 	 * We understand the following cases
-	 * 1) blah -> .blah
-	 * 2) *.blah -> ..*\\.blah
+	 * 1) blah -> .blah\b
+	 * 2) *.blah -> ..*\\.blah\b
 	 * 3) ???
 	 */
 
@@ -127,9 +127,13 @@ rspamd_multipattern_escape_tld_hyperscan (const gchar *pattern, gsize slen,
 		len = slen + strlen (prefix);
 	}
 
+	suffix = "\\b";
+	len += strlen (suffix);
+
 	res = g_malloc (len + 1);
 	slen = rspamd_strlcpy (res, prefix, len + 1);
 	slen += rspamd_strlcpy (res + slen, p, len + 1 - slen);
+	slen += rspamd_strlcpy (res + slen, suffix, len + 1 - slen);
 
 	*dst_len = slen;