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

Bug 758258 - part 4 - Update CreateCodebasePrincipal() to take app/inbrowser info. r=sicking

Browse Source
This commit is contained in:
Mounir Lamouri 2012-07-19 15:32:08 -07:00
parent 99b949ad17
commit 72c743ad58
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
caps/include/nsScriptSecurityManager.h
View File

@ -436,7 +436,8 @@ private:
SecurityLevel* result);
nsresult
CreateCodebasePrincipal(nsIURI* aURI, nsIPrincipal** result);
CreateCodebasePrincipal(nsIURI* aURI, PRUint32 aAppId, bool aInMozBrowser,
nsIPrincipal** result);
// This is just like the API method, but it doesn't check that the subject
// name is non-empty or aCertificate is non-null, and it doesn't change the

13
caps/src/nsScriptSecurityManager.cpp
View File

@ -1941,7 +1941,9 @@ nsScriptSecurityManager::DoGetCertificatePrincipal(const nsACString& aCertFinger
}
nsresult
nsScriptSecurityManager::CreateCodebasePrincipal(nsIURI* aURI, nsIPrincipal **result)
nsScriptSecurityManager::CreateCodebasePrincipal(nsIURI* aURI, PRUint32 aAppId,
bool aInMozBrowser,
nsIPrincipal **result)
{
// I _think_ it's safe to not create null principals here based on aURI.
// At least all the callers would do the right thing in those cases, as far
@ -1965,8 +1967,8 @@ nsScriptSecurityManager::CreateCodebasePrincipal(nsIURI* aURI, nsIPrincipal **re
return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = codebase->Init(EmptyCString(), EmptyCString(),
EmptyCString(), nsnull, aURI,
nsIScriptSecurityManager::NO_APP_ID, false);
EmptyCString(), nsnull, aURI, aAppId,
aInMozBrowser);
if (NS_FAILED(rv))
return rv;
@ -1989,9 +1991,10 @@ nsScriptSecurityManager::GetCodebasePrincipal(nsIURI *aURI,
if (NS_FAILED(rv) || inheritsPrincipal) {
return CallCreateInstance(NS_NULLPRINCIPAL_CONTRACTID, result);
}
nsCOMPtr<nsIPrincipal> principal;
rv = CreateCodebasePrincipal(aURI, getter_AddRefs(principal));
rv = CreateCodebasePrincipal(aURI, nsIScriptSecurityManager::NO_APP_ID,
false, getter_AddRefs(principal));
if (NS_FAILED(rv)) return rv;
if (mPrincipals.Count() > 0)