1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: validate request in require.resolve

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18359
Fixes: https://github.com/nodejs/node/issues/18352
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Joyee Cheung 2018-01-25 04:55:52 +08:00
parent b21715403b
commit d4dd0665f5
No known key found for this signature in database
GPG Key ID: F586868AAD831D0C
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/internal/module.js
View File

@ -1,5 +1,7 @@
'use strict';
const errors = require('internal/errors');
// Invoke with makeRequireFunction(module) where |module| is the Module object
// to use as the context for the require() function.
function makeRequireFunction(mod) {
@ -15,6 +17,10 @@ function makeRequireFunction(mod) {
}
function resolve(request, options) {
if (typeof request !== 'string') {
throw new errors.Error('ERR_INVALID_ARG_TYPE',
'request', 'string', request);
}
return Module._resolveFilename(request, mod, false, options);
}

12
test/parallel/test-require-resolve.js
View File

@ -20,7 +20,7 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict';
require('../common');
const common = require('../common');
const fixtures = require('../common/fixtures');
const assert = require('assert');
@ -38,3 +38,13 @@ assert.strictEqual('path', require.resolve('path'));
// Test configurable resolve() paths.
require(fixtures.path('require-resolve.js'));
require(fixtures.path('resolve-paths', 'default', 'verify-paths.js'));
const re = /^The "request" argument must be of type string\. Received type \w+$/;
[1, false, null, undefined, {}].forEach((value) => {
common.expectsError(
() => { require.resolve(value); },
{
code: 'ERR_INVALID_ARG_TYPE',
message: re
});
});