Skip to content

Commit 47bb69a

Browse files
committed
esm: identify parent importing a url with invalid host
PR-URL: nodejs/node#49736 Backport-PR-URL: nodejs/node#50669 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
1 parent 63352d7 commit 47bb69a

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

graal-nodejs/lib/internal/modules/esm/resolve.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,16 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
255255
resolved.pathname, 'must not include encoded "/" or "\\" characters',
256256
fileURLToPath(base));
257257

258-
let path = fileURLToPath(resolved);
258+
let path;
259+
try {
260+
path = fileURLToPath(resolved);
261+
} catch (err) {
262+
const { setOwnProperty } = require('internal/util');
263+
setOwnProperty(err, 'input', `${resolved}`);
264+
setOwnProperty(err, 'module', `${base}`);
265+
throw err;
266+
}
267+
259268
if (getOptionValue('--experimental-specifier-resolution') === 'node') {
260269
let file = resolveExtensionsWithTryExactName(resolved);
261270

graal-nodejs/test/es-module/test-esm-loader-default-resolver.mjs

+14
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,18 @@ describe('default resolver', () => {
4949
assert.strictEqual(stdout.trim(), 'index.byoe!');
5050
assert.strictEqual(stderr, '');
5151
});
52+
53+
it('should identify the parent module of an invalid URL host in import specifier', async () => {
54+
if (process.platform === 'win32') return;
55+
56+
const { code, stderr } = await spawnPromisified(execPath, [
57+
'--no-warnings',
58+
fixtures.path('es-modules', 'invalid-posix-host.mjs'),
59+
]);
60+
61+
assert.match(stderr, /ERR_INVALID_FILE_URL_HOST/);
62+
assert.match(stderr, /file:\/\/hmm\.js/);
63+
assert.match(stderr, /invalid-posix-host\.mjs/);
64+
assert.strictEqual(code, 1);
65+
});
5266
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import "file://hmm.js";

0 commit comments

Comments
 (0)