Support for built in formats in schema files #138
Conversation
| @@ -140,12 +141,13 @@ function normalizeSchema (name, node, props, fullName, env, argv) { | |||
| if (BUILT_INS.indexOf(format) >= 0) { | |||
| // if the format property is a built-in JavaScript constructor, | |||
| // assert that the value is of that type | |||
| var Format = typeof format == 'string' ? eval(format) : format; | |||
There was a problem hiding this comment.
Not sure if eval(format) is the safest, but couldn't find another way...
It means people can inject malicious code via the Format within schemas.
To be honest, if someone has access to schema and config, your app is already pretty compromised...
There was a problem hiding this comment.
Would it suffice to use a simple global name->value map for this, like the following?
BUILT_INS_BY_NAME = {
'Object': Object,
'Array': Array,
'String': String,
...
}
var Format = typeof format === 'string' ? BUILTINS_BY_NAME[format] : format
It's more verbose but avoids the need to eval anything.
There was a problem hiding this comment.
Yeah, I prefer that. I wanted to avoid creating a separate object for the sake of a mapping, but it's safer
There was a problem hiding this comment.
👍 for @rfk's solution. No eval please.
| @@ -13,10 +13,14 @@ describe('convict schema file', function() { | |||
| } | |||
| }); | |||
|
|
|||
| it('must parse a config specification from a file', function() { | |||
| beforeEach(function() { | |||
There was a problem hiding this comment.
Why using a beforeEach? There are cleaner way to test your work I'm sure.
There was a problem hiding this comment.
The code in that existing test was setting up conf, which actually needed to run before the rest of the tests could pass, so I changed it to run within beforeEach rather than relying on a test to run initially for some setup.
The new test I wrote for built-ins in schema files was affecting the rest of the tests by changing the conf. So I made sure that it was done specifically for my test.
There was a problem hiding this comment.
It does mean that if the schema file can't be parsed, it'll fail all tests within schema-tests.js. I can restructure the tests if you think that's a problem not worth introducing.
There was a problem hiding this comment.
That would be great if you could restructure the test. Thanks a lot!
|
Thanks a lot for the good work and useful fix @damnhipster! |
Fixed #137