Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1156985: Fix crashing xpcshell test_signed_inject.js

Browse Source 
--HG--
extra : rebase_source : 474807adfa45f063238066c0878307c9e18908c8
This commit is contained in:
Dave Townsend 2015-05-11 12:29:44 -07:00
parent 3f5061a9c9
commit 3adce9c727
2 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js
View File

@ -49,6 +49,13 @@ function resetPrefs() {
Services.prefs.setIntPref("bootstraptest.uninstall_newversion", -1);
}
function clearCache(file) {
if (TEST_UNPACKED)
return;
Services.obs.notifyObservers(file, "flush-cache-entry", null);
}
function getActiveVersion() {
return Services.prefs.getIntPref("bootstraptest.active_version");
}
@ -67,7 +74,7 @@ function run_test() {
// Injecting into profile (bootstrap)
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.unsigned), profileDir, ID);
let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.unsigned), profileDir, ID);
startupManager();
@ -83,12 +90,13 @@ add_task(function*() {
yield promiseShutdownManager();
resetPrefs();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
breakAddon(getFileForAddon(profileDir, ID));
let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
breakAddon(file);
startupManager();
@ -104,11 +112,12 @@ add_task(function*() {
yield promiseShutdownManager();
resetPrefs();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.badid), profileDir, ID);
let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.badid), profileDir, ID);
startupManager();
@ -124,17 +133,18 @@ add_task(function*() {
yield promiseShutdownManager();
resetPrefs();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
// Installs a signed add-on then modifies it in place breaking its signing
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
let file = manuallyInstall(do_get_file(DATA + ADDONS.bootstrap.signed), profileDir, ID);
// Make it appear to come from the past so when we modify it later it is
// detected during startup. Obviously malware can bypass this method of
// detection but the periodic scan will catch that
yield promiseSetExtensionModifiedTime(getFileForAddon(profileDir, ID).path, Date.now() - 600000);
yield promiseSetExtensionModifiedTime(file.path, Date.now() - 600000);
startupManager();
let addon = yield promiseAddonByID(ID);
@ -147,7 +157,8 @@ add_task(function*() {
yield promiseShutdownManager();
do_check_eq(getActiveVersion(), 0);
breakAddon(getFileForAddon(profileDir, ID));
clearCache(file);
breakAddon(file);
resetPrefs();
startupManager();
@ -167,12 +178,13 @@ add_task(function*() {
yield promiseShutdownManager();
resetPrefs();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
// Injecting into profile (non-bootstrap)
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.unsigned), profileDir, ID);
let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.unsigned), profileDir, ID);
startupManager();
@ -188,12 +200,13 @@ add_task(function*() {
yield promiseRestartManager();
yield promiseShutdownManager();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
breakAddon(getFileForAddon(profileDir, ID));
let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
breakAddon(file);
startupManager();
@ -209,11 +222,12 @@ add_task(function*() {
yield promiseRestartManager();
yield promiseShutdownManager();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.badid), profileDir, ID);
let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.badid), profileDir, ID);
startupManager();
@ -229,17 +243,18 @@ add_task(function*() {
yield promiseRestartManager();
yield promiseShutdownManager();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
// Installs a signed add-on then modifies it in place breaking its signing
add_task(function*() {
manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
let file = manuallyInstall(do_get_file(DATA + ADDONS.nonbootstrap.signed), profileDir, ID);
// Make it appear to come from the past so when we modify it later it is
// detected during startup. Obviously malware can bypass this method of
// detection but the periodic scan will catch that
yield promiseSetExtensionModifiedTime(getFileForAddon(profileDir, ID).path, Date.now() - 60000);
yield promiseSetExtensionModifiedTime(file.path, Date.now() - 60000);
startupManager();
let addon = yield promiseAddonByID(ID);
@ -251,7 +266,8 @@ add_task(function*() {
yield promiseShutdownManager();
breakAddon(getFileForAddon(profileDir, ID));
clearCache(file);
breakAddon(file);
startupManager();
@ -270,7 +286,8 @@ add_task(function*() {
yield promiseRestartManager();
yield promiseShutdownManager();
do_check_false(getFileForAddon(profileDir, ID).exists());
do_check_false(file.exists());
clearCache(file);
});
// Stage install then modify before startup (non-bootstrap)
@ -291,8 +308,7 @@ add_task(function*() {
let addon = yield promiseAddonByID(ID);
do_check_eq(addon, null);
let install = getFileForAddon(profileDir, ID);
do_check_false(install.exists());
clearCache(staged);
yield promiseShutdownManager();
});
@ -312,8 +328,8 @@ add_task(function*() {
do_check_eq(addon, null);
do_check_eq(getActiveVersion(), -1);
let install = getFileForAddon(profileDir, ID);
do_check_false(install.exists());
do_check_false(file.exists());
clearCache(file);
yield promiseShutdownManager();
resetPrefs();

1
toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
View File

@ -238,7 +238,6 @@ fail-if = buildapp == "mulet" || os == "android"
[test_safemode.js]
[test_signed_verify.js]
[test_signed_inject.js]
skip-if = true
[test_signed_install.js]
run-sequentially = Uses hardcoded ports in xpi files.
[test_signed_migrate.js]