this fixes #33

Author: gorhill

js/lists.js

@@ -189,9 +189,8 @@ function evaluate(type, hostname) {
         }
         // indirect: any type, specific hostname
         cellKey = '*/' + hostname;
-        if ( blacklist[cellKey] || (!graylist[cellKey] && blacklistReadonly[hostname]) ) {
-            return httpsb.DISALLOWED_INDIRECT;
-        }
+        // rhill 2013-10-26: Whitelist MUST be checked before blacklist,
+        // because read-only blacklists are, hum... read-only?
         if ( whitelist[cellKey] ) {
             // https://github.com/gorhill/httpswitchboard/issues/29
             // The cell is indirectly whitelisted because of hostname, type
@@ -201,6 +200,9 @@ function evaluate(type, hostname) {
             }
             return httpsb.ALLOWED_INDIRECT;
         }
+        if ( blacklist[cellKey] || (!graylist[cellKey] && blacklistReadonly[hostname]) ) {
+            return httpsb.DISALLOWED_INDIRECT;
+        }
 
         // indirect: parent hostname nodes
         parent = hostname;
@@ -219,9 +221,8 @@ function evaluate(type, hostname) {
             }
             // any type, specific parent
             cellKey = '*/' + parent;
-            if ( blacklist[cellKey] || (!graylist[cellKey] && blacklistReadonly[parent]) ) {
-                return httpsb.DISALLOWED_INDIRECT;
-            }
+            // rhill 2013-10-26: Whitelist MUST be checked before blacklist,
+            // because read-only blacklists are, hum... read-only?
             if ( whitelist[cellKey] ) {
                 // https://github.com/gorhill/httpswitchboard/issues/29
                 // The cell is indirectly whitelisted because of hostname, type
@@ -231,6 +232,9 @@ function evaluate(type, hostname) {
                 }
                 return httpsb.ALLOWED_INDIRECT;
             }
+            if ( blacklist[cellKey] || (!graylist[cellKey] && blacklistReadonly[parent]) ) {
+                return httpsb.DISALLOWED_INDIRECT;
+            }
         }
         // indirect: specific type, any hostname
         if ( blacklist[typeKey] ) {