Fix for #4 and #15

andryou · Jun 5, 2016 · 44357fa · 44357fa
1 parent 6c0d79e
commit 44357fa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/js/common.js b/js/common.js
@@ -92,7 +92,13 @@ function getDomain(url, type) {
 	return url;
 }
 function in_array(needle, haystack) {
-	if (haystack && new RegExp(haystack).test(needle)) return '1';
+	if (!haystack || !needle) return false;
+	for (var i in haystack) {
+		if (new RegExp('(?:www\\.|^)(?:'+haystack[i].replace(/\./g, '\\.').replace(/^\[/g, '$1\\[').replace(/\]$/g, '\\]').replace(/\?/g, '.').replace(/\*\*\\./g, '(?:.+\\.|^)').replace(/\*/g, '[^.]+')+')').test(needle)) {
+			return '1';
+			break;
+		}
+	}
 	return false;
 }
 // Js-BinarySearch by amgadfahmi

diff --git a/js/popup.js b/js/popup.js
@@ -50,7 +50,7 @@ function truncate(str, len) {
 	return str;
 }
 document.addEventListener('DOMContentLoaded', function () {
-	setTimeout(init, 25);
+	setTimeout(init, 0);
 	$("#pop_ay").click(function() { openTab('https://twitter.com/andryou'); });
 	$("#pop_docs").click(function() { openTab('https://github.com/andryou/scriptsafe/wiki'); });
 	$("#pop_project").click(function() { openTab('https://github.com/andryou/scriptsafe'); });

diff --git a/js/scriptsafe.js b/js/scriptsafe.js
@@ -383,8 +383,8 @@ function domainHandler(domain,action,listtype) {
 		} else if (listtype == 1) {
 			sessionStorage['whiteList'] = JSON.stringify(tempWhitelist);
 			sessionStorage['blackList'] = JSON.stringify(tempBlacklist);
-			sessionWhiteList = regexify(tempWhitelist);
-			sessionBlackList = regexify(tempBlacklist);
+			sessionWhiteList = tempWhitelist;
+			sessionBlackList = tempBlacklist;
 		}
 		return true;
 	}
@@ -828,21 +828,17 @@ function cacheLists() {
 		if (domain.substr(0,3) == '**.') tempWildDomain.push(domain);
 		tempDomain.push(domain);
 	});
-	whiteList = regexify(tempDomain);
-	trustList = regexify(tempWildDomain);
+	whiteList = tempDomain;
+	trustList = tempWildDomain;
 	tempList = JSON.parse(localStorage['blackList']);
 	tempDomain = [];
 	tempWildDomain = [];
 	tempList.map(function(domain) {
 		if (domain.substr(0,3) == '**.') tempWildDomain.push(domain);
 		tempDomain.push(domain);
 	});
-	blackList = regexify(tempDomain);
-	distrustList = regexify(tempWildDomain);
-}
-function regexify(arr) {
-	if (arr.length == 0) return '';
-	return '(?:www\\.|^)(?:'+arr.join('|').replace(/\./g, '\\.').replace(/(\||^)\[/g, '$1\\[').replace(/\](?:\\||$)/g, '\\]').replace(/\?/g, '.').replace(/\*\*\\./g, '(?:.+\\.|^)').replace(/\*/g, '[^.]+')+')';
+	blackList = tempDomain;
+	distrustList = tempWildDomain;
 }
 if (!optionExists("version") || localStorage["version"] != version) {
 	// One-time update existing whitelist/blacklist for new regex support introduced in v1.0.7.0