embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-04 01:44:24 +00:00
Code Issues Projects Releases Wiki Activity

feature: disallow eval and require in cockpit

Browse Source
This commit is contained in:
Andre Medeiros 2018-12-20 11:55:04 -05:00 committed by Iuri Matias
parent af48788ab5
commit b0c226a13f
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/core/modules/coderunner/codeRunner.js
View File

@ -80,7 +80,7 @@ class CodeRunner {
code = `(async function() {${instructions.join(';')}})();`;
}
let result = this.runCode.doEval(code, tolerateError);
let result = this.runCode.doEval(code, tolerateError, forConsoleOnly);
if (forConsoleOnly && this.ipc.isServer()) {
this.commands.push({code});

15
src/lib/core/modules/coderunner/runCode.js
View File

@ -1,6 +1,8 @@
const vm = require('vm');
const fs = require('../../fs');
const noop = function() {};
class RunCode {
constructor({logger}) {
this.logger = logger;
@ -12,9 +14,15 @@ class RunCode {
});
}
doEval(code, tolerateError = false) {
doEval(code, tolerateError = false, forConsoleOnly = false) {
// Check if we want this code to run on the console or by user input. If it is by
// user input, we disallow `require` and `eval`.
let context = (forConsoleOnly) ? this.context : Object.assign({}, this.context, {
eval: noop, require: noop
});
try {
return vm.runInNewContext(code, this.context);
return vm.runInNewContext(code, context);
} catch(e) {
if (!tolerateError) {
this.logger.error(e.message);
@ -24,6 +32,9 @@ class RunCode {
}
registerVar(varName, code) {
// Disallow `eval` and `require`, just in case.
if(code === eval || code === require) return;
// TODO: Update all the code being dependent of web3
// To identify, look at the top of the file for something like:
// /*global web3*/

6
test_apps/test_app/test/namesystem_spec.js
View File

@ -24,13 +24,13 @@ describe("ENS functions", function() {
it('should allow directives in ENS subdomains', async function() {
const myTokenAddress = await EmbarkJS.Names.resolve('mytoken.embark.eth');
assert.strictEqual(MyToken.options.address, myTokenAddress);
const myToken2Address = await EmbarkJS.Names.resolve('MyToken2.embark.eth');
assert.strictEqual(MyToken2.options.address, myToken2Address);
const myTokenName = await EmbarkJS.Names.lookup(MyToken.options.address.toLowerCase());
assert.strictEqual(myTokenName, 'mytoken.embark.eth');
const myToken2Name = await EmbarkJS.Names.lookup(MyToken2.options.address.toLowerCase());
assert.strictEqual(myToken2Name, 'MyToken2.embark.eth');
});