wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 804623 - Permission Prompt Helper needs more access context to enable/disable permissions. r=sicking

Browse Source
This commit is contained in:
Gregor Wagner 2013-04-04 17:47:46 -07:00
parent 81b4a55b18
commit deccc07486
1 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dom/permission/PermissionPromptHelper.jsm
View File

@ -59,37 +59,25 @@ this.PermissionPromptHelper = {
askPermission: function askPermission(aMessage, aCallbacks) {
let msg = aMessage.json;
let access;
if (PermissionsTable[msg.type].access) {
access = "readwrite"; // XXXddahl: Not sure if this should be set to READWRITE
let access = msg.type;
if (msg.access) {
access = access + "-" + msg.access;
}
// Expand permission names.
let expandedPermNames = expandPermissions(msg.type, access);
let installedPermValues = [];
let uri = Services.io.newURI(msg.origin, null, null);
let principal =
secMan.getAppCodebasePrincipal(uri, msg.appID, msg.browserFlag);
for (let idx in expandedPermNames) {
let access = msg.access ? expandedPermNames[idx] : msg.type;
let permValue =
permissionManager.testExactPermissionFromPrincipal(principal, access);
installedPermValues.push(permValue);
}
// TODO: see bug 804623, We are preventing "read" operations
// even if just "write" has been set to DENY_ACTION
for (let idx in installedPermValues) {
// if any of the installedPermValues are deny, run aCallbacks.cancel
if (installedPermValues[idx] == Ci.nsIPermissionManager.DENY_ACTION ||
installedPermValues[idx] == Ci.nsIPermissionManager.UNKNOWN_ACTION) {
if (permValue == Ci.nsIPermissionManager.DENY_ACTION ||
permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {
aCallbacks.cancel();
return;
}
}
for (let idx in installedPermValues) {
if (installedPermValues[idx] == Ci.nsIPermissionManager.PROMPT_ACTION) {
if (permValue == Ci.nsIPermissionManager.PROMPT_ACTION) {
// create a nsIContentPermissionRequest
let request = {
type: msg.type,
@ -104,14 +92,11 @@ this.PermissionPromptHelper = {
permissionPromptService.getPermission(request);
return;
}
}
for (let idx in installedPermValues) {
if (installedPermValues[idx] == Ci.nsIPermissionManager.ALLOW_ACTION) {
if (permValue == Ci.nsIPermissionManager.ALLOW_ACTION) {
aCallbacks.allow();
return;
}
}
},
observe: function observe(aSubject, aTopic, aData) {