diff options
author | Jason Carey <jcarey@argv.me> | 2015-09-14 16:19:11 -0400 |
---|---|---|
committer | Jason Carey <jcarey@argv.me> | 2015-09-17 20:13:11 -0400 |
commit | 041e4fe737342bf40a6aedb7a04d8d99ba20e213 (patch) | |
tree | 148c21a538fd93bddf8a1982d463400d73984060 /src/mongo/scripting/mozjs/objectwrapper.cpp | |
parent | 8291bbb3a6ec192d177076b1fb0cd28995e48440 (diff) | |
download | mongo-041e4fe737342bf40a6aedb7a04d8d99ba20e213.tar.gz |
SERVER-20375 Constrain JS method thisv
This constrains universal access to wraptype methods by providing a
JS_ATTACH_JS_CONSTRAINED_METHOD() macro which allows for a list of types
that are allowed to call said method.
In this way we can lock down all methods without having to add uasserts
to each individual method body.
Diffstat (limited to 'src/mongo/scripting/mozjs/objectwrapper.cpp')
-rw-r--r-- | src/mongo/scripting/mozjs/objectwrapper.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/mongo/scripting/mozjs/objectwrapper.cpp b/src/mongo/scripting/mozjs/objectwrapper.cpp index 5ca5cdeca97..2dc17726b37 100644 --- a/src/mongo/scripting/mozjs/objectwrapper.cpp +++ b/src/mongo/scripting/mozjs/objectwrapper.cpp @@ -343,7 +343,7 @@ void ObjectWrapper::writeThis(BSONObjBuilder* b) { auto scope = getScope(_context); BSONObj* originalBSON = nullptr; - if (scope->getBsonProto().instanceOf(_object)) { + if (scope->getProto<BSONInfo>().instanceOf(_object)) { bool altered; std::tie(originalBSON, altered) = BSONInfo::originalBSON(_context, _object); @@ -389,5 +389,17 @@ void ObjectWrapper::_writeField(BSONObjBuilder* b, Key key, BSONObj* originalPar x.writeThis(b, key.toString(_context)); } +std::string ObjectWrapper::getClassName() { + auto jsclass = JS_GetClass(_object); + + if (jsclass) + return jsclass->name; + + JS::RootedValue ctor(_context); + getValue("constructor", &ctor); + + return ObjectWrapper(_context, ctor).getString("name"); +} + } // namespace mozjs } // namespace mongo |