Merge pull request #185 from cowlicks/fix-release-issues-for-ff

Various fixes for recent release
cowlicks · Jul 18, 2019 · 1560564 · 1560564
2 parents 41c6b50 + b026e10
commit 1560564
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/selenium/integration_tests.js b/selenium/integration_tests.js
@@ -6,15 +6,26 @@ const {newDriver, startApp, stopApp, firstPartyHost} = require('./utils'),
   {cookieApp, fpcookie} = require("./cookies"),
   {etagApp} = require('./etags');
 
+async function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+beforeEach(async function() {
+  this.driver = await newDriver();
+  await sleep(250);
+});
+
+afterEach(async function() {
+  await this.driver.quit();
+});
+
 describe('etag tests', function() {
   beforeEach(async function() {
     this.app = etagApp();
-    this.driver = await newDriver();
     startApp(this.app);
   });
   afterEach(function() {
     stopApp(this.app);
-    this.driver.quit();
   });
   it('blocks etags', async function() {
     let {app, driver} = this;
@@ -31,12 +42,10 @@ describe('etag tests', function() {
 describe('cookie tests', function() {
   beforeEach(async function() {
     this.app = cookieApp();
-    this.driver = await newDriver();
     startApp(this.app);
   });
   afterEach(function() {
     stopApp(this.app);
-    this.driver.quit();
   });
 
   it('blocks cookies', async function() {

diff --git a/src/js/tabs.js b/src/js/tabs.js
@@ -7,7 +7,7 @@
 [(function(exports) {
 
 const shim = require('./shim'), {URL, tabsGet, tabsQuery, tabsExecuteScript} = shim,
-  {REMOVE_ACTION, CONTENTSCRIPTS} = require('./constants'),
+  {TYPES, REMOVE_ACTION, CONTENTSCRIPTS} = require('./constants'),
   {errorOccurred, Counter, listenerMixin, setTabIconActive, safeSetBadgeText, log} = require('./utils'),
   {isThirdParty} = require('./domains/parties');
 
@@ -246,7 +246,10 @@ class Tabs {
     return this.getTab(tabId).get(frameId);
   }
 
-  isRequestThirdParty({tabId, initiator, urlObj: {hostname} = {}}) {
+  isRequestThirdParty({tabId, initiator, type, urlObj: {hostname} = {}}) {
+    if (type === TYPES.main_frame) {
+      return false;
+    }
     if (typeof initiator !== 'undefined') {
       return isThirdParty((new URL(initiator)).hostname, hostname);
     }

diff --git a/src/js/test/tabs_test.js b/src/js/test/tabs_test.js
@@ -34,6 +34,10 @@ describe('tabs.js', function() {
       });
     });
     describe('#isRequestThirdParty', function() {
+      it('is first party if main_frame', function() {
+        let details = {type: 'main_frame'};
+        assert.isFalse(this.tabs.isRequestThirdParty(details));
+      });
       it('no initiator', function() {
         let details = {tabId: 1, urlObj: new URL(thirdParty)};
         assert.isTrue(this.tabs.isRequestThirdParty(details));

diff --git a/src/js/test/webrequest_test.js b/src/js/test/webrequest_test.js
@@ -2,6 +2,7 @@
 
 const assert = require('chai').assert,
   {WebRequest} = require('../webrequest'),
+  {NO_ACTION} = require('../constants'),
   {Tabs} = require('../tabs'),
   {Store} = require('../store'),
   {details, clone, cookie, notCookie} = require('./testing_utils');
@@ -54,7 +55,8 @@ describe('webrequest.js', function() {
   describe('#onBeforeSendHeaders', function() {
     beforeEach(function() {
       this.wr.onBeforeRequest(details.main_frame);
-      this.third_party = clone(details.main_frame);
+      this.main_frame = clone(details.main_frame);
+      this.third_party = clone(details.third_party);
       this.third_party.url = 'https://third-party.com/';
     })
     it('removes cookies from thirdparty requests', function() {
@@ -64,7 +66,7 @@ describe('webrequest.js', function() {
     it('does not effect first party cookies', function() {
       let first_party = clone(details.main_frame);
       first_party.requestHeaders = [cookie, notCookie];
-      assert.deepEqual(this.wr.onBeforeSendHeaders(first_party), {});
+      assert.deepEqual(this.wr.onBeforeSendHeaders(first_party), NO_ACTION);
     })
     it('does not effect thirdparty requests with no cookies', function() {
       this.third_party.requestHeaders = [notCookie, notCookie];
@@ -76,9 +78,14 @@ describe('webrequest.js', function() {
   describe('#onHeadersReceived', function() {
     beforeEach(function() {
       this.wr.onBeforeRequest(details.main_frame);
-      this.third_party = clone(details.main_frame);
+      this.first_party = clone(details.main_frame);
+      this.third_party = clone(details.third_party);
       this.third_party.url = 'https://third-party.com/';
     })
+    it('does not effect cookies on main_frame requests', function() {
+      this.first_party.responseHeaders = [cookie, notCookie];
+      assert.deepEqual(this.wr.onHeadersReceived(this.first_party), NO_ACTION);
+    });
     it('removes cookies from thirdparty requests', function() {
       this.third_party.responseHeaders = [cookie, notCookie];
       assert.deepEqual(this.wr.onHeadersReceived(this.third_party), {responseHeaders: [notCookie]});

diff --git a/src/manifest.json b/src/manifest.json
@@ -18,8 +18,7 @@
     "webRequestBlocking",
     "webNavigation",
     "storage",
-    "cookies",
-    "privacy"
+    "cookies"
   ],
   "icons": {
     "48": "media/icon48.png",