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

Bug 1081990 - Give all non-COW filtering wrappers a null proto. r=gabor

Browse Source
This commit is contained in:
Bobby Holley 2014-10-18 11:02:10 +02:00
parent 22acd2e45d
commit 48adeafe98
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/xpconnect/wrappers/AccessCheck.h
View File

@ -35,6 +35,7 @@ enum CrossOriginObjectType {
CrossOriginObjectType IdentifyCrossOriginObject(JSObject *obj);
struct Policy {
static const bool AllowGetPrototypeOf = false;
};
// This policy allows no interaction with the underlying callable. Everything throws.
@ -83,6 +84,12 @@ struct CrossOriginAccessiblePropertiesOnly : public Policy {
// This policy only permits access to properties if they appear in the
// objects exposed properties list.
struct ExposedPropertiesOnly : public Policy {
// COWs are the only type of filtering wrapper that allow access to the
// prototype, because the standard prototypes are remapped into the
// wrapper's compartment.
static const bool AllowGetPrototypeOf = true;
static bool check(JSContext *cx, JS::HandleObject wrapper, JS::HandleId id, js::Wrapper::Action act);
static bool deny(js::Wrapper::Action act, JS::HandleId id);

23
js/xpconnect/wrappers/FilteringWrapper.cpp
View File

@ -152,6 +152,20 @@ FilteringWrapper<Base, Policy>::defaultValue(JSContext *cx, HandleObject obj,
return Base::defaultValue(cx, obj, hint, vp);
}
template <typename Base, typename Policy>
bool
FilteringWrapper<Base, Policy>::getPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
JS::MutableHandleObject protop) const
{
// If the policy explicitly allows access to the prototype, bounce to the base.
if (Policy::AllowGetPrototypeOf)
return Base::getPrototypeOf(cx, wrapper, protop);
// In general, filtering wrappers do not allow access to the prototype.
protop.set(nullptr);
return true;
}
template <typename Base, typename Policy>
bool
FilteringWrapper<Base, Policy>::enter(JSContext *cx, HandleObject wrapper,
@ -201,15 +215,6 @@ CrossOriginXrayWrapper::getOwnPropertyDescriptor(JSContext *cx,
return getPropertyDescriptor(cx, wrapper, id, desc);
}
bool
CrossOriginXrayWrapper::getPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
JS::MutableHandleObject protop) const
{
// Cross-origin objects have null prototypes.
protop.set(nullptr);
return true;
}
bool
CrossOriginXrayWrapper::ownPropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
JS::AutoIdVector &props) const

5
js/xpconnect/wrappers/FilteringWrapper.h
View File

@ -49,6 +49,9 @@ class FilteringWrapper : public Base {
virtual bool defaultValue(JSContext *cx, JS::Handle<JSObject*> obj, JSType hint,
JS::MutableHandleValue vp) const MOZ_OVERRIDE;
virtual bool getPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
JS::MutableHandleObject protop) const MOZ_OVERRIDE;
static const FilteringWrapper singleton;
};
@ -73,8 +76,6 @@ class CrossOriginXrayWrapper : public SecurityXrayDOM {
JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper,
JS::AutoIdVector &props) const MOZ_OVERRIDE;
virtual bool getPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
JS::MutableHandleObject protop) const MOZ_OVERRIDE;
virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
JS::Handle<jsid> id,