Change same domain logic to respect second+ level domains

Part of #92
stoically · Mar 16, 2018 · 1cbf000 · 1cbf000
1 parent 6eead5b
commit 1cbf000
Show file tree

Hide file tree

Showing 4 changed files with 834 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
     "glob-to-regexp": "^0.4.0",
     "jquery": "^3.3.1",
     "p-queue": "^2.3.0",
+    "psl": "^1.1.25",
     "semantic-ui": "^2.3.0",
     "semver-compare": "^1.0.0"
   },

diff --git a/src/.eslintrc b/src/.eslintrc
@@ -7,6 +7,7 @@
         "tmp": false,
         "debug": false,
         "lib": false,
+        "psl": false,
         "log": false,
         "delay": false,
         "globToRegexp": false,

diff --git a/src/background.js b/src/background.js
@@ -376,15 +376,7 @@ class TemporaryContainers {
 
 
   sameDomain(origin, target) {
-    const splittedTarget = target.split('.');
-    const checkHostname = '.' + (splittedTarget.splice(-2).join('.'));
-    const dottedOrigin = '.' + origin;
-    if (target.length > 1 &&
-        (dottedOrigin.endsWith(checkHostname) ||
-         checkHostname.endsWith(dottedOrigin))) {
-      return true;
-    }
-    return false;
+    return psl.parse(origin).domain === psl.parse(target).domain;
   }
 
 

diff --git a/src/background/lib.js b/src/background/lib.js