mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 304048 - Backing out patch due to TXUL regression.

This commit is contained in:
bent.mozilla@gmail.com 2007-08-30 17:52:58 -07:00
Родитель aa94dc5ec9
Коммит c0215549f6
7 изменённых файлов: 18 добавлений и 149 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

44
caps/src/nsScriptSecurityManager.cpp
Просмотреть файл

@ -493,12 +493,6 @@ nsScriptSecurityManager::CheckObjectAccess(JSContext *cx, JSObject *obj,
if (!ssm)
return JS_FALSE;
nsCOMPtr<nsISupports> native;
nsresult rv =
sXPConnect->GetNativeOfJSObject(cx, obj,
NS_GET_IID(nsISupports),
getter_AddRefs(native));
// Get the object being accessed. We protect these cases:
// 1. The Function.prototype.caller property's value, which might lead
// an attacker up a call-stack to a function or another object from
@ -511,13 +505,11 @@ nsScriptSecurityManager::CheckObjectAccess(JSContext *cx, JSObject *obj,
// Do the same-origin check -- this sets a JS exception if the check fails.
// Pass the parent object's class name, as we have no class-info for it.
rv = ssm->CheckPropertyAccessImpl(( (mode & JSACC_WRITE) ?
nsIXPCSecurityManager::ACCESS_SET_PROPERTY :
nsIXPCSecurityManager::ACCESS_GET_PROPERTY ),
nsnull, cx, target, native, nsnull,
nsnull, JS_GET_CLASS(cx, obj)->name, id,
nsnull);
nsresult rv =
ssm->CheckPropertyAccess(cx, target, JS_GetClass(cx, obj)->name, id,
(mode & JSACC_WRITE) ?
nsIXPCSecurityManager::ACCESS_SET_PROPERTY :
nsIXPCSecurityManager::ACCESS_GET_PROPERTY);
if (NS_FAILED(rv))
return JS_FALSE; // Security check failed (XXX was an error reported?)
@ -779,24 +771,14 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
nsXPIDLCString objectSecurityLevel;
if (checkedComponent)
{
const nsIID* objIID = nsnull;
if (aCallContext) {
// If we have a call context, find the wrapper and the IID
// with the member in question to pass to
// nsISecurityCheckedComponent, if not, pass a null IID
// and it's up to the implementation to decide whether or
// not it wants to permit access.
nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
nsCOMPtr<nsIInterfaceInfo> interfaceInfo;
rv = aCallContext->GetCalleeWrapper(getter_AddRefs(wrapper));
if (NS_SUCCEEDED(rv))
rv = wrapper->FindInterfaceWithMember(aProperty, getter_AddRefs(interfaceInfo));
if (NS_SUCCEEDED(rv))
rv = interfaceInfo->GetIIDShared(&objIID);
} else {
rv = NS_OK;
}
nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
nsCOMPtr<nsIInterfaceInfo> interfaceInfo;
const nsIID* objIID;
rv = aCallContext->GetCalleeWrapper(getter_AddRefs(wrapper));
if (NS_SUCCEEDED(rv))
rv = wrapper->FindInterfaceWithMember(aProperty, getter_AddRefs(interfaceInfo));
if (NS_SUCCEEDED(rv))
rv = interfaceInfo->GetIIDShared(&objIID);
if (NS_SUCCEEDED(rv))
{
switch (aAction)

11
js/src/xpconnect/idl/nsIXPConnect.idl
Просмотреть файл

@ -674,17 +674,6 @@ interface nsIXPConnect : nsISupports
*/
void flagSystemFilenamePrefix(in string aFilenamePrefix);
/**
* Get a native pointer of type aIID from aJSObject if the object
* is a wrapped native or a wrapped JS object, but never create a
* new wrapper, only use existing ones.
*/
void
getNativeOfJSObject(in JSContextPtr aJSContext,
in JSObjectPtr aJSObj,
in nsIIDRef aIID,
[iid_is(aIID),retval] out nsQIResult result);
/**
* Restore an old prototype for wrapped natives of type
* aClassInfo. This should be used only when restoring an old

1
js/src/xpconnect/src/XPCDispConvert.cpp
Просмотреть файл

@ -331,7 +331,6 @@ JSBool XPCDispConvert::JSToCOM(XPCCallContext& ccx,
obj,
&NSID_IDISPATCH,
nsnull,
PR_TRUE,
&err))
{
// Avoid cleaning up garbage

28
js/src/xpconnect/src/nsXPConnect.cpp
Просмотреть файл

@ -1112,7 +1112,7 @@ nsXPConnect::WrapJS(JSContext * aJSContext,
nsresult rv;
if(!XPCConvert::JSObject2NativeInterface(ccx, result, aJSObj,
&aIID, nsnull, PR_TRUE, &rv))
&aIID, nsnull, &rv))
return rv;
return NS_OK;
}
@ -1138,7 +1138,7 @@ nsXPConnect::WrapJSAggregatedToNative(nsISupports *aOuter,
nsresult rv;
if(!XPCConvert::JSObject2NativeInterface(ccx, result, aJSObj,
&aIID, aOuter, PR_TRUE, &rv))
&aIID, aOuter, &rv))
return rv;
return NS_OK;
}
@ -2097,30 +2097,6 @@ nsXPConnect::OnDispatchedEvent(nsIThreadInternal* aThread)
return NS_ERROR_UNEXPECTED;
}
/* void getNativeOfJSObject(in JSContextPtr aJSContext, in JSObjectPtr aJSObj, in nsIIDRef aIID, [iid_is(aIID),retval] out nsQIResult result); */
NS_IMETHODIMP
nsXPConnect::GetNativeOfJSObject(JSContext * aJSContext,
JSObject * aJSObj,
const nsIID & aIID,
void * *result)
{
NS_ASSERTION(aJSContext, "bad param");
NS_ASSERTION(aJSObj, "bad param");
NS_ASSERTION(result, "bad param");
*result = nsnull;
XPCCallContext ccx(NATIVE_CALLER, aJSContext);
if(!ccx.IsValid())
return UnexpectedFailure(NS_ERROR_FAILURE);
nsresult rv;
if(!XPCConvert::JSObject2NativeInterface(ccx, result, aJSObj,
&aIID, nsnull, PR_FALSE, &rv))
return rv;
return NS_OK;
}
#ifdef DEBUG
/* These are here to be callable from a debugger */
JS_BEGIN_EXTERN_C

14
js/src/xpconnect/src/xpcconvert.cpp
Просмотреть файл

@ -1030,7 +1030,7 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
}
return JSObject2NativeInterface(ccx, (void**)d, obj, iid,
nsnull, PR_TRUE, pErr);
nsnull, pErr);
}
default:
NS_ASSERTION(0, "bad type");
@ -1230,7 +1230,6 @@ XPCConvert::JSObject2NativeInterface(XPCCallContext& ccx,
void** dest, JSObject* src,
const nsID* iid,
nsISupports* aOuter,
PRBool allowCreateNew,
nsresult* pErr)
{
NS_ASSERTION(dest, "bad param");
@ -1240,7 +1239,7 @@ XPCConvert::JSObject2NativeInterface(XPCCallContext& ccx,
JSContext* cx = ccx.GetJSContext();
*dest = nsnull;
if(pErr)
if(pErr)
*pErr = NS_ERROR_XPC_BAD_CONVERT_JS;
nsISupports* iface;
@ -1289,15 +1288,8 @@ XPCConvert::JSObject2NativeInterface(XPCCallContext& ccx,
// else...
nsresult rv;
nsXPCWrappedJS* wrapper;
if (allowCreateNew) {
rv = nsXPCWrappedJS::GetNewOrUsed(ccx, src, *iid, aOuter, &wrapper);
} else {
rv = nsXPCWrappedJS::GetUsedOnly(ccx, src, *iid, aOuter, &wrapper);
}
nsresult rv = nsXPCWrappedJS::GetNewOrUsed(ccx, src, *iid, aOuter, &wrapper);
if(pErr)
*pErr = rv;
if(NS_SUCCEEDED(rv) && wrapper)

7
js/src/xpconnect/src/xpcprivate.h
Просмотреть файл

@ -2356,12 +2356,6 @@ public:
REFNSIID aIID,
nsISupports* aOuter,
nsXPCWrappedJS** wrapper);
static nsresult
GetUsedOnly(XPCCallContext& ccx,
JSObject* aJSObj,
REFNSIID aIID,
nsISupports* aOuter,
nsXPCWrappedJS** wrapperResult);
nsISomeInterface* GetXPTCStub() { return mXPTCStub; }
JSObject* GetJSObject() const {return mJSObj;}
@ -2537,7 +2531,6 @@ public:
void** dest, JSObject* src,
const nsID* iid,
nsISupports* aOuter,
PRBool allowCreateNew,
nsresult* pErr);
/**

62
js/src/xpconnect/src/xpcwrappedjs.cpp
Просмотреть файл

@ -417,68 +417,6 @@ return_wrapper:
return NS_OK;
}
// static
nsresult
nsXPCWrappedJS::GetUsedOnly(XPCCallContext& ccx,
JSObject* aJSObj,
REFNSIID aIID,
nsISupports* aOuter,
nsXPCWrappedJS** wrapperResult)
{
JSObject2WrappedJSMap* map;
JSBool hasProp;
JSObject* rootJSObj;
nsXPCWrappedJS* root;
nsXPCWrappedJS* wrapper = nsnull;
nsXPCWrappedJSClass *clazz = nsnull;
XPCJSRuntime* rt = ccx.GetRuntime();
map = rt->GetWrappedJSMap();
if(!map)
{
NS_ASSERTION(map,"bad map");
return NS_ERROR_FAILURE;
}
nsXPCWrappedJSClass::GetNewOrUsed(ccx, aIID, &clazz);
if(!clazz)
return NS_ERROR_FAILURE;
// GetRootJSObject will attempt to call a QueryInterface function on
// aJSObj. If QueryInterface doesn't exist on the object then a strict
// warning will be emitted, so check to make sure that the QueryInterface
// function exists before proceeding.
if(JS_HasProperty(ccx.GetJSContext(), aJSObj,
rt->GetStringName(XPCJSRuntime::IDX_QUERY_INTERFACE),
&hasProp) && hasProp)
rootJSObj = clazz->GetRootJSObject(ccx, aJSObj);
else
rootJSObj = aJSObj;
NS_RELEASE(clazz);
if(!rootJSObj)
return NS_ERROR_FAILURE;
// look for the root wrapper
{ // scoped lock
XPCAutoLock lock(rt->GetMapLock());
root = map->Find(rootJSObj);
}
if(root)
{
if((nsnull != (wrapper = root->Find(aIID))) ||
(nsnull != (wrapper = root->FindInherited(aIID))))
{
NS_ADDREF(wrapper);
}
}
*wrapperResult = wrapper;
return NS_OK;
}
nsXPCWrappedJS::nsXPCWrappedJS(XPCCallContext& ccx,
JSObject* aJSObj,
nsXPCWrappedJSClass* aClass,