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

Bug 1165162 - Stop recreating principals from the message manager. r=smaug

Browse Source
This commit is contained in:
Bobby Holley 2015-05-19 16:49:28 -07:00
parent a9e0bc1a93
commit 42151b7774
4 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/datastore/DataStoreChangeNotifier.jsm
View File

@ -146,14 +146,7 @@ this.DataStoreChangeNotifier = {
// No check has to be done when the message is 'child-process-shutdown'.
if (aMessage.name != "child-process-shutdown") {
if (!("principal" in aMessage)) {
return;
}
let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
.getService(Ci.nsIScriptSecurityManager);
let uri = Services.io.newURI(aMessage.principal.origin, null, null);
let principal = secMan.getAppCodebasePrincipal(uri,
aMessage.principal.appId, aMessage.principal.isInBrowserElement);
let principal = aMessage.principal;
if (!principal || !dataStoreService.checkPermission(principal)) {
return;
}

7
dom/identity/DOMIdentity.jsm
View File

@ -277,14 +277,9 @@ this.DOMIdentity = {
if (!aMessage.principal) {
return false;
}
let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
.getService(Ci.nsIScriptSecurityManager);
let uri = Services.io.newURI(aMessage.principal.origin, null, null);
let principal = secMan.getAppCodebasePrincipal(uri,
aMessage.principal.appId, aMessage.principal.isInBrowserElement);
let permission =
permissionManager.testPermissionFromPrincipal(principal,
permissionManager.testPermissionFromPrincipal(aMessage.principal,
FXA_PERMISSION);
return permission != Ci.nsIPermissionManager.UNKNOWN_ACTION &&
permission != Ci.nsIPermissionManager.DENY_ACTION;

15
dom/requestsync/RequestSyncService.jsm
View File

@ -287,20 +287,7 @@ this.RequestSyncService = {
}
// The principal is used to validate the message.
if (!aMessage.principal) {
return;
}
let uri = Services.io.newURI(aMessage.principal.origin, null, null);
let principal;
try {
principal = secMan.getAppCodebasePrincipal(uri,
aMessage.principal.appId, aMessage.principal.isInBrowserElement);
} catch(e) {
return;
}
let principal = aMessage.principal;
if (!principal) {
return;
}

9
services/fxaccounts/FxAccountsManager.jsm
View File

@ -510,14 +510,9 @@ this.FxAccountsManager = {
return this._error(ERROR_INVALID_AUDIENCE);
}
let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
.getService(Ci.nsIScriptSecurityManager);
let uri = Services.io.newURI(aPrincipal.origin, null, null);
let principal = aPrincipal;
log.debug("FxAccountsManager.getAssertion() aPrincipal: ",
aPrincipal.origin, aPrincipal.appId,
aPrincipal.isInBrowserElement);
let principal = secMan.getAppCodebasePrincipal(uri,
aPrincipal.appId, aPrincipal.isInBrowserElement);
principal.origin, principal.appId, principal.isInBrowserElement);
return this.getAccount().then(
user => {