Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 816847 - Use AppService instead of Webapps.jsm for manifest lookup. r=jgriffin

Browse Source
This commit is contained in:
David Chan 2012-11-30 10:52:40 -08:00
parent b70337e19a
commit 345efe131e
4 changed files with 108 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/mochitest/android.json
View File

@ -328,6 +328,7 @@
"uriloader/exthandler/tests/mochitest/test_handlerApps.xhtml": "",
"widget/tests/test_bug760802.html": "",
"dom/tests/mochitest/ajax/offline": "SLOW_DIRECTORY",
"layout/base/tests": "SLOW_DIRECTORY"
"layout/base/tests": "SLOW_DIRECTORY",
"Harness_sanity/test_bug816847.html": "No test app installed"
}
}

1
testing/mochitest/tests/Makefile.in
View File

@ -27,6 +27,7 @@ _TEST_FILES = \
test_SpecialPowersExtension.html \
test_SpecialPowersExtension2.html \
file_SpecialPowersFrame1.html \
test_bug816847.html \
$(NULL)
ifneq ($(OS_TARGET),Android)

101
testing/mochitest/tests/test_bug816847.html Normal file
View File

@ -0,0 +1,101 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=816847
-->
<head>
<title>Test for Bug 816847</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="starttest();">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=816847">Mozilla Bug 816847</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 816847 **/
SimpleTest.waitForExplicitFinish();
const Cc = SpecialPowers.Cc;
const Ci = SpecialPowers.Ci;
const Cu = SpecialPowers.Cu;
const Services = Cu.import("resource://gre/modules/Services.jsm").Services;
const appsSvc = Cc["@mozilla.org/AppsService;1"]
.getService(Ci.nsIAppsService)
const manifest = "https://example.com/manifest.webapp";
const allow = Ci.nsIPermissionManager.ALLOW_ACTION;
const unknown = Ci.nsIPermissionManager.UNKNOWN_ACTION;
const perms = ['network-events', 'geolocation', 'camera', 'alarms']
function createPrincipal(aURI, aIsApp, aIsInBrowserElement) {
if(aIsApp) {
var app = appsSvc.getAppByManifestURL(aURI);
var localId = appsSvc.getAppLocalIdByManifestURL(aURI);
var uri = Services.io.newURI(app.origin, null, null);
return Services.scriptSecurityManager
.getAppCodebasePrincipal(uri,
localId,
aIsInBrowserElement);
}
var uri = Services.io.newURI(aURI, null, null);
return Services.scriptSecurityManager
.getNoAppCodebasePrincipal(uri);
}
// test addPermission and removePermission
function starttest(){
var app = appsSvc.getAppByManifestURL(manifest);
ok(app != null, "Got an app ");
var origin = app.origin
var nodePrincipal = SpecialPowers.getNodePrincipal(document);
var appPrincipal = createPrincipal(manifest, true);
var noappPrincipal = createPrincipal(origin, false);
SpecialPowers.addPermission(perms[0], true, origin);
SpecialPowers.addPermission(perms[1], true, {manifestURL: manifest});
SpecialPowers.addPermission(perms[2], true, document);
SpecialPowers.addPermission(perms[3], true, {url: origin,
appId: Ci.nsIScriptSecurityManager.NO_APP_ID});
is(Services.perms.testPermissionFromPrincipal(noappPrincipal, perms[0]),
allow, "Set permission by string");
is(Services.perms.testPermissionFromPrincipal(appPrincipal, perms[1]),
allow, "Set permission by manifestURL");
is(Services.perms.testPermissionFromPrincipal(nodePrincipal, perms[2]),
allow, "Set permission by principal");
is(Services.perms.testPermissionFromPrincipal(noappPrincipal, perms[3]),
allow, "Set permission by other");
is(Services.perms.testPermissionFromPrincipal(noappPrincipal, perms[1]),
unknown, "Check that app permission doesn't leak to normal page");
SpecialPowers.removePermission(perms[0], origin);
SpecialPowers.removePermission(perms[1], {manifestURL: manifest});
SpecialPowers.removePermission(perms[2], document);
SpecialPowers.removePermission(perms[3], {url: origin,
appId: Ci.nsIScriptSecurityManager.NO_APP_ID});
is(Services.perms.testPermissionFromPrincipal(noappPrincipal, perms[0]),
unknown, "Removed permission by string");
is(Services.perms.testPermissionFromPrincipal(appPrincipal, perms[1]),
unknown, "Removed permission by manifestURL");
is(Services.perms.testPermissionFromPrincipal(nodePrincipal, perms[2]),
unknown, "Removed permission by principal");
is(Services.perms.testPermissionFromPrincipal(noappPrincipal, perms[3]),
unknown, "Removed permission by other");
SimpleTest.finish();
}
</script>
</pre>
</body>
</html>

8
testing/specialpowers/content/specialpowersAPI.js
View File

@ -1240,15 +1240,15 @@ SpecialPowersAPI.prototype = {
.spec;
} else if (arg.manifestURL) {
// It's a thing representing an app.
let tmp = {};
Cu.import("resource://gre/modules/Webapps.jsm", tmp);
let appsSvc = Cc["@mozilla.org/AppsService;1"]
.getService(Ci.nsIAppsService)
let app = appsSvc.getAppByManifestURL(arg.manifestURL);
let app = tmp.DOMApplicationRegistry.getAppByManifestURL(arg.manifestURL);
if (!app) {
throw "No app for this manifest!";
}
appId = app.localId;
appId = appsSvc.getAppLocalIdByManifestURL(arg.manifestURL);
url = app.origin;
isInBrowserElement = arg.isInBrowserElement || false;
} else if (arg.nodePrincipal) {