module: validate request in require.resolve
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:
parent
b21715403b
commit
d4dd0665f5
@ -1,5 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const errors = require('internal/errors');
|
||||||
|
|
||||||
// Invoke with makeRequireFunction(module) where |module| is the Module object
|
// Invoke with makeRequireFunction(module) where |module| is the Module object
|
||||||
// to use as the context for the require() function.
|
// to use as the context for the require() function.
|
||||||
function makeRequireFunction(mod) {
|
function makeRequireFunction(mod) {
|
||||||
@ -15,6 +17,10 @@ function makeRequireFunction(mod) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function resolve(request, options) {
|
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);
|
return Module._resolveFilename(request, mod, false, options);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
require('../common');
|
const common = require('../common');
|
||||||
const fixtures = require('../common/fixtures');
|
const fixtures = require('../common/fixtures');
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
|
|
||||||
@ -38,3 +38,13 @@ assert.strictEqual('path', require.resolve('path'));
|
|||||||
// Test configurable resolve() paths.
|
// Test configurable resolve() paths.
|
||||||
require(fixtures.path('require-resolve.js'));
|
require(fixtures.path('require-resolve.js'));
|
||||||
require(fixtures.path('resolve-paths', 'default', 'verify-paths.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
|
||||||
|
});
|
||||||
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user