Skip to content

Commit 65f81d4

Browse files
committed
vm: share security token between contexts
By default, each `v8::Context` has a different Security Token, which prevents access to one context from another. fix nodejs#7140
1 parent 7b9771f commit 65f81d4

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

src/node_contextify.cc

+5-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,11 @@ class ContextifyContext {
224224
CreateDataWrapper(env));
225225
object_template->SetAccessCheckCallbacks(GlobalPropertyNamedAccessCheck,
226226
GlobalPropertyIndexedAccessCheck);
227-
return scope.Escape(Context::New(env->isolate(), NULL, object_template));
227+
228+
Local<Context> ctx = Context::New(env->isolate(), NULL, object_template);
229+
if (!ctx.IsEmpty())
230+
ctx->SetSecurityToken(env->context()->GetSecurityToken());
231+
return scope.Escape(ctx);
228232
}
229233

230234

test/simple/test-vm-cross-context.js

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
25+
var vm = require('vm');
26+
var ctx = vm.createContext(global);
27+
28+
assert.doesNotThrow(function() {
29+
vm.runInContext("!function() { var x = console.log; }()", ctx);
30+
});

0 commit comments

Comments
 (0)