changes for v0.8.0.0

gorhill · Feb 10, 2014 · 8db73a1 · 8db73a1
1 parent 6d1072f
commit 8db73a1
Show file tree

Hide file tree

Showing 16 changed files with 689 additions and 380 deletions.
diff --git a/assets/httpsb/preset-recipes-1st.yaml b/assets/httpsb/preset-recipes-1st.yaml
diff --git a/assets/httpsb/preset-recipes-3rd.yaml b/assets/httpsb/preset-recipes-3rd.yaml
@@ -46,6 +46,17 @@ Brightcove:
         plugin brightcove.com
         script brightcove.com
 
+Daily Motion:
+    facode: f008
+    keys: www.dailymotion.com
+    whitelist: |
+        plugin www.dailymotion.com
+        script www.dailymotion.com
+        frame www.dailymotion.com
+        plugin dmcdn.net
+        script dmcdn.net
+        script ajax.googleapis.com
+
 Disqus:
     facode: f086
     keys: disqus.com
@@ -60,7 +71,9 @@ Disqus:
 
 Facebook:
     facode: f09a
-    keys: facebook.com
+    keys: |
+        facebook.com
+        connect.facebook.net
     whitelist: |
         script facebook.com
         xhr facebook.com
@@ -95,6 +108,15 @@ Livefyre:
         script fyre.co
         xhr fyre.co
 
+Ooyala player:
+    facode: f008
+    keys: player.ooyala.com
+    whitelist: |
+        plugin player.ooyala.com
+        script player.ooyala.com
+        xhr player.ooyala.com
+        plugin opf.ooyala.com
+
 Pinterest:
     facode: f0d2
     keys: pinterest.com

diff --git a/css/rulemanager.css b/css/rulemanager.css
@@ -9,15 +9,15 @@ h1:first-child {
     }
 #navi-bar {
     border-bottom: 1px solid #ccc;
-    padding: 1em;
+    padding: 0.5em;
     position: fixed;
     background-color: white;
     width: 100%;
-    height: 8em;
+    height: 7em;
     z-index: 100;
     }
 #navi-bar + div {
-    padding: 10em 1em 1em 1em;
+    padding: 8em 0.5em 1em 0.5em;
     }
 h2 {
     margin: 0.5em 0;
@@ -48,15 +48,15 @@ button {
     margin: 0.5em 1em 0 0;
     border: 1px solid rgba(0,0,0,0.2);
     border-radius: 5px;
-    padding: 0.5em 1em;
+    padding: 0.25em 0.75em;
     font: inherit;
     font-size: 110%;
     background-color: #eee;
     cursor: pointer;
     }
 button .fa {
     margin-right: 0.5em;
-    font-size: larger;
+    font-size: large;
     }
 
 #recipeDecode, #recipeImport, #recipeEncode, #recipeExport {

diff --git a/js/async.js b/js/async.js
@@ -96,14 +96,15 @@ setInterval(asyncJobQueueHandler, asyncJobQueue.resolution);
 // A time out is used to coalesce adjacents requests to update badge.
 
 function updateBadgeCallback(pageUrl) {
-    if ( pageUrl === HTTPSB.behindTheSceneURL ) {
+    var httpsb = HTTPSB;
+    if ( pageUrl === httpsb.behindTheSceneURL ) {
         return;
     }
-    var tabId = tabIdFromPageUrl(pageUrl);
+    var tabId = httpsb.tabIdFromPageUrl(pageUrl);
     if ( !tabId ) {
         return;
     }
-    var pageStats = pageStatsFromTabId(tabId);
+    var pageStats = httpsb.pageStatsFromTabId(tabId);
     if ( pageStats ) {
         pageStats.updateBadge(tabId);
     } else {
@@ -228,7 +229,7 @@ function onMessageHandler(request, sender, callback) {
             break;
 
         case 'forceReloadTab':
-            forceReload(request.pageURL);
+            HTTPSB.forceReload(request.pageURL);
             break;
 
         case 'checkScriptBlacklisted':

diff --git a/js/contentscripthandlers.js b/js/contentscripthandlers.js
@@ -30,7 +30,7 @@ function contentScriptSummaryHandler(details, sender) {
     }
     var ut = uriTools;
     var httpsb = HTTPSB;
-    var pageURL = pageUrlFromTabId(sender.tab.id);
+    var pageURL = httpsb.pageUrlFromTabId(sender.tab.id);
     var frameURL = ut.normalizeURI(details.locationURL);
     var pageHostname = ut.hostname();
     var urls, url, hostname, block;
@@ -58,7 +58,7 @@ function contentScriptSummaryHandler(details, sender) {
             hostname = pageHostname;
         }
         block = httpsb.blacklisted(pageURL, 'script', hostname);
-        recordFromPageUrl(pageURL, 'script', url, block);
+        httpsb.recordFromPageUrl(pageURL, 'script', url, block);
     }
 
     // plugins
@@ -74,7 +74,7 @@ function contentScriptSummaryHandler(details, sender) {
             hostname = pageHostname;
         }
         block = httpsb.blacklisted(pageURL, 'object', hostname);
-        recordFromPageUrl(pageURL, 'object', url, block);
+        httpsb.recordFromPageUrl(pageURL, 'object', url, block);
     }
 }
 
@@ -83,7 +83,12 @@ function contentScriptSummaryHandler(details, sender) {
 function contentScriptLocalStorageHandler(pageURL) {
     var httpsb = HTTPSB;
     var response = httpsb.blacklisted(pageURL, 'cookie', uriTools.hostnameFromURI(pageURL));
-    recordFromPageUrl(pageURL, 'cookie', uriTools.rootURLFromURI(pageURL) + '/{localStorage}', response);
+    httpsb.recordFromPageUrl(
+        pageURL,
+        'cookie',
+        uriTools.rootURLFromURI(pageURL) + '/{localStorage}',
+        response
+    );
     response = response && httpsb.userSettings.deleteLocalStorage;
     if ( response ) {
         httpsb.localStorageRemovedCounter++;

diff --git a/js/contextmenu.js b/js/contextmenu.js
@@ -84,7 +84,7 @@ function contextMenuClickHandler(info, tab) {
     switch ( info.menuItemId ) {
         case 'gdt-group0':
             HTTPSB.whitelistTemporarily(pageURL, '*', pageDomain);
-            smartReloadTab(tab.id);
+            HTTPSB.smartReloadTab(tab.id);
             break;
 
         case 'revertScopeRules':

diff --git a/js/cookies.js b/js/cookies.js
@@ -136,7 +136,7 @@ var cookieHunter = {
         if ( !pageStats ) {
             return;
         }
-        var pageURL = pageUrlFromPageStats(pageStats);
+        var pageURL = HTTPSB.pageUrlFromPageStats(pageStats);
         this.queuePageRecord[pageURL] = pageStats;
         asyncJobQueue.add(
             'cookieHunterPageRecord',
@@ -182,7 +182,7 @@ var cookieHunter = {
         if ( !pageStats ) {
             return;
         }
-        var pageURL = pageUrlFromPageStats(pageStats);
+        var pageURL = HTTPSB.pageUrlFromPageStats(pageStats);
         this.queuePageRemove[pageURL] = pageStats;
         asyncJobQueue.add(
             'cookieHunterPageRemove',

diff --git a/js/httpsb.js b/js/httpsb.js
@@ -46,8 +46,11 @@ HTTPSB.domainScopeKeyFromURL = function(url) {
     if ( scheme.indexOf('http') !== 0 ) {
         return '';
     }
-    var hostname = ut.hostname();
-    var domain = ut.domainFromHostname(hostname);
+    return this.domainScopeKeyFromHostname(ut.hostname());
+};
+
+HTTPSB.domainScopeKeyFromHostname = function(hostname) {
+    var domain = uriTools.domainFromHostname(hostname);
     if ( domain === '' ) {
         domain = hostname;
     }
@@ -58,6 +61,10 @@ HTTPSB.siteScopeKeyFromURL = function(url) {
     return uriTools.hostnameFromURI(url);
 };
 
+HTTPSB.siteScopeKeyFromHostname = function(hostname) {
+    return hostname;
+};
+
 /******************************************************************************/
 
 HTTPSB.isGlobalScopeKey = function(scopeKey) {
@@ -98,6 +105,12 @@ HTTPSB.permanentScopeFromScopeKey = function(scopeKey) {
 
 /******************************************************************************/
 
+HTTPSB.temporaryScopeExists = function(scopeKey) {
+    return !!this.temporaryScopeFromScopeKey(scopeKey);
+};
+
+/******************************************************************************/
+
 // Of course this doesn't make sense as there is always a global scope, but
 // what makes sense is that we need to remove site and domain scopes for
 // global scope to take effect.
@@ -136,7 +149,7 @@ HTTPSB.createTemporaryDomainScope = function(url) {
         scope = new PermissionScope();
         scope.whitelist('main_frame', '*');
         this.temporaryScopes.scopes[scopeKey] = scope;
-        this.copyRulesTemporarily(scopeKey, this.globalScopeKey(), url);
+        this.copyTemporaryRules(scopeKey, this.globalScopeKey(), url);
     } else if ( scope.off ) {
         scope.off = false;
     }
@@ -179,8 +192,8 @@ HTTPSB.createTemporarySiteScope = function(url) {
         scope = new PermissionScope();
         scope.whitelist('main_frame', '*');
         this.temporaryScopes.scopes[scopeKey] = scope;
-        this.copyRulesTemporarily(scopeKey, this.globalScopeKey(), url);
-        this.copyRulesTemporarily(scopeKey, this.domainScopeKeyFromURL(url), url);
+        this.copyTemporaryRules(scopeKey, this.globalScopeKey(), url);
+        this.copyTemporaryRules(scopeKey, this.domainScopeKeyFromURL(url), url);
     } else {
         scope.off = false;
     }
@@ -247,6 +260,36 @@ HTTPSB.removePermanentScopeFromScopeKey = function(scopeKey, persist) {
 
 /******************************************************************************/
 
+HTTPSB.revealTemporaryDomainScope = function(domainScopeKey) {
+    if ( !this.isDomainScopeKey(domainScopeKey) ) {
+        return;
+    }
+    // Remove '*' prefix
+    var keySuffix = domainScopeKey.slice(1);
+    var keySuffixLen = keySuffix.length;
+    var scopes = this.temporaryScopes.scopes;
+    var pos;
+    for ( var scopeKey in scopes ) {
+        if ( !scopes.hasOwnProperty(scopeKey) ) {
+            continue;
+        }
+        if ( scopeKey === domainScopeKey ) {
+            continue;
+        }
+        pos = scopeKey.lastIndexOf(keySuffix);
+        if ( pos < 0 ) {
+            continue;
+        }
+        if ( pos !== scopeKey.length - keySuffixLen ) {
+            continue;
+        }
+        // Turn off scope
+        scopes[scopeKey].off = true;
+    }
+};
+
+/******************************************************************************/
+
 HTTPSB.temporaryScopeKeyFromPageURL = function(url) {
     return this.temporaryScopes.scopeKeyFromPageURL(url);
 };
@@ -342,14 +385,20 @@ HTTPSB.autoCreateTemporarySiteScope = function(pageURL) {
 // Copy rules from another scope. If a pageURL is provided,
 // it will be used to filter the rules according to the hostname.
 
-HTTPSB.copyRulesTemporarily = function(toScopeKey, fromScopeKey, pageURL) {
-    var toScope = this.temporaryScopes.scopes[toScopeKey];
-    var fromScope = this.temporaryScopes.scopes[fromScopeKey];
+HTTPSB.copyTemporaryRules = function(toScopeKey, fromScopeKey, pageURL) {
+    this.copyTemporaryWhiteRules(toScopeKey, fromScopeKey, pageURL);
+    this.copyTemporaryGrayRules(toScopeKey, fromScopeKey);
+    this.copyTemporaryBlackRules(toScopeKey, fromScopeKey);
+};
+
+HTTPSB.copyTemporaryWhiteRules = function(toScopeKey, fromScopeKey, pageURL) {
+    var toScope = this.temporaryScopeFromScopeKey(toScopeKey);
+    var fromScope = this.temporaryScopeFromScopeKey(fromScopeKey);
     if ( !toScope || !fromScope ) {
         return;
     }
     var ut = uriTools;
-    var pageStats = pageStatsFromPageUrl(pageURL);
+    var pageStats = this.pageStatsFromPageUrl(pageURL);
     var hostnames = pageStats ? pageStats.domains : {};
     var domains = {};
     for ( var hostname in hostnames ) {
@@ -371,10 +420,26 @@ HTTPSB.copyRulesTemporarily = function(toScopeKey, fromScopeKey, pageURL) {
         }
         toScope.white.addOne(ruleKey);
     }
-    toScope.black.fromList(fromScope.black);
+};
+
+HTTPSB.copyTemporaryGrayRules = function(toScopeKey, fromScopeKey) {
+    var toScope = this.temporaryScopeFromScopeKey(toScopeKey);
+    var fromScope = this.temporaryScopeFromScopeKey(fromScopeKey);
+    if ( !toScope || !fromScope ) {
+        return;
+    }
     toScope.gray.fromList(fromScope.gray);
 };
 
+HTTPSB.copyTemporaryBlackRules = function(toScopeKey, fromScopeKey) {
+    var toScope = this.temporaryScopeFromScopeKey(toScopeKey);
+    var fromScope = this.temporaryScopeFromScopeKey(fromScopeKey);
+    if ( !toScope || !fromScope ) {
+        return;
+    }
+    toScope.black.fromList(fromScope.black);
+};
+
 /******************************************************************************/
 
 // Whitelist something
@@ -556,9 +621,6 @@ HTTPSB.savePermissions = function() {
         if ( chrome.runtime.lastError ) {
             console.error('HTTP Switchboard > saved permissions: %s', chrome.runtime.lastError.message());
         }
-        chrome.storage.local.getBytesInUse('scopes', function(bytesInUse) {
-            // console.log('HTTP Switchboard > saved permissions: %d bytes used', bytesInUse);
-        });
         // Remove pre-v0.5.0 obsolete entries
         // TODO: Can be removed once everybody is using v0.5.0 or above
         chrome.storage.local.remove(['whitelist','blacklist','graylist']);
@@ -593,3 +655,9 @@ HTTPSB.turnOn = function() {
 
     this.off = false;
 };
+
+/******************************************************************************/
+
+HTTPSB.isOpera = function() {
+    return navigator.userAgent.indexOf(' OPR/') > 0;
+};
diff --git a/js/info.js b/js/info.js
@@ -35,7 +35,7 @@ function gethttpsb() {
 }
 
 function pageStatsFromPageUrl(pageUrl) {
-    return chrome.extension.getBackgroundPage().HTTPSB.pageStats[pageUrl];
+    return gethttpsb().pageStatsFromPageUrl(pageUrl);
 }
 
 /******************************************************************************/

diff --git a/js/popup.js b/js/popup.js
@@ -43,7 +43,7 @@ function getHTTPSB() {
 }
 
 function getPageStats() {
-    return getBackgroundPage().pageStatsFromTabId(HTTPSBPopup.tabId);
+    return getHTTPSB().pageStatsFromTabId(HTTPSBPopup.tabId);
 }
 
 /******************************************************************************/
@@ -1274,13 +1274,10 @@ function populatePresets() {
 
 function presetEntryHandler() {
     var httpsb = getHTTPSB();
-    var presetId = $(this).prop('presetId');
-    var preset = httpsb.presetManager.presetFromId(presetId);
-    if ( !preset ) {
-        return;
-    }
-    var scopeKey = httpsb.temporaryScopeKeyFromPageURL(HTTPSBPopup.pageURL);
-    preset.applyToScope(scopeKey);
+    httpsb.presetManager.applyToScope(
+        httpsb.temporaryScopeKeyFromPageURL(HTTPSBPopup.pageURL),
+        $(this).prop('presetId')
+        );
     updateScopeCell();
     updateMatrixStats();
     updateMatrixColors();
@@ -1339,7 +1336,7 @@ function bindToTabHandler(tabs) {
         HTTPSBPopup.tabId = httpsb.behindTheSceneTabId;
     } else {
         HTTPSBPopup.tabId = tab.id;
-        HTTPSBPopup.pageURL = background.pageUrlFromTabId(HTTPSBPopup.tabId);
+        HTTPSBPopup.pageURL = httpsb.pageUrlFromTabId(HTTPSBPopup.tabId);
     }
     HTTPSBPopup.pageHostname = background.uriTools.hostnameFromURI(HTTPSBPopup.pageURL);
     HTTPSBPopup.pageDomain = background.uriTools.domainFromHostname(HTTPSBPopup.pageHostname);