Allow multiple '*' globs in the From pattern (#471)

--------- Co-authored-by: lieser <lieser@users.noreply.github.com>
lieser · Jan 1, 2025 · 45a864e · 45a864e
1 parent 9294dc5
commit 45a864e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/manifest.json b/manifest.json
@@ -10,7 +10,7 @@
 		"gecko": {
 			"id": "dkim_verifier@pl",
 			"strict_min_version": "91.0",
-			"strict_max_version": "121.*"
+			"strict_max_version": "128.*"
 		}
 	},
 	"permissions": [

diff --git a/modules/dkim/signRules.mjs.js b/modules/dkim/signRules.mjs.js
@@ -225,7 +225,7 @@ function glob(str, pattern) {
 	// escape all special regex charters besides *
 	let regexpPattern = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
 	// replace * with correct regex
-	regexpPattern = regexpPattern.replace("*", ".*");
+	regexpPattern = regexpPattern.replace(/\*/g, ".*");
 
 	const regexp = new RegExp(`^${regexpPattern}$`, "i");
 	return regexp.test(str);

diff --git a/test/unittest/signRulesSpec.mjs.js b/test/unittest/signRulesSpec.mjs.js
@@ -126,6 +126,14 @@ describe("Sign rules [unittest]", function () {
 
 			res = await SignRules.check(dkimNone, "bar@a.foo.comX");
 			expect(res.result).is.equal("none");
+
+			await SignRules.addRule("bar.com", null, "*@mail.*.bar.com", "bar.com", SignRules.TYPE.ALL);
+			res = await SignRules.check(dkimNone, "@mail.a.bar.com");
+			expect(res.result).is.equal("PERMFAIL");
+			res = await SignRules.check(dkimNone, "test@mail.foo.bar.com");
+			expect(res.result).is.equal("PERMFAIL");
+			res = await SignRules.check(dkimNone, "test@foo.bar.com");
+			expect(res.result).is.equal("none");
 		});
 		it("Add user exception", async function () {
 			let res = await SignRules.check(dkimNone, "bar@paypal.com");