#18

gorhill · Oct 20, 2013 · ec44f7d · ec44f7d
1 parent 89541f3
commit ec44f7d
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 19 deletions.
diff --git a/js/lists.js b/js/lists.js
@@ -22,7 +22,7 @@
 /******************************************************************************/
 
 // Whitelist something
-function allow(type, domain) {
+function whitelistTemporarily(type, domain) {
     var httpsb = HTTPSB;
     var key = type + '/' + domain;
     var whitelisted = !httpsb.whitelist[key];
@@ -36,7 +36,7 @@ function allow(type, domain) {
     }
 }
 
-function allowPermanently(type, domain) {
+function whitelistPermanently(type, domain) {
     var httpsb = HTTPSB;
     var key = type + '/' + domain;
     var whitelisted = !httpsb.whitelistUser[key];
@@ -56,7 +56,7 @@ function allowPermanently(type, domain) {
 /******************************************************************************/
 
 // Blacklist something
-function disallow(type, domain) {
+function blacklistTemporarily(type, domain) {
     var httpsb = HTTPSB;
     var key = type + '/' + domain;
     var unwhitelisted = httpsb.whitelist[key];
@@ -70,7 +70,7 @@ function disallow(type, domain) {
     }
 }
 
-function disallowPermanently(type, domain) {
+function blacklistPermanently(type, domain) {
     var httpsb = HTTPSB;
     var key = type + '/' + domain;
     var unwhitelisted = httpsb.whitelistUser[key];
@@ -133,13 +133,30 @@ function graylistPermanently(type, domain) {
 
 // Reset lists to their default state.
 
-function resetLists() {
+function restoreTemporaryLists() {
     var httpsb = HTTPSB;
-    httpsb.whitelist = {};
     httpsb.blacklist = {};
-    populateListFromList(httpsb.whitelist, httpsb.whitelistUser);
-    populateListFromList(httpsb.blacklist, httpsb.blacklistUser);
     populateListFromString(httpsb.blacklist, httpsb.blacklistRemote);
+    populateListFromList(httpsb.blacklist, httpsb.blacklistUser);
+    // rhill 2013-10-19: https://github.com/gorhill/httpswitchboard/issues/18
+    // Be sure a domain doesn't end up in both the effective black and whitelist
+    restoreTemporaryWhitelist();
+}
+
+
+// rhill 2013-10-19: https://github.com/gorhill/httpswitchboard/issues/18
+// I create a separate function so it can also be called at launch time.
+function restoreTemporaryWhitelist() {
+    var httpsb = HTTPSB;
+    httpsb.whitelist = {};
+    var filters = Object.keys(httpsb.whitelistUser);
+    var i = filters.length;
+    var filter;
+    while ( i-- ) {
+        filter = filters[i];
+        delete httpsb.blacklist[filter];
+        httpsb.whitelist[filter] = true;
+    }
 }
 
 /******************************************************************************/

diff --git a/js/popup.js b/js/popup.js
@@ -310,9 +310,9 @@ var handleFilter = function(button) {
     var domain = button.prop('filterDomain');
     var nextAction = getNextAction(domain, type);
     if ( nextAction === 'blacklist' ) {
-        background.disallow(type, domain);
+        background.blacklistTemporarily(type, domain);
     } else if ( nextAction === 'whitelist' ) {
-        background.allow(type, domain);
+        background.whitelistTemporarily(type, domain);
     } else {
         background.graylist(type, domain);
     }
@@ -334,9 +334,9 @@ var handlePersistence = function(button) {
     if ( !entry ) { return; }
     if ( entry.temporaryColor.charAt(1) === 'd' && entry.temporaryColor !== entry.permanentColor ) {
         if ( entry.temporaryColor === 'rdt' ) {
-            background.disallowPermanently(type, domain);
+            background.blacklistPermanently(type, domain);
         } else if ( entry.temporaryColor === 'gdt' ) {
-            background.allowPermanently(type, domain);
+            background.whitelistPermanently(type, domain);
         }
         entry.permanentColor = background.getPermanentColor(type, domain);
         var newClass = getCellClass(domain, type);
@@ -589,7 +589,7 @@ document.addEventListener('DOMContentLoaded', function () {
     });
 
     $('#button-revert').click(function() {
-        background.resetLists();
+        background.restoreTemporaryLists();
         updateMatrixStats(matrixStats);
         updateFilterButtons();
     });

diff --git a/js/storage.js b/js/storage.js
@@ -141,22 +141,22 @@ function loadUserLists() {
             store.graylist = '';
         }
 
-        populateListFromString(httpsb.whitelistUser, store.whitelist);
-        populateListFromList(httpsb.whitelist, httpsb.whitelistUser);
-
         populateListFromString(httpsb.blacklistUser, store.blacklist);
         populateListFromList(httpsb.blacklist, httpsb.blacklistUser);
 
         populateListFromString(httpsb.graylistUser, store.graylist);
         populateListFromList(httpsb.graylist, httpsb.graylistUser);
 
+        populateListFromString(httpsb.whitelistUser, store.whitelist);
+        populateListFromList(httpsb.whitelist, httpsb.whitelistUser);
+
         // rhill 20130923: ok, there is no point in blacklisting
         // 'main_frame/*', since there is only one such page per tab. It is
         // reasonable to whitelist by default 'main_frame/*', and top page of
         // blacklisted domain name will not be loaded anyways (because domain
         // name has precedence over type). Now this way we save precious real
         // estate pixels in popup menu.
-        allow('main_frame', '*');
+        whitelistTemporarily('main_frame', '*');
 
         chrome.runtime.sendMessage({
             'what': 'startWebRequestHandler',
@@ -291,7 +291,7 @@ function queryRemoteBlacklist(location) {
 /******************************************************************************/
 
 function parseRemoteBlacklist(list) {
-    console.log('HTTP Switchboard > parseRemoteBlacklist > "%s"', list.url);
+    // console.log('HTTP Switchboard > parseRemoteBlacklist > "%s"', list.url);
     list.raw = normalizeRemoteContent('*/', list.raw, '');
     // Save locally in order to load efficiently in the future.
     chrome.runtime.sendMessage({
@@ -333,9 +333,18 @@ function localRemoveRemoteBlacklist(list) {
 /******************************************************************************/
 
 function mergeRemoteBlacklist(list) {
-    console.log('HTTP Switchboard > mergeRemoteBlacklist from "%s": "%s..."', list.url, list.raw.slice(0, 40));
+    // console.log('HTTP Switchboard > mergeRemoteBlacklist from "%s": "%s..."', list.url, list.raw.slice(0, 40));
     var httpsb = HTTPSB;
+
     populateListFromString(httpsb.blacklist, list.raw);
+
+    // rhill 2013-10-19: https://github.com/gorhill/httpswitchboard/issues/18
+    // Ensure that whatever is in the whitelist is not also found in the
+    // blacklist.
+    restoreTemporaryWhitelist();
+
+    // Make our internal collection of preset blacklist domains compatible with
+    // quickIndexOf().
     httpsb.blacklistRemote += '\n' + list.raw;
     httpsb.blacklistRemote = '\n' + httpsb.blacklistRemote
         .trim()