-
Notifications
You must be signed in to change notification settings - Fork 29.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
esm: Ensure custom loader resolved "url" is properly validated #21352
Closed
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
bc83382
refactor common
guybedford cf1e32f
esm: validate custom loader url
guybedford 6594462
braces nit
guybedford 1776edf
remove unnecessary try wrapper
guybedford 888d186
beautiful error messages
guybedford 233cf2a
error handling feedback
guybedford d434368
test case refinements
guybedford a235f08
format case test and fix
guybedford File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,71 +1,123 @@ | ||
// Flags: --experimental-modules | ||
/* eslint-disable node-core/required-modules */ | ||
import common from './index.js'; | ||
|
||
import assert from 'assert'; | ||
const { | ||
PORT, | ||
isMainThread, | ||
isWindows, | ||
isWOW64, | ||
isAIX, | ||
isLinuxPPCBE, | ||
isSunOS, | ||
isFreeBSD, | ||
isOpenBSD, | ||
isLinux, | ||
isOSX, | ||
isGlibc, | ||
enoughTestMem, | ||
enoughTestCpu, | ||
rootDir, | ||
buildType, | ||
localIPv6Hosts, | ||
opensslCli, | ||
PIPE, | ||
hasIPv6, | ||
childShouldThrowAndAbort, | ||
ddCommand, | ||
spawnPwd, | ||
spawnSyncPwd, | ||
platformTimeout, | ||
allowGlobals, | ||
leakedGlobals, | ||
mustCall, | ||
mustCallAtLeast, | ||
mustCallAsync, | ||
hasMultiLocalhost, | ||
fileExists, | ||
skipIfEslintMissing, | ||
canCreateSymLink, | ||
getCallSite, | ||
mustNotCall, | ||
printSkipMessage, | ||
skip, | ||
ArrayStream, | ||
nodeProcessAborted, | ||
busyLoop, | ||
isAlive, | ||
noWarnCode, | ||
expectWarning, | ||
expectsError, | ||
skipIfInspectorDisabled, | ||
skipIf32Bits, | ||
getArrayBufferViews, | ||
getBufferSources, | ||
crashOnUnhandledRejection, | ||
getTTYfd, | ||
runWithInvalidFD, | ||
hijackStdout, | ||
hijackStderr, | ||
restoreStdout, | ||
restoreStderr, | ||
isCPPSymbolsNotMapped | ||
} = common; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It should be sufficient to just export There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can only do this once we have named exports support for CommonJS modules. |
||
|
||
let knownGlobals = [ | ||
Buffer, | ||
clearImmediate, | ||
clearInterval, | ||
clearTimeout, | ||
global, | ||
process, | ||
setImmediate, | ||
setInterval, | ||
setTimeout | ||
]; | ||
|
||
if (process.env.NODE_TEST_KNOWN_GLOBALS) { | ||
const knownFromEnv = process.env.NODE_TEST_KNOWN_GLOBALS.split(','); | ||
allowGlobals(...knownFromEnv); | ||
} | ||
|
||
export function allowGlobals(...whitelist) { | ||
knownGlobals = knownGlobals.concat(whitelist); | ||
} | ||
|
||
export function leakedGlobals() { | ||
// Add possible expected globals | ||
if (global.gc) { | ||
knownGlobals.push(global.gc); | ||
} | ||
|
||
if (global.DTRACE_HTTP_SERVER_RESPONSE) { | ||
knownGlobals.push(DTRACE_HTTP_SERVER_RESPONSE); | ||
knownGlobals.push(DTRACE_HTTP_SERVER_REQUEST); | ||
knownGlobals.push(DTRACE_HTTP_CLIENT_RESPONSE); | ||
knownGlobals.push(DTRACE_HTTP_CLIENT_REQUEST); | ||
knownGlobals.push(DTRACE_NET_STREAM_END); | ||
knownGlobals.push(DTRACE_NET_SERVER_CONNECTION); | ||
} | ||
|
||
if (global.COUNTER_NET_SERVER_CONNECTION) { | ||
knownGlobals.push(COUNTER_NET_SERVER_CONNECTION); | ||
knownGlobals.push(COUNTER_NET_SERVER_CONNECTION_CLOSE); | ||
knownGlobals.push(COUNTER_HTTP_SERVER_REQUEST); | ||
knownGlobals.push(COUNTER_HTTP_SERVER_RESPONSE); | ||
knownGlobals.push(COUNTER_HTTP_CLIENT_REQUEST); | ||
knownGlobals.push(COUNTER_HTTP_CLIENT_RESPONSE); | ||
} | ||
|
||
const leaked = []; | ||
|
||
for (const val in global) { | ||
if (!knownGlobals.includes(global[val])) { | ||
leaked.push(val); | ||
} | ||
} | ||
|
||
if (global.__coverage__) { | ||
return leaked.filter((varname) => !/^(?:cov_|__cov)/.test(varname)); | ||
} else { | ||
return leaked; | ||
} | ||
} | ||
|
||
process.on('exit', function() { | ||
const leaked = leakedGlobals(); | ||
if (leaked.length > 0) { | ||
assert.fail(`Unexpected global(s) found: ${leaked.join(', ')}`); | ||
} | ||
}); | ||
export { | ||
PORT, | ||
isMainThread, | ||
isWindows, | ||
isWOW64, | ||
isAIX, | ||
isLinuxPPCBE, | ||
isSunOS, | ||
isFreeBSD, | ||
isOpenBSD, | ||
isLinux, | ||
isOSX, | ||
isGlibc, | ||
enoughTestMem, | ||
enoughTestCpu, | ||
rootDir, | ||
buildType, | ||
localIPv6Hosts, | ||
opensslCli, | ||
PIPE, | ||
hasIPv6, | ||
childShouldThrowAndAbort, | ||
ddCommand, | ||
spawnPwd, | ||
spawnSyncPwd, | ||
platformTimeout, | ||
allowGlobals, | ||
leakedGlobals, | ||
mustCall, | ||
mustCallAtLeast, | ||
mustCallAsync, | ||
hasMultiLocalhost, | ||
fileExists, | ||
skipIfEslintMissing, | ||
canCreateSymLink, | ||
getCallSite, | ||
mustNotCall, | ||
printSkipMessage, | ||
skip, | ||
ArrayStream, | ||
nodeProcessAborted, | ||
busyLoop, | ||
isAlive, | ||
noWarnCode, | ||
expectWarning, | ||
expectsError, | ||
skipIfInspectorDisabled, | ||
skipIf32Bits, | ||
getArrayBufferViews, | ||
getBufferSources, | ||
crashOnUnhandledRejection, | ||
getTTYfd, | ||
runWithInvalidFD, | ||
hijackStdout, | ||
hijackStderr, | ||
restoreStdout, | ||
restoreStderr, | ||
isCPPSymbolsNotMapped | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-invalid-format.mjs | ||
import { expectsError, mustCall } from '../common'; | ||
import assert from 'assert'; | ||
|
||
import('../fixtures/es-modules/test-esm-ok.mjs') | ||
.then(assert.fail, expectsError({ | ||
code: 'ERR_INVALID_RETURN_PROPERTY_VALUE', | ||
message: 'Expected string to be returned for the "format" from the ' + | ||
'"loader resolve" function but got type undefined.' | ||
})) | ||
.then(mustCall()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-invalid-url.mjs | ||
import { expectsError, mustCall } from '../common'; | ||
import assert from 'assert'; | ||
|
||
import('../fixtures/es-modules/test-esm-ok.mjs') | ||
.then(assert.fail, expectsError({ | ||
code: 'ERR_INVALID_RETURN_PROPERTY', | ||
message: 'Expected a valid url to be returned for the "url" from the ' + | ||
'"loader resolve" function but got ' + | ||
'../fixtures/es-modules/test-esm-ok.mjs.' | ||
})) | ||
.then(mustCall()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export async function resolve(specifier, parentModuleURL, defaultResolve) { | ||
if (parentModuleURL && specifier === '../fixtures/es-modules/test-esm-ok.mjs') { | ||
return { | ||
url: 'file:///asdf' | ||
}; | ||
} | ||
return defaultResolve(specifier, parentModuleURL); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
export async function resolve(specifier, parentModuleURL, defaultResolve) { | ||
if (parentModuleURL && specifier === '../fixtures/es-modules/test-esm-ok.mjs') { | ||
return { | ||
url: specifier, | ||
format: 'esm' | ||
}; | ||
} | ||
return defaultResolve(specifier, parentModuleURL); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The name here might be better as:
ERR_INVALID_RETURN_PROPERTY_TYPE
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, the consistent name here would be
ERR_INVALID_RETURN_PROPERTY_VALUE
actually :)