Bug 769621 - Checking Contacts, Settings, Wifi and WebApps permission…

… should use principal instead of URI. r=sicking
dothq · Jul 16, 2012 · 7f510a6 · 7f510a6
1 parent 99507ad
commit 7f510a6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/dom/apps/src/Webapps.js b/dom/apps/src/Webapps.js
@@ -345,9 +345,9 @@ function WebappsApplicationMgmt(aWindow) {
   let principal = aWindow.document.nodePrincipal;
   let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
 
-  let perm = principal == secMan.getSystemPrincipal() ? 
-               Ci.nsIPermissionManager.ALLOW_ACTION : 
-               Services.perms.testExactPermission(principal.URI, "webapps-manage");
+  let perm = principal == secMan.getSystemPrincipal()
+               ? Ci.nsIPermissionManager.ALLOW_ACTION
+               : Services.perms.testExactPermissionFromPrincipal(principal, "webapps-manage");
 
   //only pages with perm set can use some functions
   this.hasPrivileges = perm == Ci.nsIPermissionManager.ALLOW_ACTION;

diff --git a/dom/contacts/ContactManager.js b/dom/contacts/ContactManager.js
@@ -456,9 +456,9 @@ ContactManager.prototype = {
     let principal = aWindow.document.nodePrincipal;
     let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
 
-    let perm = principal == secMan.getSystemPrincipal() ? 
-                 Ci.nsIPermissionManager.ALLOW_ACTION : 
-                 Services.perms.testExactPermission(principal.URI, "webcontacts-manage");
+    let perm = principal == secMan.getSystemPrincipal()
+                 ? Ci.nsIPermissionManager.ALLOW_ACTION
+                 : Services.perms.testExactPermissionFromPrincipal(principal, "webcontacts-manage");
 
     //only pages with perm set can use the contacts
     this.hasPrivileges = perm == Ci.nsIPermissionManager.ALLOW_ACTION;

diff --git a/dom/settings/SettingsManager.js b/dom/settings/SettingsManager.js
@@ -321,8 +321,12 @@ SettingsManager.prototype = {
 
     let principal = aWindow.document.nodePrincipal;
     let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
-    let readPerm = principal == secMan.getSystemPrincipal() ? Ci.nsIPermissionManager.ALLOW_ACTION : Services.perms.testExactPermission(principal.URI, "websettings-read");
-    let readwritePerm = principal == secMan.getSystemPrincipal() ? Ci.nsIPermissionManager.ALLOW_ACTION : Services.perms.testExactPermission(principal.URI, "websettings-readwrite");
+    let readPerm = principal == secMan.getSystemPrincipal()
+                     ? Ci.nsIPermissionManager.ALLOW_ACTION
+                     : Services.perms.testExactPermissionFromPrincipal(principal, "websettings-read");
+    let readwritePerm = principal == secMan.getSystemPrincipal()
+                          ? Ci.nsIPermissionManager.ALLOW_ACTION
+                          : Services.perms.testExactPermissionFromPrincipal(principal, "websettings-readwrite");
     this.hasReadPrivileges = readPerm == Ci.nsIPermissionManager.ALLOW_ACTION;
     this.hasReadWritePrivileges = readwritePerm == Ci.nsIPermissionManager.ALLOW_ACTION;
     debug("has read privileges :" + this.hasReadPrivileges + ", has read-write privileges: " + this.hasReadWritePrivileges);

diff --git a/dom/wifi/DOMWifiManager.js b/dom/wifi/DOMWifiManager.js
@@ -61,9 +61,9 @@ DOMWifiManager.prototype = {
     let principal = aWindow.document.nodePrincipal;
     let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
 
-    let perm = (principal == secMan.getSystemPrincipal()) ?
-                 Ci.nsIPermissionManager.ALLOW_ACTION :
-                 Services.perms.testExactPermission(principal.URI, "wifi-manage");
+    let perm = principal == secMan.getSystemPrincipal()
+                 ? Ci.nsIPermissionManager.ALLOW_ACTION
+                 : Services.perms.testExactPermissionFromPrincipal(principal, "wifi-manage");
 
     // Only pages with perm set can use the wifi manager.
     this._hasPrivileges = perm == Ci.nsIPermissionManager.ALLOW_ACTION;