diff --git a/index.js b/index.js index f680c69a..ba86ad35 100644 --- a/index.js +++ b/index.js @@ -117,7 +117,7 @@ const ContainerService = { _identitiesState: {}, _windowMap: new Map(), _containerWasEnabled: false, - _onThemeChangedCallback: null, + _onBackgroundConnectCallback: null, init(installation, reason) { // If we are just been installed, we must store some information for the @@ -260,7 +260,7 @@ const ContainerService = { } }); - this.registerThemeConnection(api); + this.registerBackgroundConnection(api); }).catch(() => { throw new Error("WebExtension startup failed. Unable to continue."); }); @@ -307,28 +307,28 @@ const ContainerService = { Services.obs.addObserver(this, "lightweight-theme-changed", false); }, - registerThemeConnection(api) { - // This is only used for theme notifications + registerBackgroundConnection(api) { + // This is only used for theme and container deletion notifications api.browser.runtime.onConnect.addListener((port) => { - this.onThemeChanged((theme, topic) => { + this._onBackgroundConnectCallback = (message, topic) => { port.postMessage({ type: topic, - theme + message }); - }); + }; }); }, - triggerThemeChanged(theme, topic) { - if (this._onThemeChangedCallback) { - this._onThemeChangedCallback(theme, topic); + triggerBackgroundCallback(message, topic) { + if (this._onBackgroundConnectCallback) { + this._onBackgroundConnectCallback(message, topic); } }, observe(subject, topic) { if (topic === "lightweight-theme-changed") { this.getTheme().then((theme) => { - this.triggerThemeChanged(theme, topic); + this.triggerBackgroundCallback(theme, topic); }).catch(() => { throw new Error("Unable to get theme"); }); @@ -346,10 +346,6 @@ const ContainerService = { }); }, - onThemeChanged(callback) { - this._onThemeChangedCallback = callback; - }, - // utility methods _containerTabCount(userContextId) { @@ -960,12 +956,13 @@ const ContainerService = { }, removeIdentity(args) { + const eventName = "delete-container"; if (!("userContextId" in args)) { return Promise.reject("removeIdentity must be called with userContextId argument."); } this.sendTelemetryPayload({ - "event": "delete-container", + "event": eventName, "userContextId": args.userContextId }); @@ -976,6 +973,7 @@ const ContainerService = { return this._closeTabs(tabsToClose).then(() => { const removed = ContextualIdentityProxy.remove(args.userContextId); + this.triggerBackgroundCallback({userContextId: args.userContextId}, eventName); this._forgetIdentity(args.userContextId); return this._refreshNeeded().then(() => removed ); }); diff --git a/package.json b/package.json index 33c1ab3f..e34dd945 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "testpilot-containers", "title": "Containers Experiment", "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.", - "version": "2.0.0", + "version": "2.1.0", "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston", "bugs": { "url": "https://github.com/mozilla/testpilot-containers/issues" diff --git a/webextension/background.js b/webextension/background.js index 75669a6f..c6dc2836 100644 --- a/webextension/background.js +++ b/webextension/background.js @@ -1,14 +1,266 @@ -const themeManager = { - existingTheme: null, +const assignManager = { + CLOSEABLE_WINDOWS: new Set([ + "about:startpage", + "about:newtab", + "about:home", + "about:blank" + ]), + MENU_ASSIGN_ID: "open-in-this-container", + MENU_REMOVE_ID: "remove-open-in-this-container", + storageArea: { + area: browser.storage.local, + + getSiteStoreKey(pageUrl) { + const url = new window.URL(pageUrl); + const storagePrefix = "siteContainerMap@@_"; + return `${storagePrefix}${url.hostname}`; + }, + + get(pageUrl) { + const siteStoreKey = this.getSiteStoreKey(pageUrl); + return new Promise((resolve, reject) => { + this.area.get([siteStoreKey]).then((storageResponse) => { + if (storageResponse && siteStoreKey in storageResponse) { + resolve(storageResponse[siteStoreKey]); + } + resolve(null); + }).catch((e) => { + reject(e); + }); + }); + }, + + set(pageUrl, data) { + const siteStoreKey = this.getSiteStoreKey(pageUrl); + return this.area.set({ + [siteStoreKey]: data + }); + }, + + remove(pageUrl) { + const siteStoreKey = this.getSiteStoreKey(pageUrl); + return this.area.remove([siteStoreKey]); + }, + + deleteContainer(userContextId) { + const removeKeys = []; + this.area.get().then((siteConfigs) => { + Object.keys(siteConfigs).forEach((key) => { + // For some reason this is stored as string... lets check them both as that + if (String(siteConfigs[key].userContextId) === String(userContextId)) { + removeKeys.push(key); + } + }); + this.area.remove(removeKeys); + }).catch((e) => { + throw e; + }); + } + }, + init() { - this.check(); + browser.tabs.onActivated.addListener((info) => { + browser.tabs.get(info.tabId).then((tab) => { + this.calculateContextMenu(tab); + }).catch((e) => { + throw e; + }); + }); + + browser.windows.onFocusChanged.addListener((windowId) => { + browser.tabs.query({active: true, windowId}).then((tabs) => { + if (tabs && tabs[0]) { + this.calculateContextMenu(tabs[0]); + } + }).catch((e) => { + throw e; + }); + }); + + browser.runtime.onMessage.addListener((neverAskMessage) => { + const pageUrl = neverAskMessage.pageUrl; + if (neverAskMessage.neverAsk === true) { + // If we have existing data and for some reason it hasn't been deleted etc lets update it + this.storageArea.get(pageUrl).then((siteSettings) => { + if (siteSettings) { + siteSettings.neverAsk = true; + this.storageArea.set(pageUrl, siteSettings); + } + }).catch((e) => { + throw e; + }); + } + }); + + browser.contextMenus.onClicked.addListener((info, tab) => { + const userContextId = this.getUserContextIdFromCookieStore(tab); + // Mapping ${URL(info.pageUrl).hostname} to ${userContextId} + if (userContextId) { + let actionName; + let storageAction; + if (info.menuItemId === this.MENU_ASSIGN_ID) { + actionName = "added"; + storageAction = this.storageArea.set(info.pageUrl, { + userContextId, + neverAsk: false + }); + } else { + actionName = "removed"; + storageAction = this.storageArea.remove(info.pageUrl); + } + storageAction.then(() => { + browser.notifications.create({ + type: "basic", + title: "Containers", + message: `Successfully ${actionName} site to always open in this container`, + iconUrl: browser.extension.getURL("/img/onboarding-1.png") + }); + this.calculateContextMenu(tab); + }).catch((e) => { + throw e; + }); + } + }); + + browser.webRequest.onBeforeRequest.addListener((options) => { + if (options.frameId !== 0 || options.tabId === -1) { + return {}; + } + return Promise.all([ + browser.tabs.get(options.tabId), + this.storageArea.get(options.url) + ]).then(([tab, siteSettings]) => { + const userContextId = this.getUserContextIdFromCookieStore(tab); + if (!siteSettings + || userContextId === siteSettings.userContextId + || tab.incognito) { + return {}; + } + + this.reloadPageInContainer(options.url, siteSettings.userContextId, tab.index, siteSettings.neverAsk); + this.calculateContextMenu(tab); + // If the user just opened the tab, we can auto close it + if (this.CLOSEABLE_WINDOWS.has(tab.url)) { + browser.tabs.remove(tab.id); + } + return { + cancel: true, + }; + }).catch((e) => { + throw e; + }); + },{urls: [""], types: ["main_frame"]}, ["blocking"]); + + browser.webRequest.onCompleted.addListener((options) => { + if (options.frameId !== 0 || options.tabId === -1) { + return {}; + } + browser.tabs.get(options.tabId).then((tab) => { + this.calculateContextMenu(tab); + }).catch((e) => { + throw e; + }); + },{urls: [""], types: ["main_frame"]}); + }, + + + deleteContainer(userContextId) { + this.storageArea.deleteContainer(userContextId); + }, + + getUserContextIdFromCookieStore(tab) { + if (!("cookieStoreId" in tab)) { + return false; + } + const cookieStore = tab.cookieStoreId; + const container = cookieStore.replace("firefox-container-", ""); + if (container !== cookieStore) { + return container; + } + return false; + }, + + isTabPermittedAssign(tab) { + // Ensure we are not an important about url + // Ensure we are not in incognito mode + if (this.CLOSEABLE_WINDOWS.has(tab.url) + || tab.incognito) { + return false; + } + return true; + }, + + calculateContextMenu(tab) { + // There is a focus issue in this menu where if you change window with a context menu click + // you get the wrong menu display because of async + // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1215376#c16 + // We also can't change for always private mode + // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1352102 + const cookieStore = this.getUserContextIdFromCookieStore(tab); + browser.contextMenus.remove(this.MENU_ASSIGN_ID); + browser.contextMenus.remove(this.MENU_REMOVE_ID); + // Ensure we have a cookieStore to assign to + if (cookieStore + && this.isTabPermittedAssign(tab)) { + this.storageArea.get(tab.url).then((siteSettings) => { + // ✓ This is to mitigate https://bugzilla.mozilla.org/show_bug.cgi?id=1351418 + let prefix = " "; // Alignment of non breaking space, unknown why this requires so many spaces to align with the tick + let menuId = this.MENU_ASSIGN_ID; + if (siteSettings) { + prefix = "✓"; + menuId = this.MENU_REMOVE_ID; + } + browser.contextMenus.create({ + id: menuId, + title: `${prefix} Always Open in This Container`, + checked: true, + contexts: ["all"], + }); + }).catch((e) => { + throw e; + }); + } + }, + reloadPageInContainer(url, userContextId, index, neverAsk = false) { + const loadPage = browser.extension.getURL("confirm-page.html"); + // If the user has explicitly checked "Never Ask Again" on the warning page we will send them straight there + if (neverAsk) { + browser.tabs.create({url, cookieStoreId: `firefox-container-${userContextId}`, index}); + } else { + const confirmUrl = `${loadPage}?url=${url}`; + browser.tabs.create({url: confirmUrl, cookieStoreId: `firefox-container-${userContextId}`, index}).then(() => { + // We don't want to sync this URL ever nor clutter the users history + browser.history.deleteUrl({url: confirmUrl}); + }).catch((e) => { + throw e; + }); + } + } +}; + +const messageHandler = { + init() { const port = browser.runtime.connect(); port.onMessage.addListener(m => { - if (m.type === "lightweight-theme-changed") { - this.update(m.theme); + switch (m.type) { + case "lightweight-theme-changed": + themeManager.update(m.message); + break; + case "delete-container": + assignManager.deleteContainer(m.message.userContextId); + break; + default: + throw new Error(`Unhandled message type: ${m.message}`); } }); + } +}; + +const themeManager = { + existingTheme: null, + init() { + this.check(); }, setPopupIcon(theme) { let icons = { @@ -77,8 +329,11 @@ const tabPageCounter = { } }; +assignManager.init(); themeManager.init(); tabPageCounter.init(); +// Lets do this last as theme manager did a check before connecting before +messageHandler.init(); browser.runtime.sendMessage({ method: "getPreference", diff --git a/webextension/confirm-page.html b/webextension/confirm-page.html new file mode 100644 index 00000000..ca182bb1 --- /dev/null +++ b/webextension/confirm-page.html @@ -0,0 +1,33 @@ + + + + Containers confirm navigation + + + + +
+
+

Should we open this in your container?

+
+
+

+ Looks like you requested: +

+
+

+ You asked Firefox to always open in this type of container. Would you like to proceed?
+

+
+
+ +
+
+ +
+
+
+ + + + diff --git a/webextension/css/confirm-page.css b/webextension/css/confirm-page.css new file mode 100644 index 00000000..efbeb41b --- /dev/null +++ b/webextension/css/confirm-page.css @@ -0,0 +1,37 @@ +/* General Rules and Resets */ +.title { + background-image: none; +} + +main { + background: url(/img/onboarding-1.png) no-repeat; + background-position: -10px -15px; + background-size: 285px; + margin-inline-start: -285px; + padding-inline-start: 285px; +} + +@media only screen and (max-width: 1300px) { + main { + background: none; + } + + /* for a mid sized window we have enough for this but not our image */ + .title { + background-image: url("chrome://global/skin/icons/info.svg"); + } +} + +html { + box-sizing: border-box; + font: message-box; +} + +#redirect-url, +#redirect-origin { + font-weight: bold; +} + +dfn { + font-style: normal; +} diff --git a/webextension/css/popup.css b/webextension/css/popup.css index e2c8cd26..dd460d3a 100644 --- a/webextension/css/popup.css +++ b/webextension/css/popup.css @@ -383,7 +383,7 @@ span ~ .panel-header-text { .panel-footer { align-items: center; background: #efefef; - block-size: 55px; + block-size: 54px; border-block-end: 1px solid #d8d8d8; color: #000; display: flex; diff --git a/webextension/js/confirm-page.js b/webextension/js/confirm-page.js new file mode 100644 index 00000000..19a64f90 --- /dev/null +++ b/webextension/js/confirm-page.js @@ -0,0 +1,26 @@ +const redirectUrl = new URL(window.location).searchParams.get("url"); +document.getElementById("redirect-url").textContent = redirectUrl; +const redirectSite = new URL(redirectUrl).hostname; +document.getElementById("redirect-site").textContent = redirectSite; + +document.getElementById("redirect-form").addEventListener("submit", (e) => { + e.preventDefault(); + const neverAsk = document.getElementById("never-ask").checked; + // Sending neverAsk message to background to store for next time we see this process + if (neverAsk) { + browser.runtime.sendMessage({ + neverAsk: true, + pageUrl: redirectUrl + }).then(() => { + redirect(); + }).catch(() => { + // Can't really do much here user will have to click it again + }); + } + redirect(); +}); + +function redirect() { + const redirectUrl = document.getElementById("redirect-url").textContent; + document.location.replace(redirectUrl); +} diff --git a/webextension/manifest.json b/webextension/manifest.json index 93a6b16d..675b1794 100644 --- a/webextension/manifest.json +++ b/webextension/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Containers Experiment", - "version": "2.0.0", + "version": "2.1.0", "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.", "icons": { @@ -19,10 +19,16 @@ "homepage_url": "https://testpilot.firefox.com/", "permissions": [ + "", + "activeTab", "cookies", + "contextMenus", + "history", + "notifications", + "storage", "tabs", - "webRequest", - "" + "webRequestBlocking", + "webRequest" ], "browser_action": {