Skip to content

Commit

Permalink
contextify: share security token with debug ctx
Browse files Browse the repository at this point in the history
If security token does not match - no changes are allowed to the objects
from different context. We already copy the security token to the newly
created contexts in contextify.cc . Copy the security token to the debug
context too.

Fix: nodejs#9156
  • Loading branch information
indutny committed Feb 6, 2015
1 parent a5dbcc9 commit 30bcce3
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/node_contextify.cc
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,13 @@ class ContextifyContext {
Local<String> script_source(args[0]->ToString());
if (script_source.IsEmpty())
return; // Exception pending.
Context::Scope context_scope(Debug::GetDebugContext());

Environment* env = Environment::GetCurrent(args.GetIsolate());
Local<Context> ctx = Debug::GetDebugContext();
if (!ctx.IsEmpty())
ctx->SetSecurityToken(env->context()->GetSecurityToken());

Context::Scope context_scope(ctx);
Local<Script> script = Script::Compile(script_source);
if (script.IsEmpty())
return; // Exception pending.
Expand Down
33 changes: 33 additions & 0 deletions test/simple/test-vm-debug-context-token.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var vm = require('vm');
var assert = require('assert');

var proto = vm.runInDebugContext('DebugCommandProcessor.prototype');
proto.prop = true;
assert.equal(proto.prop, true);
proto = vm.runInDebugContext('DebugCommandProcessor.prototype');
assert.equal(proto.prop, true);
proto = vm.runInDebugContext('DebugCommandProcessor.prototype.prop = true;' +
'DebugCommandProcessor.prototype');
assert.equal(proto.prop, true);

0 comments on commit 30bcce3

Please sign in to comment.