Skip to content

Commit

Permalink
Backed out 3 changesets (bug 1213990) for failing a mochitest a=backout
Browse files Browse the repository at this point in the history 
Backed out changeset 846ac5ddba37 (bug 1213990)
Backed out changeset 26bab9c6a89c (bug 1213990)
Backed out changeset 12d7193f1310 (bug 1213990)
  • Loading branch information
@KWierso
KWierso committed Aug 1, 2016
1 parent 44326f4 commit 507d362
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 256 deletions.
4 changes: 0 additions & 4 deletions modules/libpref/init/all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4638,10 +4638,6 @@ pref("extensions.alwaysUnpack", false);
pref("extensions.minCompatiblePlatformVersion", "2.0");
pref("extensions.webExtensionsMinPlatformVersion", "42.0a1");

// Other webextensions prefs
pref("extensions.webextensions.keepStorageOnUninstall", false);
pref("extensions.webextensions.keepUuidOnUninstall", false);

pref("network.buffer.cache.count", 24);
pref("network.buffer.cache.size", 32768);

Expand Down
133 changes: 44 additions & 89 deletions toolkit/components/extensions/Extension.jsm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ Cu.importGlobalProperties(["TextEncoder"]);

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/ExtensionContent.jsm");

XPCOMUtils.defineLazyModuleGetter(this, "ExtensionStorage",
"resource://gre/modules/ExtensionStorage.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Locale",
"resource://gre/modules/Locale.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Log",
Expand Down Expand Up @@ -77,9 +76,6 @@ var {
} = ExtensionUtils;

const LOGGER_ID_BASE = "addons.webextension.";
const UUID_MAP_PREF = "extensions.webextensions.uuids";
const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall";
const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall";

const COMMENT_REGEXP = new RegExp(String.raw`
^
Expand Down Expand Up @@ -459,101 +455,29 @@ let ParentAPIManager = {

ParentAPIManager.init();

// All moz-extension URIs use a machine-specific UUID rather than the
// extension's own ID in the host component. This makes it more
// difficult for web pages to detect whether a user has a given add-on
// installed (by trying to load a moz-extension URI referring to a
// web_accessible_resource from the extension). UUIDMap.get()
// returns the UUID for a given add-on ID.
let UUIDMap = {
_read() {
let pref = Preferences.get(UUID_MAP_PREF, "{}");
try {
return JSON.parse(pref);
} catch (e) {
Cu.reportError(`Error parsing ${UUID_MAP_PREF}.`);
return {};
}
},

_write(map) {
Preferences.set(UUID_MAP_PREF, JSON.stringify(map));
},

get(id, create = true) {
let map = this._read();

if (id in map) {
return map[id];
}

let uuid = null;
if (create) {
let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
uuid = uuidGenerator.generateUUID().number;
uuid = uuid.slice(1, -1); // Strip { and } off the UUID.

map[id] = uuid;
this._write(map);
}
return uuid;
},

remove(id) {
let map = this._read();
delete map[id];
this._write(map);
},
};

// For extensions that have called setUninstallURL(), send an event
// so the browser can display the URL.
var UninstallObserver = {
initialized: false,

init() {
init: function() {
if (!this.initialized) {
AddonManager.addAddonListener(this);
XPCOMUtils.defineLazyPreferenceGetter(this, "leaveStorage", LEAVE_STORAGE_PREF, false);
XPCOMUtils.defineLazyPreferenceGetter(this, "leaveUuid", LEAVE_UUID_PREF, false);
this.initialized = true;
}
},

onUninstalling(addon) {
let extension = GlobalManager.extensionMap.get(addon.id);
if (extension) {
// Let any other interested listeners respond
// (e.g., display the uninstall URL)
Management.emit("uninstall", extension);
uninit: function() {
if (this.initialized) {
AddonManager.removeAddonListener(this);
this.initialized = false;
}
},

onUninstalled(addon) {
let uuid = UUIDMap.get(addon.id, false);
if (!uuid) {
return;
}

if (!this.leaveStorage) {
// Clear browser.local.storage
ExtensionStorage.clear(addon.id);

// Clear any IndexedDB storage created by the extension
let baseURI = NetUtil.newURI(`moz-extension://${uuid}/`);
let principal = Services.scriptSecurityManager.createCodebasePrincipal(
baseURI, {addonId: addon.id}
);
Services.qms.clearStoragesForPrincipal(principal);

// Clear localStorage created by the extension
let attrs = JSON.stringify({addonId: addon.id});
Services.obs.notifyObservers(null, "clear-origin-data", attrs);
}

if (!this.leaveUuid) {
// Clear the entry in the UUID map
UUIDMap.remove(addon.id);
onUninstalling: function(addon) {
let extension = GlobalManager.extensionMap.get(addon.id);
if (extension) {
Management.emit("uninstall", extension);
}
},
};
Expand All @@ -580,6 +504,7 @@ GlobalManager = {

if (this.extensionMap.size == 0 && this.initialized) {
Services.obs.removeObserver(this, "content-document-global-created");
UninstallObserver.uninit();
this.initialized = false;
}
},
Expand Down Expand Up @@ -764,6 +689,36 @@ GlobalManager = {
},
};

// All moz-extension URIs use a machine-specific UUID rather than the
// extension's own ID in the host component. This makes it more
// difficult for web pages to detect whether a user has a given add-on
// installed (by trying to load a moz-extension URI referring to a
// web_accessible_resource from the extension). getExtensionUUID
// returns the UUID for a given add-on ID.
function getExtensionUUID(id) {
const PREF_NAME = "extensions.webextensions.uuids";

let pref = Preferences.get(PREF_NAME, "{}");
let map = {};
try {
map = JSON.parse(pref);
} catch (e) {
Cu.reportError(`Error parsing ${PREF_NAME}.`);
}

if (id in map) {
return map[id];
}

let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
let uuid = uuidGenerator.generateUUID().number;
uuid = uuid.slice(1, -1); // Strip { and } off the UUID.

map[id] = uuid;
Preferences.set(PREF_NAME, JSON.stringify(map));
return uuid;
}

// Represents the data contained in an extension, contained either
// in a directory or a zip file, which may or may not be installed.
// This class implements the functionality of the Extension class,
Expand Down Expand Up @@ -818,7 +773,7 @@ ExtensionData.prototype = {
throw new Error("getURL may not be called before an `id` or `uuid` has been set");
}
if (!this.uuid) {
this.uuid = UUIDMap.get(this.id);
this.uuid = getExtensionUUID(this.id);
}
return `moz-extension://${this.uuid}/${path}`;
},
Expand Down Expand Up @@ -1094,7 +1049,7 @@ ExtensionData.prototype = {
this.Extension = function(addonData) {
ExtensionData.call(this, addonData.resourceURI);

this.uuid = UUIDMap.get(addonData.id);
this.uuid = getExtensionUUID(addonData.id);

if (addonData.cleanupFile) {
Services.obs.addObserver(this, "xpcom-shutdown", false);
Expand Down Expand Up @@ -1317,7 +1272,7 @@ MockExtension.prototype = {
},

shutdown() {
this.addon.uninstall();
this.addon.uninstall(true);
return this.cleanupGeneratedFile();
},

Expand Down
3 changes: 1 addition & 2 deletions toolkit/components/extensions/test/mochitest/chrome.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g'
[test_ext_jsversion.html]
skip-if = buildapp == 'b2g'
[test_ext_schema.html]
[test_chrome_ext_storage_cleanup.html]
[test_ext_schema.html]
161 changes: 0 additions & 161 deletions toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html
View file

This file was deleted.

0 comments on commit 507d362

Please sign in to comment.