cleanup badger firstparties list obj and avoid false positives when l…

…ooking through it

src/js/background.js

@@ -100,7 +100,11 @@ function Badger() {
     for (let contentScriptObj of manifestJson.content_scripts) {
       // only include parts from content scripts that have firstparties entries
       if (contentScriptObj.js[0].includes("/firstparties/")) {
-        firstParties.push(contentScriptObj.matches);
+        let extractedUrls = [];
+        for (let match of contentScriptObj.matches) {
+          extractedUrls.push(window.extractHostFromURL(match));
+        }
+        firstParties.push(extractedUrls);
       }
     }
     // set list of firstparty url schemes onto badger object

src/js/utils.js

@@ -453,15 +453,11 @@ function isThirdPartyDomain(domain1, domain2) {
  * @return {Boolean} true if the domains are third party
  */
 function firstPartyProtectionsEnabled(domain, firstPartiesList) {
-  // trim www from tab_host if need be
-  if (domain.startsWith('www.')) {
-    domain = domain.slice(4);
-  }
-  // trim trailing wildcard
-
   for (let url_pattern of firstPartiesList) {
-    // if given domain is matched in our firstparties list, return true
-    if (url_pattern.includes(domain)) {
+    // account for wildcards in entries on firstPartiesList & avoid false positives
+    if (url_pattern.startsWith("*") && url_pattern.endsWith(domain)) {
+      return true;
+    } else if (url_pattern == domain) {
       return true;
     }
   }