Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Partial fix for #864 - report property attributes from sandbox object #885

Closed
wants to merge 1 commit into from
Closed

Partial fix for #864 - report property attributes from sandbox object #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,15 @@ class ContextifyContext {
Local<Object> proxy_global = PersistentToLocal(isolate,
ctx->proxy_global_);

bool in_sandbox = sandbox->GetRealNamedProperty(property).IsEmpty();
bool in_sandbox = !(sandbox->GetRealNamedProperty(property).IsEmpty());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not HasRealNamedProperty ?

bool in_proxy_global =
proxy_global->GetRealNamedProperty(property).IsEmpty();
if (!in_sandbox || !in_proxy_global) {
args.GetReturnValue().Set(None);
!(proxy_global->GetRealNamedProperty(property).IsEmpty());
if (in_sandbox || in_proxy_global) {
v8::PropertyAttribute attr = None;
if (in_sandbox) {
attr = sandbox->GetPropertyAttributes(property);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we also add if (in_proxy_global) { attr = proxy_global->GetPropertyAttributes(property); } as the fallback?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that. It caused infinite recursion on proxy_global. I think @bnoordhuis has a patch into v8 to add a new api to support this.

That's why this change is "partial fix"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Also given that per #855 I want to at least attempt to rip out proxy global entirely that might end up being unnecessary.

Probably want to leave a TODO(smikes) in the source code though for later.

args.GetReturnValue().Set(attr);
}
}

Expand Down
24 changes: 24 additions & 0 deletions test/parallel/test-vm-preserves-property.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
var common = require('../common');
var assert = require('assert');

var vm = require('vm');

var code = 'Object.getOwnPropertyDescriptor(this, "prop")';

var x = {};
Object.defineProperty(x, "prop", {
configurable: false,
enumerable: false,
writable: false,
value: "val"
});
var o = vm.createContext(x);

var res = vm.runInContext(code, o, 'test');

assert(res);
assert.equal(typeof res, 'object');
assert.equal(res.value, "val");
assert.equal(res.configurable, false, "should not be configurable");
assert.equal(res.enumerable, false, "should not be enumerable");
assert.equal(res.writable, false, "should not be writable");