Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 044402c

Browse files
Archkonaduh95
authored andcommitted
src: use UTF-8 for task runner filesystem paths
Use ConvertPathToUTF8() instead of path::string() when passing filesystem paths to Node and libuv interfaces. This prevents paths containing characters outside the active Windows code page from being corrupted or rejected. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64868 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 1864175 commit 044402c

2 files changed

Lines changed: 55 additions & 12 deletions

File tree

β€Žsrc/node_task_runner.ccβ€Ž

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ProcessRunner::SetEnvironmentVariables() {
123123
// Add NODE_RUN_PACKAGE_JSON_PATH environment variable to the environment to
124124
// indicate which package.json is being processed.
125125
env_vars_.push_back("NODE_RUN_PACKAGE_JSON_PATH=" +
126-
package_json_path_.string());
126+
ConvertPathToUTF8(package_json_path_));
127127

128128
env_ = std::unique_ptr<char*[]>(newchar*[env_vars_.size() + 1]);
129129
options_.env = env_.get();
@@ -206,7 +206,7 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
206206

207207
voidProcessRunner::Run() {
208208
// keeps the string alive until destructor
209-
cwd_ = package_json_path_.parent_path().string();
209+
cwd_ = ConvertPathToUTF8(package_json_path_.parent_path());
210210
options_.cwd = cwd_.c_str();
211211
if (int r = uv_spawn(loop_, &process_, &options_)) {
212212
fprintf(stderr, "Error: %s\n", uv_strerror(r));
@@ -228,14 +228,14 @@ FindPackageJson(const std::filesystem::path& cwd) {
228228
// Append "path/node_modules/.bin" to the env var, if it is a directory.
229229
auto node_modules_bin = directory_path / "node_modules" / ".bin";
230230
if (std::filesystem::is_directory(node_modules_bin)) {
231-
path_env_var += node_modules_bin.string() + env_var_separator;
231+
path_env_var += ConvertPathToUTF8(node_modules_bin) + env_var_separator;
232232
}
233233

234234
if (raw_content.empty()) {
235235
package_json_path = directory_path / "package.json";
236236
// This is required for Windows because std::filesystem::path::c_str()
237237
// returns wchar_t* on Windows, and char* on other platforms.
238-
std::string contents = package_json_path.string();
238+
std::string contents = ConvertPathToUTF8(package_json_path);
239239
USE(ReadFileSync(&raw_content, contents.c_str()) > 0);
240240
}
241241
}
@@ -258,7 +258,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
258258
if (!package_json.has_value()) {
259259
fprintf(stderr,
260260
"Can't find package.json for directory %s\n",
261-
cwd.string().c_str());
261+
ConvertPathToUTF8(cwd).c_str());
262262
result->exit_code_ = ExitCode::kGenericUserError;
263263
return;
264264
}
@@ -274,7 +274,7 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
274274
simdjson::ondemand::object main_object;
275275

276276
if (json_parser.iterate(raw_json).get(document)) {
277-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
277+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
278278
result->exit_code_ = ExitCode::kGenericUserError;
279279
return;
280280
}
@@ -283,9 +283,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
283283
if (root_error == simdjson::error_code::INCORRECT_TYPE) {
284284
fprintf(stderr,
285285
"Root value unexpected not an object for %s\n\n",
286-
path.string().c_str());
286+
ConvertPathToUTF8(path).c_str());
287287
} else {
288-
fprintf(stderr, "Can't parse %s\n", path.string().c_str());
288+
fprintf(stderr, "Can't parse %s\n", ConvertPathToUTF8(path).c_str());
289289
}
290290
result->exit_code_ = ExitCode::kGenericUserError;
291291
return;
@@ -294,8 +294,9 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
294294
// If package_json object doesn't have "scripts" field, throw an error.
295295
simdjson::ondemand::object scripts_object;
296296
if (main_object["scripts"].get_object().get(scripts_object)) {
297-
fprintf(
298-
stderr, "Can't find \"scripts\" field in %s\n", path.string().c_str());
297+
fprintf(stderr,
298+
"Can't find \"scripts\" field in %s\n",
299+
ConvertPathToUTF8(path).c_str());
299300
result->exit_code_ = ExitCode::kGenericUserError;
300301
return;
301302
}
@@ -309,13 +310,13 @@ void RunTask(const std::shared_ptr<InitializationResultImpl>& result,
309310
"Script \"%.*s\" is unexpectedly not a string for %s\n\n",
310311
static_cast<int>(command_id.size()),
311312
command_id.data(),
312-
path.string().c_str());
313+
ConvertPathToUTF8(path).c_str());
313314
} else {
314315
fprintf(stderr,
315316
"Missing script: \"%.*s\" for %s\n\n",
316317
static_cast<int>(command_id.size()),
317318
command_id.data(),
318-
path.string().c_str());
319+
ConvertPathToUTF8(path).c_str());
319320
fprintf(stderr, "Available scripts are:\n");
320321

321322
// Reset the object to iterate over it again

β€Žtest/parallel/test-node-run.jsβ€Ž

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ common.requireNoPackageJSONAbove();
55

66
const{ it, describe }=require('node:test');
77
constassert=require('node:assert');
8+
constfs=require('node:fs');
9+
constpath=require('node:path');
810

911
constfixtures=require('../common/fixtures');
12+
consttmpdir=require('../common/tmpdir');
1013
constenvSuffix=common.isWindows ? '-windows' : '';
1114

1215
describe('node --run [command]',()=>{
@@ -201,6 +204,45 @@ describe('node --run [command]', () => {
201204
assert.strictEqual(child.code,0);
202205
});
203206

207+
it('handles package paths outside the active Windows code page',
208+
{skip: !common.isWindows},async()=>{
209+
tmpdir.refresh();
210+
211+
constprojectDir=path.join(tmpdir.path,'node-run-\u{20BB7}');
212+
constpackageJsonPath=path.join(projectDir,'package.json');
213+
constnodeModulesBin=path.join(projectDir,'node_modules','.bin');
214+
constcheckScript=path.join(projectDir,'check.js');
215+
216+
fs.mkdirSync(nodeModulesBin,{recursive: true});
217+
fs.writeFileSync(packageJsonPath,JSON.stringify({
218+
scripts: {
219+
unicode: `"${process.execPath}" check.js`,
220+
},
221+
}));
222+
fs.writeFileSync(checkScript,`
223+
'use strict';
224+
console.log(JSON.stringify({
225+
cwd: process.cwd(),
226+
packageJsonPath: process.env.NODE_RUN_PACKAGE_JSON_PATH,
227+
path: process.env.PATH,
228+
}));
229+
`);
230+
231+
constchild=awaitcommon.spawnPromisified(
232+
process.execPath,
233+
['--run','unicode'],
234+
{cwd: projectDir},
235+
);
236+
237+
assert.strictEqual(child.stderr,'');
238+
assert.strictEqual(child.code,0);
239+
240+
constoutput=JSON.parse(child.stdout);
241+
assert.strictEqual(output.cwd,projectDir);
242+
assert.strictEqual(output.packageJsonPath,packageJsonPath);
243+
assert.strictEqual(output.path.split(path.delimiter)[0],nodeModulesBin);
244+
});
245+
204246
it('returns error on unparsable file',async()=>{
205247
constchild=awaitcommon.spawnPromisified(
206248
process.execPath,

0 commit comments

Comments
Β (0)