Merge branch 'use-exact-match-for-regular-expresson' into 'master'

Use exact match for regular expresson

See merge request clear-code/browserselector!88

Author: ashie

webextensions/chrome/background.js

@@ -66,7 +66,7 @@ function wildmat(text, pat) {
 function regexMatch(text, pattern) {
   let regExp;
   try {
-    regExp = new RegExp(pattern);
+    regExp = new RegExp(`^${pattern}$`);
   }
   catch(_error) {
     console.log('failed to compile a regex pattern: ', pattern);

webextensions/edge/background.js

@@ -66,7 +66,7 @@ function wildmat(text, pat) {
 function regexMatch(url, pattern) {
   let regExp;
   try {
-    regExp = new RegExp(pattern);
+    regExp = new RegExp(`^${pattern}$`);
   }
   catch(_error) {
     console.log('failed to compile a regex pattern: ', pattern);

webextensions/test/test-is-redirect-url.js

@@ -38,10 +38,10 @@ describe('isRedirectURL', () => {
       });
       it(`Match redirect pattern with regex: partial match`, () => {
         const url = 'http://www.example.com/';
-        const conf = config([['http://www\.example\.com/', 'firefox']], [], { UseRegex: 1 })
+        const conf = config([['http://www\.example\..*', 'firefox']], [], { UseRegex: 1 })
         assert.equal(redirector.isRedirectURL(conf, url), true);
       });
-      it(`Match redirect pattern with regex: exact match`, () => {
+      it(`Match redirect pattern with regex: extra caret and dollar`, () => {
         const url = 'http://www.example.com/';
         const conf = config([['^http://www\.example\.com/$', 'firefox']], [], { UseRegex: 1 })
         assert.equal(redirector.isRedirectURL(conf, url), true);
@@ -114,6 +114,11 @@ describe('isRedirectURL', () => {
           const conf = config([['http://www\.example\.com/', 'firefox']], [], { UseRegex: 1 })
           assert.equal(redirector.isRedirectURL(conf, url), false);
         });
+        it(`Unmatch redirect pattern with regex: not exact match`, () => {
+          const url = 'http://www.example.com/';
+          const conf = config([['\.example\.', 'firefox']], [], { UseRegex: 1 })
+          assert.equal(redirector.isRedirectURL(conf, url), false);
+        });
       });
       describe('HostName patterns', () => {
         it(`Match redirect pattern without wildcard`, () => {
@@ -126,16 +131,21 @@ describe('isRedirectURL', () => {
           const conf = config([], [['*.example.com', 'firefox']])
           assert.equal(redirector.isRedirectURL(conf, url), true);
         });
-        it(`Match redirect pattern with regex: partial match`, () => {
+        it(`Match redirect pattern with regex`, () => {
           const url = 'http://www.example.com/';
           const conf = config([], [['www\.example\.com', 'firefox']], { UseRegex: 1 })
           assert.equal(redirector.isRedirectURL(conf, url), true);
         });
-        it(`Match redirect pattern with regex: exact match`, () => {
+        it(`Match redirect pattern with regex: extra caret and dollar`, () => {
           const url = 'http://www.example.com/';
           const conf = config([], [['^www\.example\.com$', 'firefox']], { UseRegex: 1 })
           assert.equal(redirector.isRedirectURL(conf, url), true);
         });
+        it(`Match redirect pattern with regex: partial match`, () => {
+          const url = 'http://www.example.com/';
+          const conf = config([], [['.*\.example\..*', 'firefox']], { UseRegex: 1 })
+          assert.equal(redirector.isRedirectURL(conf, url), true);
+        });
         it(`Match first pattern: redirection (matches firefox)`, () => {
           const url = 'http://www.example.com/';
           const conf = config(
@@ -215,6 +225,11 @@ describe('isRedirectURL', () => {
           const conf = config([], [['http://www.example.com', 'firefox']], { UseRegex: 1 })
           assert.equal(redirector.isRedirectURL(conf, url), false);
         });
+        it(`Unmatch redirect pattern with regex: not exact match`, () => {
+          const url = 'http://www.example.com/';
+          const conf = config([], [['\.example\.', 'firefox']], { UseRegex: 1 })
+          assert.equal(redirector.isRedirectURL(conf, url), false);
+        });
       });
     });
   });