url: handle "unsafe" characters properly in pathToFileURL

Co-authored-by: EarlyRiser42 <tkfydtls464@gmail.com>
PR-URL: #54545Fixes: #54515
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Author: 2 people

lib/internal/process/execution.js

@@ -49,7 +49,7 @@ function tryGetCwd() {
 
 letevalIndex=0;
 functiongetEvalModuleUrl(){
-returnpathToFileURL(`${process.cwd()}/[eval${++evalIndex}]`).href;
+return`${pathToFileURL(process.cwd())}/[eval${++evalIndex}]`;
 }
 
 /**

lib/internal/url.js

@@ -1500,44 +1500,75 @@ function fileURLToPath(path, options = kEmptyObject) {
 return(windows??isWindows) ? getPathFromURLWin32(path) : getPathFromURLPosix(path);
 }
 
-// The following characters are percent-encoded when converting from file path
-// to URL:
-// - %: The percent character is the only character not encoded by the
-// `pathname` setter.
-// - \: Backslash is encoded on non-windows platforms since it's a valid
-// character but the `pathname` setters replaces it by a forward slash.
-// - LF: The newline character is stripped out by the `pathname` setter.
-// (See whatwg/url#419)
-// - CR: The carriage return character is also stripped out by the `pathname`
-// setter.
-// - TAB: The tab character is also stripped out by the `pathname` setter.
+// RFC1738 defines the following chars as "unsafe" for URLs
+// @see https://www.ietf.org/rfc/rfc1738.txt 2.2. URL Character Encoding Issues
 constpercentRegEx=/%/g;
-constbackslashRegEx=/\\/g;
 constnewlineRegEx=/\n/g;
 constcarriageReturnRegEx=/\r/g;
 consttabRegEx=/\t/g;
-constquestionRegex=/\?/g;
+constquoteRegEx=/"/g;
 consthashRegex=/#/g;
+constspaceRegEx=//g;
+constquestionMarkRegex=/\?/g;
+constopenSquareBracketRegEx=/\[/g;
+constbackslashRegEx=/\\/g;
+constcloseSquareBracketRegEx=/]/g;
+constcaretRegEx=/\^/g;
+constverticalBarRegEx=/\|/g;
+consttildeRegEx=/~/g;
 
 functionencodePathChars(filepath,options=kEmptyObject){
-constwindows=options?.windows;
-if(StringPrototypeIndexOf(filepath,'%')!==-1)
+if(StringPrototypeIncludes(filepath,'%')){
 filepath=RegExpPrototypeSymbolReplace(percentRegEx,filepath,'%25');
-// In posix, backslash is a valid character in paths:
-if(!(windows??isWindows)&&StringPrototypeIndexOf(filepath,'\\')!==-1)
-filepath=RegExpPrototypeSymbolReplace(backslashRegEx,filepath,'%5C');
-if(StringPrototypeIndexOf(filepath,'\n')!==-1)
+}
+
+if(StringPrototypeIncludes(filepath,'\t')){
+filepath=RegExpPrototypeSymbolReplace(tabRegEx,filepath,'%09');
+}
+if(StringPrototypeIncludes(filepath,'\n')){
 filepath=RegExpPrototypeSymbolReplace(newlineRegEx,filepath,'%0A');
-if(StringPrototypeIndexOf(filepath,'\r')!==-1)
+}
+if(StringPrototypeIncludes(filepath,'\r')){
 filepath=RegExpPrototypeSymbolReplace(carriageReturnRegEx,filepath,'%0D');
-if(StringPrototypeIndexOf(filepath,'\t')!==-1)
-filepath=RegExpPrototypeSymbolReplace(tabRegEx,filepath,'%09');
+}
+if(StringPrototypeIncludes(filepath,' ')){
+filepath=RegExpPrototypeSymbolReplace(spaceRegEx,filepath,'%20');
+}
+if(StringPrototypeIncludes(filepath,'"')){
+filepath=RegExpPrototypeSymbolReplace(quoteRegEx,filepath,'%22');
+}
+if(StringPrototypeIncludes(filepath,'#')){
+filepath=RegExpPrototypeSymbolReplace(hashRegex,filepath,'%23');
+}
+if(StringPrototypeIncludes(filepath,'?')){
+filepath=RegExpPrototypeSymbolReplace(questionMarkRegex,filepath,'%3F');
+}
+if(StringPrototypeIncludes(filepath,'[')){
+filepath=RegExpPrototypeSymbolReplace(openSquareBracketRegEx,filepath,'%5B');
+}
+// Back-slashes must be special-cased on Windows, where they are treated as path separator.
+if(!options.windows&&StringPrototypeIncludes(filepath,'\\')){
+filepath=RegExpPrototypeSymbolReplace(backslashRegEx,filepath,'%5C');
+}
+if(StringPrototypeIncludes(filepath,']')){
+filepath=RegExpPrototypeSymbolReplace(closeSquareBracketRegEx,filepath,'%5D');
+}
+if(StringPrototypeIncludes(filepath,'^')){
+filepath=RegExpPrototypeSymbolReplace(caretRegEx,filepath,'%5E');
+}
+if(StringPrototypeIncludes(filepath,'|')){
+filepath=RegExpPrototypeSymbolReplace(verticalBarRegEx,filepath,'%7C');
+}
+if(StringPrototypeIncludes(filepath,'~')){
+filepath=RegExpPrototypeSymbolReplace(tildeRegEx,filepath,'%7E');
+}
+
 returnfilepath;
 }
 
 functionpathToFileURL(filepath,options=kEmptyObject){
-constwindows=options?.windows;
-if((windows??isWindows)&&StringPrototypeStartsWith(filepath,'\\\\')){
+constwindows=options?.windows??isWindows;
+if(windows&&StringPrototypeStartsWith(filepath,'\\\\')){
 constoutURL=newURL('file://');
 // UNC path format: \\server\share\resource
 // Handle extended UNC path and standard UNC path
@@ -1568,7 +1599,7 @@ function pathToFileURL(filepath, options = kEmptyObject) {
 );
 returnoutURL;
 }
-letresolved=(windows??isWindows) ? path.win32.resolve(filepath) : path.posix.resolve(filepath);
+letresolved=windows ? path.win32.resolve(filepath) : path.posix.resolve(filepath);
 // path.resolve strips trailing slashes so we must add them back
 constfilePathLast=StringPrototypeCharCodeAt(filepath,
 filepath.length-1);
@@ -1577,18 +1608,7 @@ function pathToFileURL(filepath, options = kEmptyObject) {
 resolved[resolved.length-1]!==path.sep)
 resolved+='/';
 
-// Call encodePathChars first to avoid encoding % again for ? and #.
-resolved=encodePathChars(resolved,{ windows });
-
-// Question and hash character should be included in pathname.
-// Therefore, encoding is required to eliminate parsing them in different states.
-// This is done as an optimization to not creating a URL instance and
-// later triggering pathname setter, which impacts performance
-if(StringPrototypeIndexOf(resolved,'?')!==-1)
-resolved=RegExpPrototypeSymbolReplace(questionRegex,resolved,'%3F');
-if(StringPrototypeIndexOf(resolved,'#')!==-1)
-resolved=RegExpPrototypeSymbolReplace(hashRegex,resolved,'%23');
-returnnewURL(`file://${resolved}`);
+returnnewURL(`file://${encodePathChars(resolved,{ windows })}`);
 }
 
 functiontoPathIfFileURL(fileURLOrPath){

test/parallel/test-url-pathtofileurl.js

@@ -13,10 +13,7 @@ const url = require('url');
 {
 constfileURL=url.pathToFileURL('test\\').href;
 assert.ok(fileURL.startsWith('file:///'));
-if(isWindows)
-assert.ok(fileURL.endsWith('/'));
-else
-assert.ok(fileURL.endsWith('%5C'));
+assert.match(fileURL,isWindows ? /\/$/ : /%5C$/);
 }
 
 {
@@ -104,6 +101,12 @@ const windowsTestCases = [
 {path: 'C:\\€',expected: 'file:///C:/%E2%82%AC'},
 // Rocket emoji (non-BMP code point)
 {path: 'C:\\🚀',expected: 'file:///C:/%F0%9F%9A%80'},
+// caret
+{path: 'C:\\foo^bar',expected: 'file:///C:/foo%5Ebar'},
+// left bracket
+{path: 'C:\\foo[bar',expected: 'file:///C:/foo%5Bbar'},
+// right bracket
+{path: 'C:\\foo]bar',expected: 'file:///C:/foo%5Dbar'},
 // Local extended path
 {path: '\\\\?\\C:\\path\\to\\file.txt',expected: 'file:///C:/path/to/file.txt'},
 // UNC path (see https://docs.microsoft.com/en-us/archive/blogs/ie/file-uris-in-windows)
@@ -154,6 +157,8 @@ const posixTestCases = [
 {path: '/€',expected: 'file:///%E2%82%AC'},
 // Rocket emoji (non-BMP code point)
 {path: '/🚀',expected: 'file:///%F0%9F%9A%80'},
+// "unsafe" chars
+{path: '/foo\r\n\t<>"#%{}|^[\\~]`?bar',expected: 'file:///foo%0D%0A%09%3C%3E%22%23%25%7B%7D%7C%5E%5B%5C%7E%5D%60%3Fbar'},
 ];
 
 for(const{ path, expected }ofwindowsTestCases){