mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 47db77d641d4 from bug 449027

This commit is contained in:
Dave Townsend 2008-08-28 10:58:17 +01:00
Родитель d8f8ca4be5
Коммит d89090d9ee
5 изменённых файлов: 72 добавлений и 1274 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/app/profile/firefox.js
Просмотреть файл

@ -80,7 +80,7 @@ pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LO
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
pref("extensions.blocklist.interval", 86400);
pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/blocklist/");
// Dictionary download preference

210
toolkit/mozapps/extensions/src/nsBlocklistService.js
Просмотреть файл

@ -23,7 +23,6 @@
# Contributor(s):
# Robert Strong <robert.bugzilla@gmail.com>
# Michael Wu <flamingice@sourmilk.net>
# Dave Townsend <dtownsend@oxymoronical.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -406,8 +405,29 @@ Blocklist.prototype = {
return false;
for (var i = 0; i < blItem.length; ++i) {
if (blItem[i].includesItem(version, appVersion, toolkitVersion))
if (gVersionChecker.compare(version, blItem[i].minVersion) < 0 ||
gVersionChecker.compare(version, blItem[i].maxVersion) > 0)
continue;
var blTargetApp = blItem[i].targetApps[gApp.ID];
if (blTargetApp) {
for (var x = 0; x < blTargetApp.length; ++x) {
if (gVersionChecker.compare(appVersion, blTargetApp[x].minVersion) < 0 ||
gVersionChecker.compare(appVersion, blTargetApp[x].maxVersion) > 0)
continue;
return true;
}
}
blTargetApp = blItem[i].targetApps[TOOLKIT_ID];
if (!blTargetApp)
return false;
for (x = 0; x < blTargetApp.length; ++x) {
if (gVersionChecker.compare(toolkitVersion, blTargetApp[x].minVersion) < 0 ||
gVersionChecker.compare(toolkitVersion, blTargetApp[x].maxVersion) > 0)
continue;
return true;
}
}
return false;
},
@ -610,7 +630,7 @@ Blocklist.prototype = {
var childNodes = doc.documentElement.childNodes;
this._addonEntries = this._processItemNodes(childNodes, "em",
this._handleEmItemNode);
this._handleEmItemNode);
this._pluginEntries = this._processItemNodes(childNodes, "plugin",
this._handlePluginItemNode);
}
@ -674,52 +694,40 @@ Blocklist.prototype = {
return;
var matchNodes = blocklistElement.childNodes;
var blockEntry = {
matches: {},
versions: []
};
var matchList;
for (var x = 0; x < matchNodes.length; ++x) {
var matchElement = matchNodes.item(x);
if (!(matchElement instanceof Ci.nsIDOMElement))
if (!(matchElement instanceof Ci.nsIDOMElement) ||
matchElement.localName != "match")
continue;
if (matchElement.localName == "match") {
var name = matchElement.getAttribute("name");
var exp = matchElement.getAttribute("exp");
blockEntry.matches[name] = new RegExp(exp, "m");
}
if (matchElement.localName == "versionRange")
blockEntry.versions.push(new BlocklistItemData(matchElement));
var name = matchElement.getAttribute("name");
var exp = matchElement.getAttribute("exp");
if (!matchList)
matchList = { };
matchList[name] = new RegExp(exp, "m");
}
result.push(blockEntry);
if (matchList)
result.push(matchList);
},
_isPluginBlocklisted: function(plugin, appVersion, toolkitVersion) {
for each (var blockEntry in this._pluginEntries) {
_checkPlugin: function(plugin) {
for each (var matchList in this._pluginEntries) {
var matchFailed = false;
for (var name in blockEntry.matches) {
if (!(name in plugin) ||
typeof(plugin[name]) != "string" ||
!blockEntry.matches[name].test(plugin[name])) {
for (var name in matchList) {
if (typeof(plugin[name]) != "string" ||
!matchList[name].test(plugin[name])) {
matchFailed = true;
break;
}
}
if (matchFailed)
continue;
// No version ranges means match any versions
if (blockEntry.versions.length == 0)
return true;
for (var i = 0; i < blockEntry.versions.length; i++) {
if (blockEntry.versions[i].includesItem(plugin.version, appVersion,
toolkitVersion))
return true;
if (!matchFailed) {
plugin.blocklisted = true;
return;
}
}
return false;
plugin.blocklisted = false;
},
_checkPluginsList: function() {
@ -727,11 +735,7 @@ Blocklist.prototype = {
this._loadBlocklist();
var phs = Cc["@mozilla.org/plugin/host;1"].
getService(Ci.nsIPluginHost);
var plugins = phs.getPluginTags({});
for (var i = 0; i < plugins.length; i++)
plugins[i].blocklisted = this._isPluginBlocklisted(plugins[i],
gApp.version,
gApp.platformVersion);
phs.getPluginTags({ }).forEach(this._checkPlugin, this);
},
classDescription: "Blocklist Service",
@ -768,97 +772,25 @@ function BlocklistItemData(versionRangeElement) {
this.targetApps[appID] = this.getBlocklistAppVersions(targetAppElement);
}
}
// Default to all versions of the current application when no targetApplication
// elements were found
// Default to all versions of the extension and the current application when
// versionRange is not defined.
if (!found)
this.targetApps[gApp.ID] = this.getBlocklistAppVersions(null);
}
BlocklistItemData.prototype = {
/**
* Tests if a version of an item is included in the version range and target
* application information represented by this BlocklistItemData using the
* provided application and toolkit versions.
* @param version
* The version of the item being tested.
* @param appVersion
* The application version to test with.
* @param toolkitVersion
* The toolkit version to test with.
* @returns True if the version range covers the item version and application
* or toolkit version.
*/
includesItem: function(version, appVersion, toolkitVersion) {
// Some platforms have no version for plugins, these don't match if there
// was a min/maxVersion provided
if (!version && (this.minVersion || this.maxVersion))
return false;
// Check if the item version matches
if (!this.matchesRange(version, this.minVersion, this.maxVersion))
return false;
// Check if the application version matches
if (this.matchesTargetRange(gApp.ID, appVersion))
return true;
// Check if the toolkit version matches
return this.matchesTargetRange(TOOLKIT_ID, toolkitVersion);
},
/**
* Checks if a version is higher than or equal to the minVersion (if provided)
* and lower than or equal to the maxVersion (if provided).
* @param version
* The version to test.
* @param minVersion
* The minimum version. If null it is assumed that version is always
* larger.
* @param maxVersion
* The maximum version. If null it is assumed that version is always
* smaller.
*/
matchesRange: function(version, minVersion, maxVersion) {
if (minVersion && gVersionChecker.compare(version, minVersion) < 0)
return false;
if (maxVersion && gVersionChecker.compare(version, maxVersion) > 0)
return false;
return true;
},
/**
* Tests if there is a matching range for the given target application id and
* version.
* @param appID
* The application ID to test for, may be for an application or toolkit
* @param appVersion
* The version of the application to test for.
* @returns True if this version range covers the application version given.
*/
matchesTargetRange: function(appID, appVersion) {
var blTargetApp = this.targetApps[appID];
if (!blTargetApp)
return false;
for (var x = 0; x < blTargetApp.length; ++x) {
if (this.matchesRange(appVersion, blTargetApp[x].minVersion, blTargetApp[x].maxVersion))
return true;
}
return false;
},
/**
* Retrieves a version range (e.g. minVersion and maxVersion) for a
* blocklist item's targetApplication element.
* @param targetAppElement
* A targetApplication blocklist element.
* @returns An array of JS objects with the following properties:
* "minVersion" The minimum version in a version range (default = null).
* "maxVersion" The maximum version in a version range (default = null).
*/
/**
* Retrieves a version range (e.g. minVersion and maxVersion) for a
* blocklist item's targetApplication element.
* @param targetAppElement
* A targetApplication blocklist element.
* @returns An array of JS objects with the following properties:
* "minVersion" The minimum version in a version range (default = 0).
* "maxVersion" The maximum version in a version range (default = *).
*/
getBlocklistAppVersions: function(targetAppElement) {
var appVersions = [ ];
var found = false;
if (targetAppElement) {
for (var i = 0; i < targetAppElement.childNodes.length; ++i) {
@ -866,28 +798,28 @@ BlocklistItemData.prototype = {
if (!(versionRangeElement instanceof Ci.nsIDOMElement) ||
versionRangeElement.localName != "versionRange")
continue;
found = true;
appVersions.push(this.getBlocklistVersionRange(versionRangeElement));
}
}
// return minVersion = null and maxVersion = null if no specific versionRange
// elements were found
if (appVersions.length == 0)
appVersions.push(this.getBlocklistVersionRange(null));
// return minVersion = 0 and maxVersion = * if not available
if (!found)
return [ this.getBlocklistVersionRange(null) ];
return appVersions;
},
/**
* Retrieves a version range (e.g. minVersion and maxVersion) for a blocklist
* versionRange element.
* @param versionRangeElement
* The versionRange blocklist element.
* @returns A JS object with the following properties:
* "minVersion" The minimum version in a version range (default = null).
* "maxVersion" The maximum version in a version range (default = null).
*/
/**
* Retrieves a version range (e.g. minVersion and maxVersion) for a blocklist
* versionRange element.
* @param versionRangeElement
* The versionRange blocklist element.
* @returns A JS object with the following properties:
* "minVersion" The minimum version in a version range (default = 0).
* "maxVersion" The maximum version in a version range (default = *).
*/
getBlocklistVersionRange: function(versionRangeElement) {
var minVersion = null;
var maxVersion = null;
var minVersion = "0";
var maxVersion = "*";
if (!versionRangeElement)
return { minVersion: minVersion, maxVersion: maxVersion };

333
toolkit/mozapps/extensions/test/unit/data/test_bug449027_app.xml
Просмотреть файл

@ -1,333 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
<emItems>
<!-- All extensions are version 5 and tests run against appVersion 3 -->
<!-- Test 1 not listed, should never get blocked -->
<!-- Always blocked -->
<emItem id="test_bug449027_2@tests.mozilla.org"/>
<!-- Always blocked -->
<emItem id="test_bug449027_3@tests.mozilla.org">
<versionRange/>
</emItem>
<!-- Not blocked since neither version range matches -->
<emItem id="test_bug449027_4@tests.mozilla.org">
<versionRange minVersion="6"/>
<versionRange maxVersion="4"/>
</emItem>
<!-- Invalid version range, should not block -->
<emItem id="test_bug449027_5@tests.mozilla.org">
<versionRange minVersion="6" maxVersion="4"/>
</emItem>
<!-- Should block all of these -->
<emItem id="test_bug449027_6@tests.mozilla.org">
<versionRange minVersion="7" maxVersion="8"/>
<versionRange minVersion="5" maxVersion="6"/>
<versionRange maxVersion="4"/>
</emItem>
<emItem id="test_bug449027_7@tests.mozilla.org">
<versionRange maxVersion="4"/>
<versionRange minVersion="4" maxVersion="5"/>
<versionRange minVersion="6" maxVersion="7"/>
</emItem>
<emItem id="test_bug449027_8@tests.mozilla.org">
<versionRange minVersion="2" maxVersion="2"/>
<versionRange minVersion="4" maxVersion="6"/>
<versionRange minVersion="7" maxVersion="8"/>
</emItem>
<emItem id="test_bug449027_9@tests.mozilla.org">
<versionRange minVersion="4"/>
</emItem>
<emItem id="test_bug449027_10@tests.mozilla.org">
<versionRange minVersion="5"/>
</emItem>
<emItem id="test_bug449027_11@tests.mozilla.org">
<versionRange maxVersion="6"/>
</emItem>
<emItem id="test_bug449027_12@tests.mozilla.org">
<versionRange maxVersion="5"/>
</emItem>
<!-- This should block all versions for any application -->
<emItem id="test_bug449027_13@tests.mozilla.org">
<versionRange>
<targetApplication/>
</versionRange>
</emItem>
<!-- Shouldn't block -->
<emItem id="test_bug449027_14@tests.mozilla.org">
<versionRange>
<targetApplication id="foo@bar.com"/>
</versionRange>
</emItem>
<!-- Should block for any version of the app -->
<emItem id="test_bug449027_15@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org"/>
</versionRange>
</emItem>
<!-- Should still block -->
<emItem id="test_bug449027_16@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange/>
</targetApplication>
</versionRange>
</emItem>
<!-- Not blocked since neither version range matches -->
<emItem id="test_bug449027_17@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="4"/>
<versionRange maxVersion="2"/>
</targetApplication>
</versionRange>
</emItem>
<!-- Invalid version range, should not block -->
<emItem id="test_bug449027_18@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="6" maxVersion="4"/>
</targetApplication>
</versionRange>
</emItem>
<!-- Should block all of these -->
<emItem id="test_bug449027_19@tests.mozilla.org">
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="5" maxVersion="6"/>
<versionRange minVersion="3" maxVersion="4"/>
<versionRange maxVersion="2"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_20@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange maxVersion="2"/>
<versionRange minVersion="2" maxVersion="3"/>
<versionRange minVersion="4" maxVersion="5"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</emItem>
<emItem id="test_bug449027_21@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="1" maxVersion="1"/>
<versionRange minVersion="2" maxVersion="4"/>
<versionRange minVersion="5" maxVersion="6"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_22@tests.mozilla.org">
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="3"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_23@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="2"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</emItem>
<emItem id="test_bug449027_24@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange maxVersion="3"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_25@tests.mozilla.org">
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange maxVersion="4"/>
</targetApplication>
</versionRange>
</emItem>
</emItems>
<pluginItems>
<!-- All plugins are version 5 and tests run against appVersion 3 -->
<!-- Test 1 not listed, should never get blocked -->
<!-- Always blocked -->
<pluginItem>
<match name="name" exp="^test_bug449027_2$"/>
</pluginItem>
<!-- Always blocked -->
<pluginItem>
<match name="name" exp="^test_bug449027_3$"/>
<versionRange/>
</pluginItem>
<!-- Not blocked since neither version range matches -->
<pluginItem>
<match name="name" exp="^test_bug449027_4$"/>
<versionRange minVersion="6"/>
<versionRange maxVersion="4"/>
</pluginItem>
<!-- Invalid version range, should not block -->
<pluginItem>
<match name="name" exp="^test_bug449027_5$"/>
<versionRange minVersion="6" maxVersion="4"/>
</pluginItem>
<!-- Should block all of these -->
<pluginItem>
<match name="name" exp="^test_bug449027_6$"/>
<versionRange minVersion="7" maxVersion="8"/>
<versionRange minVersion="5" maxVersion="6"/>
<versionRange maxVersion="4"/>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_7$"/>
<versionRange maxVersion="4"/>
<versionRange minVersion="4" maxVersion="5"/>
<versionRange minVersion="6" maxVersion="7"/>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_8$"/>
<versionRange minVersion="2" maxVersion="2"/>
<versionRange minVersion="4" maxVersion="6"/>
<versionRange minVersion="7" maxVersion="8"/>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_9$"/>
<versionRange minVersion="4"/>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_10$"/>
<versionRange minVersion="5"/>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_11$"/>
<versionRange maxVersion="6"/>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_12$"/>
<versionRange maxVersion="5"/>
</pluginItem>
<!-- This should block all versions for any application -->
<pluginItem>
<match name="name" exp="^test_bug449027_13$"/>
<versionRange>
<targetApplication/>
</versionRange>
</pluginItem>
<!-- Shouldn't block -->
<pluginItem>
<match name="name" exp="^test_bug449027_14$"/>
<versionRange>
<targetApplication id="foo@bar.com"/>
</versionRange>
</pluginItem>
<!-- Should block for any version of the app -->
<pluginItem>
<match name="name" exp="^test_bug449027_15$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org"/>
</versionRange>
</pluginItem>
<!-- Should still block -->
<pluginItem>
<match name="name" exp="^test_bug449027_16$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange/>
</targetApplication>
</versionRange>
</pluginItem>
<!-- Not blocked since neither version range matches -->
<pluginItem>
<match name="name" exp="^test_bug449027_17$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="4"/>
<versionRange maxVersion="2"/>
</targetApplication>
</versionRange>
</pluginItem>
<!-- Invalid version range, should not block -->
<pluginItem>
<match name="name" exp="^test_bug449027_18$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="6" maxVersion="4"/>
</targetApplication>
</versionRange>
</pluginItem>
<!-- Should block all of these -->
<pluginItem>
<match name="name" exp="^test_bug449027_19$"/>
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="5" maxVersion="6"/>
<versionRange minVersion="3" maxVersion="4"/>
<versionRange maxVersion="2"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_20$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange maxVersion="2"/>
<versionRange minVersion="2" maxVersion="3"/>
<versionRange minVersion="4" maxVersion="5"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_21$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="1" maxVersion="1"/>
<versionRange minVersion="2" maxVersion="4"/>
<versionRange minVersion="5" maxVersion="6"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_22$"/>
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="3"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_23$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange minVersion="2"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_24$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange maxVersion="3"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_25$"/>
<versionRange>
<targetApplication id="xpcshell@tests.mozilla.org">
<versionRange maxVersion="4"/>
</targetApplication>
</versionRange>
</pluginItem>
</pluginItems>
</blocklist>

208
toolkit/mozapps/extensions/test/unit/data/test_bug449027_toolkit.xml
Просмотреть файл

@ -1,208 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
<emItems>
<!-- All extensions are version 5 and tests run against toolkitVersion 8 -->
<!-- Test 1-14 not listed, should never get blocked -->
<!-- Should block for any version of the app -->
<emItem id="test_bug449027_15@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org"/>
</versionRange>
</emItem>
<!-- Should still block -->
<emItem id="test_bug449027_16@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange/>
</targetApplication>
</versionRange>
</emItem>
<!-- Not blocked since neither version range matches -->
<emItem id="test_bug449027_17@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="9"/>
<versionRange maxVersion="7"/>
</targetApplication>
</versionRange>
</emItem>
<!-- Invalid version range, should not block -->
<emItem id="test_bug449027_18@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="11" maxVersion="9"/>
</targetApplication>
</versionRange>
</emItem>
<!-- Should block all of these -->
<emItem id="test_bug449027_19@tests.mozilla.org">
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="10" maxVersion="11"/>
<versionRange minVersion="8" maxVersion="9"/>
<versionRange maxVersion="7"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_20@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange maxVersion="7"/>
<versionRange minVersion="7" maxVersion="8"/>
<versionRange minVersion="9" maxVersion="10"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</emItem>
<emItem id="test_bug449027_21@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="6" maxVersion="6"/>
<versionRange minVersion="7" maxVersion="9"/>
<versionRange minVersion="10" maxVersion="11"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_22@tests.mozilla.org">
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="8"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_23@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="7"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</emItem>
<emItem id="test_bug449027_24@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange maxVersion="8"/>
</targetApplication>
</versionRange>
</emItem>
<emItem id="test_bug449027_25@tests.mozilla.org">
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange maxVersion="9"/>
</targetApplication>
</versionRange>
</emItem>
</emItems>
<pluginItems>
<!-- All plugins are version 5 and tests run against appVersion 3 -->
<!-- Test 1-14 not listed, should never get blocked -->
<!-- Should block for any version of the app -->
<pluginItem>
<match name="name" exp="^test_bug449027_15$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org"/>
</versionRange>
</pluginItem>
<!-- Should still block -->
<pluginItem>
<match name="name" exp="^test_bug449027_16$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange/>
</targetApplication>
</versionRange>
</pluginItem>
<!-- Not blocked since neither version range matches -->
<pluginItem>
<match name="name" exp="^test_bug449027_17$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="9"/>
<versionRange maxVersion="7"/>
</targetApplication>
</versionRange>
</pluginItem>
<!-- Invalid version range, should not block -->
<pluginItem>
<match name="name" exp="^test_bug449027_18$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="11" maxVersion="9"/>
</targetApplication>
</versionRange>
</pluginItem>
<!-- Should block all of these -->
<pluginItem>
<match name="name" exp="^test_bug449027_19$"/>
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="10" maxVersion="11"/>
<versionRange minVersion="8" maxVersion="9"/>
<versionRange maxVersion="7"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_20$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange maxVersion="7"/>
<versionRange minVersion="7" maxVersion="8"/>
<versionRange minVersion="9" maxVersion="10"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_21$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="6" maxVersion="6"/>
<versionRange minVersion="7" maxVersion="9"/>
<versionRange minVersion="10" maxVersion="11"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_22$"/>
<versionRange>
<targetApplication id="foo@bar.com"/>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="8"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_23$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange minVersion="7"/>
</targetApplication>
<targetApplication id="foo@bar.com"/>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_24$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange maxVersion="8"/>
</targetApplication>
</versionRange>
</pluginItem>
<pluginItem>
<match name="name" exp="^test_bug449027_25$"/>
<versionRange>
<targetApplication id="toolkit@mozilla.org">
<versionRange maxVersion="9"/>
</targetApplication>
</versionRange>
</pluginItem>
</pluginItems>
</blocklist>

593
toolkit/mozapps/extensions/test/unit/test_bug449027.js
Просмотреть файл

@ -1,593 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Dave Townsend <dtownsend@oxymoronical.com>.
*
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL
*
* ***** END LICENSE BLOCK *****
*/
const URI_EXTENSION_LIST_DIALOG = "chrome://mozapps/content/extensions/list.xul";
do_import_script("netwerk/test/httpserver/httpd.js");
var ADDONS = [{
id: "test_bug449027_1@tests.mozilla.org",
name: "Bug 449027 Addon Test 1",
version: "5",
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
id: "test_bug449027_2@tests.mozilla.org",
name: "Bug 449027 Addon Test 2",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_3@tests.mozilla.org",
name: "Bug 449027 Addon Test 3",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_4@tests.mozilla.org",
name: "Bug 449027 Addon Test 4",
version: "5",
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
id: "test_bug449027_5@tests.mozilla.org",
name: "Bug 449027 Addon Test 5",
version: "5",
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
id: "test_bug449027_6@tests.mozilla.org",
name: "Bug 449027 Addon Test 6",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_7@tests.mozilla.org",
name: "Bug 449027 Addon Test 7",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_8@tests.mozilla.org",
name: "Bug 449027 Addon Test 8",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_9@tests.mozilla.org",
name: "Bug 449027 Addon Test 9",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_10@tests.mozilla.org",
name: "Bug 449027 Addon Test 10",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_11@tests.mozilla.org",
name: "Bug 449027 Addon Test 11",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_12@tests.mozilla.org",
name: "Bug 449027 Addon Test 12",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_13@tests.mozilla.org",
name: "Bug 449027 Addon Test 13",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
id: "test_bug449027_14@tests.mozilla.org",
name: "Bug 449027 Addon Test 14",
version: "5",
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
id: "test_bug449027_15@tests.mozilla.org",
name: "Bug 449027 Addon Test 15",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_16@tests.mozilla.org",
name: "Bug 449027 Addon Test 16",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_17@tests.mozilla.org",
name: "Bug 449027 Addon Test 17",
version: "5",
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
id: "test_bug449027_18@tests.mozilla.org",
name: "Bug 449027 Addon Test 18",
version: "5",
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
id: "test_bug449027_19@tests.mozilla.org",
name: "Bug 449027 Addon Test 19",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_20@tests.mozilla.org",
name: "Bug 449027 Addon Test 20",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_21@tests.mozilla.org",
name: "Bug 449027 Addon Test 21",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_22@tests.mozilla.org",
name: "Bug 449027 Addon Test 22",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_23@tests.mozilla.org",
name: "Bug 449027 Addon Test 23",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_24@tests.mozilla.org",
name: "Bug 449027 Addon Test 24",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
id: "test_bug449027_25@tests.mozilla.org",
name: "Bug 449027 Addon Test 25",
version: "5",
start: false,
appBlocks: true,
toolkitBlocks: true
}];
var PLUGINS = [{
name: "test_bug449027_1",
version: "5",
blocklisted: false,
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
name: "test_bug449027_2",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_3",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_4",
version: "5",
blocklisted: false,
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
name: "test_bug449027_5",
version: "5",
blocklisted: false,
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
name: "test_bug449027_6",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_7",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_8",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_9",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_10",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_11",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_12",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_13",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: false
}, {
name: "test_bug449027_14",
version: "5",
blocklisted: false,
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
name: "test_bug449027_15",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_16",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_17",
version: "5",
blocklisted: false,
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
name: "test_bug449027_18",
version: "5",
blocklisted: false,
start: false,
appBlocks: false,
toolkitBlocks: false
}, {
name: "test_bug449027_19",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_20",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_21",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_22",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_23",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_24",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}, {
name: "test_bug449027_25",
version: "5",
blocklisted: false,
start: false,
appBlocks: true,
toolkitBlocks: true
}];
var gCallback = null;
var gTestserver = null;
var gNewBlocks = [];
// A fake plugin host for the blocklist service to use
var PluginHost = {
getPluginTags: function(countRef) {
countRef.value = PLUGINS.length;
return PLUGINS;
},
QueryInterface: function(iid) {
if (iid.equals(Components.interfaces.nsIPluginHost)
|| iid.equals(Components.interfaces.nsISupports))
return this;
throw Components.results.NS_ERROR_NO_INTERFACE;
}
}
var PluginHostFactory = {
createInstance: function (outer, iid) {
if (outer != null)
throw Components.results.NS_ERROR_NO_AGGREGATION;
return PluginHost.QueryInterface(iid);
}
};
// Don't need the full interface, attempts to call other methods will just
// throw which is just fine
var WindowWatcher = {
openWindow: function(parent, url, name, features, arguments) {
// Should be called to list the newly blocklisted items
do_check_eq(url, URI_EXTENSION_LIST_DIALOG);
do_check_neq(gCallback, null);
do_check_true(arguments instanceof Components.interfaces.nsIDialogParamBlock);
gNewBlocks = [];
var count = arguments.GetInt(1);
for (var i = 0; i < count; i++)
gNewBlocks.push(arguments.GetString(i));
// Call the callback after the blocklist has finished up
do_timeout(0, "gCallback()");
},
QueryInterface: function(iid) {
if (iid.equals(Components.interfaces.nsIWindowWatcher)
|| iid.equals(Components.interfaces.nsISupports))
return this;
throw Components.results.NS_ERROR_NO_INTERFACE;
}
}
var WindowWatcherFactory = {
createInstance: function createInstance(outer, iid) {
if (outer != null)
throw Components.results.NS_ERROR_NO_AGGREGATION;
return WindowWatcher.QueryInterface(iid);
}
};
var registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
registrar.registerFactory(Components.ID("{721c3e73-969e-474b-a6dc-059fd288c428}"),
"Fake Plugin Host",
"@mozilla.org/plugin/host;1", PluginHostFactory);
registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"),
"Fake Window Watcher",
"@mozilla.org/embedcomp/window-watcher;1", WindowWatcherFactory);
function create_addon(addon) {
var installrdf = "<?xml version=\"1.0\"?>\n" +
"\n" +
"<RDF xmlns=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n" +
" xmlns:em=\"http://www.mozilla.org/2004/em-rdf#\">\n" +
" <Description about=\"urn:mozilla:install-manifest\">\n" +
" <em:id>" + addon.id + "</em:id>\n" +
" <em:version>" + addon.version + "</em:version>\n" +
" <em:targetApplication>\n" +
" <Description>\n" +
" <em:id>xpcshell@tests.mozilla.org</em:id>\n" +
" <em:minVersion>3</em:minVersion>\n" +
" <em:maxVersion>3</em:maxVersion>\n" +
" </Description>\n" +
" </em:targetApplication>\n" +
" <em:name>" + addon.name + "</em:name>\n" +
" </Description>\n" +
"</RDF>\n";
var target = gProfD.clone();
target.append("extensions");
target.append(addon.id);
target.append("install.rdf");
target.create(target.NORMAL_FILE_TYPE, 0644);
var stream = Components.classes["@mozilla.org/network/file-output-stream;1"]
.createInstance(Components.interfaces.nsIFileOutputStream);
stream.init(target, 0x04 | 0x08 | 0x20, 0664, 0); // write, create, truncate
stream.write(installrdf, installrdf.length);
stream.close();
}
/**
* Checks that items are blocklisted correctly according to the current test.
* If a lastTest is provided checks that the notification dialog got passed
* the newly blocked items compared to the previous test.
*/
function check_state(test, lastTest) {
for (var i = 0; i < ADDONS.length; i++) {
var blocked = getManifestProperty(ADDONS[i].id, "blocklisted") == "true";
if (blocked != ADDONS[i][test])
do_throw("Blocklist state did not match expected for extension " + (i + 1) + ", test " + test);
}
for (i = 0; i < PLUGINS.length; i++) {
if (PLUGINS[i].blocklisted != PLUGINS[i][test])
do_throw("Blocklist state did not match expected for plugin " + (i + 1) + ", test " + test);
}
if (lastTest) {
var expected = 0;
for (i = 0; i < ADDONS.length; i++) {
if (ADDONS[i][test] && !ADDONS[i][lastTest]) {
if (gNewBlocks.indexOf(ADDONS[i].name + " " + ADDONS[i].version) < 0)
do_throw("Addon " + (i + 1) + " should have been listed in the blocklist notification for test " + test);
expected++;
}
}
do_check_eq(expected, gNewBlocks.length);
}
}
function load_blocklist(file) {
gPrefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
var blocklist = Components.classes["@mozilla.org/extensions/blocklist;1"]
.getService(Components.interfaces.nsITimerCallback);
blocklist.notify(null);
}
function run_test() {
// Setup for test
dump("Setting up tests\n");
// Rather than keeping lots of identical add-ons in version control, just
// write them into the profile.
for (var i = 0; i < ADDONS.length; i++)
create_addon(ADDONS[i]);
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupEM();
gTestserver = new nsHttpServer();
gTestserver.registerDirectory("/data/", do_get_file("toolkit/mozapps/extensions/test/unit/data"));
gTestserver.start(4444);
do_test_pending();
check_test_pt1();
}
/**
* Checks the initial state is correct
*/
function check_test_pt1() {
dump("Checking pt 1\n");
for (var i = 0; i < ADDONS.length; i++) {
if (!gEM.getItemForID(ADDONS[i].id))
do_throw("Addon " + (i + 1) + " did not get installed correctly");
}
check_state("start", null);
run_test_pt2();
}
/**
* Load the toolkit based blocks
*/
function run_test_pt2() {
dump("Running test pt 2\n");
gCallback = check_test_pt2;
load_blocklist("test_bug449027_toolkit.xml");
}
function check_test_pt2() {
dump("Checking pt 2\n");
check_state("toolkitBlocks", "start");
run_test_pt3();
}
/**
* Load the application based blocks
*/
function run_test_pt3() {
dump("Running test pt 3\n");
gCallback = check_test_pt3;
load_blocklist("test_bug449027_app.xml");
}
function check_test_pt3() {
dump("Checking pt 3\n");
check_state("appBlocks", "toolkitBlocks");
gTestserver.stop();
do_test_finished();
}