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

Fixing bug 410851. Expose a faster way of getting the subject principal, and use that from performance critical code. r+sr=mrbkap@gmail.com

Browse Source
This commit is contained in:
jst@mozilla.org 2008-01-04 15:59:12 -08:00
parent 7f395b6ddc
commit 41ea116da8
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
caps/idl/nsIScriptSecurityManager.idl
View File

@ -42,7 +42,7 @@ interface nsIURI;
interface nsIChannel;
[scriptable, uuid(0b8a9b32-713f-4c39-bea0-6cacec46f385)]
[scriptable, uuid(ce216cf7-3bcb-48ab-9ff8-d03a24f19ca5)]
interface nsIScriptSecurityManager : nsIXPCSecurityManager
{
///////////////// Security Checks //////////////////
@ -317,6 +317,14 @@ interface nsIScriptSecurityManager : nsIXPCSecurityManager
* script to check whether a given principal is system.
*/
boolean isSystemPrincipal(in nsIPrincipal aPrincipal);
/**
* Same as getSubjectPrincipal(), only faster. cx must *never* be
* passed null, and it must be the context on the top of the
* context stack. Does *not* reference count the returned
* principal.
*/
[noscript,notxpcom] nsIPrincipal getCxSubjectPrincipal(in JSContextPtr cx);
};
%{C++

14
caps/src/nsScriptSecurityManager.cpp
View File

@ -470,6 +470,20 @@ nsScriptSecurityManager::IsSystemPrincipal(nsIPrincipal* aPrincipal,
return NS_OK;
}
NS_IMETHODIMP_(nsIPrincipal *)
nsScriptSecurityManager::GetCxSubjectPrincipal(JSContext *cx)
{
NS_ASSERTION(cx == GetCurrentJSContext(),
"Uh, cx is not the current JS context!");
nsresult rv = NS_ERROR_FAILURE;
nsIPrincipal *principal = GetSubjectPrincipal(cx, &rv);
if (NS_FAILED(rv))
return nsnull;
return principal;
}
////////////////////
// Policy Storage //
////////////////////

7
js/src/xpconnect/shell/xpcshell.cpp
View File

@ -1198,6 +1198,13 @@ FullTrustSecMan::IsSystemPrincipal(nsIPrincipal *aPrincipal, PRBool *_retval)
*_retval = aPrincipal == mSystemPrincipal;
return NS_OK;
}
NS_IMETHODIMP_(nsIPrincipal *)
FullTrustSecMan::GetCxSubjectPrincipal(JSContext *cx)
{
return mSystemPrincipal;
}
#endif
/***************************************************************************/

8
js/src/xpconnect/src/XPCCrossOriginWrapper.cpp
View File

@ -230,8 +230,6 @@ IsValFrame(JSContext *cx, JSObject *obj, jsval v, XPCWrappedNative *wn)
nsresult
IsWrapperSameOrigin(JSContext *cx, JSObject *wrappedObj)
{
nsCOMPtr<nsIPrincipal> subjectPrin, objectPrin;
// Get the subject principal from the execution stack.
nsIScriptSecurityManager *ssm = GetSecurityManager();
if (!ssm) {
@ -239,8 +237,7 @@ IsWrapperSameOrigin(JSContext *cx, JSObject *wrappedObj)
return NS_ERROR_NOT_INITIALIZED;
}
nsresult rv = ssm->GetSubjectPrincipal(getter_AddRefs(subjectPrin));
NS_ENSURE_SUCCESS(rv, rv);
nsIPrincipal *subjectPrin = ssm->GetCxSubjectPrincipal(cx);
if (!subjectPrin) {
ThrowException(NS_ERROR_FAILURE, cx);
@ -248,7 +245,7 @@ IsWrapperSameOrigin(JSContext *cx, JSObject *wrappedObj)
}
PRBool isSystem = PR_FALSE;
rv = ssm->IsSystemPrincipal(subjectPrin, &isSystem);
nsresult rv = ssm->IsSystemPrincipal(subjectPrin, &isSystem);
NS_ENSURE_SUCCESS(rv, rv);
// If we somehow end up being called from chrome, just allow full access.
@ -257,6 +254,7 @@ IsWrapperSameOrigin(JSContext *cx, JSObject *wrappedObj)
return NS_OK;
}
nsCOMPtr<nsIPrincipal> objectPrin;
rv = ssm->GetObjectPrincipal(cx, wrappedObj, getter_AddRefs(objectPrin));
if (NS_FAILED(rv)) {
return rv;

6
js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp
View File

@ -118,11 +118,13 @@ FindPrincipals(JSContext *cx, JSObject *obj, nsIPrincipal **objectPrincipal,
nsCOMPtr<nsIScriptSecurityManager> ssm(do_QueryInterface(sm));
if (subjectPrincipal) {
ssm->GetSubjectPrincipal(subjectPrincipal);
nsCOMPtr<nsIPrincipal> tmp = ssm->GetCxSubjectPrincipal(cx);
if (!*subjectPrincipal) {
if (!tmp) {
return NS_ERROR_XPC_SECURITY_MANAGER_VETO;
}
tmp.swap(*subjectPrincipal);
}
ssm->GetObjectPrincipal(cx, obj, objectPrincipal);