path: canonicalize Windows namespaced paths#62639

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.

Sign up for GitHub

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

Closed
jazelly wants to merge 1 commit into from
Closed

path: canonicalize Windows namespaced paths #62639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 81 additions & 5 deletions src/path.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
kNotNamespaced,
kDriveAbsolutePath,
kUNCPath,
kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
std::string_view path) {
if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
path[2] == '?' && path[3] == '\\')) {
return WindowsNamespacedPathType::kNotNamespaced;
}

if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
IsPathSeparator(path[6])) {
return WindowsNamespacedPathType::kDriveAbsolutePath;
}

if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
ToLower(path[6]) == 'c' && path[7] == '\\') {
size_t i = 8;
const size_t server_start = i;
while (i < path.size() && !IsPathSeparator(path[i])) {
i++;
}
if (i == server_start || i == path.size()) {
return WindowsNamespacedPathType::kOtherNamespacedPath;
}

while (i < path.size() && IsPathSeparator(path[i])) {
i++;
}
const size_t share_start = i;
while (i < path.size() && !IsPathSeparator(path[i])) {
i++;
}
if (i == share_start) {
return WindowsNamespacedPathType::kOtherNamespacedPath;
}

return WindowsNamespacedPathType::kUNCPath;
}

return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
// PathResolve() is an internal filesystem identity resolver, not the public
// path.win32.resolve() API. For valid namespaced filesystem paths, the
// namespace prefix does not identify a different file or directory:
// \\?\C:\foo -> C:\foo
// \\?\UNC\server\share\foo -> \\server\share\foo
// Keep all other namespaced forms intact. For example,
// \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
// \\?\C:foo is drive-relative rather than drive-absolute.
switch (ClassifyWindowsNamespacedPath(path)) {
case WindowsNamespacedPathType::kDriveAbsolutePath:
path = path.substr(4);
return;
case WindowsNamespacedPathType::kUNCPath:
path = "\\\\" + path.substr(8);
return;
case WindowsNamespacedPathType::kNotNamespaced:
case WindowsNamespacedPathType::kOtherNamespacedPath:
return;
}
}

std::string PathResolve(Environment* env,
const std::vector<std::string_view>& paths) {
std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
}
}

StripExtendedPathPrefixForPathResolve(path);

const size_t len = path.length();
int rootEnd = 0;
std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
if (path->starts_with("\\\\?\\UNC\\")) {
*path = path->substr(8);
path->insert(0, "\\\\");
} else if (path->starts_with("\\\\?\\")) {
*path = path->substr(4);
switch (ClassifyWindowsNamespacedPath(*path)) {
case WindowsNamespacedPathType::kUNCPath:
*path = "\\\\" + path->substr(8);
return;
case WindowsNamespacedPathType::kDriveAbsolutePath:
*path = path->substr(4);
return;
case WindowsNamespacedPathType::kNotNamespaced:
case WindowsNamespacedPathType::kOtherNamespacedPath:
return;
}
#endif
}
Expand Down
33 changes: 33 additions & 0 deletions test/cctest/test_path.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
"\\\\.\\PHYSICALDRIVE0");
EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
"\\\\?\\PHYSICALDRIVE0");
EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
"\\\\server\\share\\");
EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
"\\\\server\\share\\dir");
EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
.ToLocalChecked());
ToNamespacedPath(*env, &data_4);
EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
BufferValue data_5(
isolate_,
v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
ToNamespacedPath(*env, &data_5);
EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
BufferValue data(
isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
std::string drive_absolute = "\\\\?\\C:\\foo";
FromNamespacedPath(&drive_absolute);
EXPECT_EQ(drive_absolute, "C:\\foo");

std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
FromNamespacedPath(&unc_absolute);
EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

std::string device_path = "\\\\?\\PHYSICALDRIVE0";
FromNamespacedPath(&device_path);
EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

std::string drive_relative = "\\\\?\\C:foo";
FromNamespacedPath(&drive_relative);
EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}
22 changes: 22 additions & 0 deletions test/es-module/test-esm-long-path-win.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
tmpdir.refresh();
});

it('check extended-length path in executeUserEntryPoint', async () => {
const packageDirPath = tmpdir.resolve('issue-62446');
const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

tmpdir.refresh();

fs.mkdirSync(packageDirPath);
fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

const { code, signal, stderr, stdout } = await spawnPromisified(
execPath,
[namespacedMainJsPath],
);
assert.strictEqual(stderr.trim(), '');
assert.strictEqual(stdout.trim(), 'hello world');
assert.strictEqual(code, 0);
assert.strictEqual(signal, null);

tmpdir.refresh();
});

it('check long path in LegacyMainResolve - 1', () => {
// Module layout will be the following:
// package.json
Expand Down
62 changes: 62 additions & 0 deletions test/parallel/test-compile-cache-namespaced-path-win.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
tmpdir.refresh();
const cacheDir = tmpdir.resolve('.compile_cache_dir');
const namespacedCacheDir = path.toNamespacedPath(cacheDir);

spawnSyncAndAssert(
process.execPath,
[fixtures.path('empty.js')],
{
env: {
...process.env,
NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
NODE_COMPILE_CACHE: namespacedCacheDir,
},
cwd: tmpdir.path,
},
{
stderr(output) {
assert.match(output, /writing cache for .*empty\.js.*success/);
return true;
},
});

const topEntries = fs.readdirSync(cacheDir);
assert.strictEqual(topEntries.length, 1);
const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
assert.strictEqual(cacheEntries.length, 1);

spawnSyncAndAssert(
process.execPath,
[fixtures.path('empty.js')],
{
env: {
...process.env,
NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
NODE_COMPILE_CACHE: namespacedCacheDir,
},
cwd: tmpdir.path,
},
{
stderr(output) {
assert.match(output, /cache for .*empty\.js was accepted/);
return true;
},
});
}
17 changes: 17 additions & 0 deletions test/parallel/test-fs-realpath.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
}));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
if (!common.isWindows) {
cb();
return;
}

const entry = tmp('issue-62446-entry.js');
fs.writeFileSync(entry, 'console.log("ok");');
const namespacedEntry = path.toNamespacedPath(entry);

assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
asynctest(realpath, [namespacedEntry], cb, function(err, result) {
assertEqualPath(result, path.resolve(entry));
});
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
test_up_multiple_with_null_options,
test_root,
test_root_with_null_options,
test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading
, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading

, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading

, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading

, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading

, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading

, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading

, '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
path: canonicalize Windows namespaced paths#62639

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.

 Sign up for GitHub

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

 Closed

jazelly
wants to merge
1
commit into

from

 Closed


path: canonicalize Windows namespaced paths
#62639
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


86 changes: 81 additions & 5 deletions
src/path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,75 @@ constexpr bool IsWindowsDeviceRoot(const char c) noexcept {
 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}

enum class WindowsNamespacedPathType {
 kNotNamespaced,
 kDriveAbsolutePath,
 kUNCPath,
 kOtherNamespacedPath,
};

static WindowsNamespacedPathType ClassifyWindowsNamespacedPath(
 std::string_view path) {
 if (!(path.size() >= 4 && path[0] == '\\' && path[1] == '\\' &&
 path[2] == '?' && path[3] == '\\')) {
 return WindowsNamespacedPathType::kNotNamespaced;
 }

 if (path.size() >= 7 && IsWindowsDeviceRoot(path[4]) && path[5] == ':' &&
 IsPathSeparator(path[6])) {
 return WindowsNamespacedPathType::kDriveAbsolutePath;
 }

 if (path.size() >= 8 && ToLower(path[4]) == 'u' && ToLower(path[5]) == 'n' &&
 ToLower(path[6]) == 'c' && path[7] == '\\') {
 size_t i = 8;
 const size_t server_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == server_start || i == path.size()) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 while (i < path.size() && IsPathSeparator(path[i])) {
 i++;
 }
 const size_t share_start = i;
 while (i < path.size() && !IsPathSeparator(path[i])) {
 i++;
 }
 if (i == share_start) {
 return WindowsNamespacedPathType::kOtherNamespacedPath;
 }

 return WindowsNamespacedPathType::kUNCPath;
 }

 return WindowsNamespacedPathType::kOtherNamespacedPath;
}

static void StripExtendedPathPrefixForPathResolve(std::string& path) {
 // PathResolve() is an internal filesystem identity resolver, not the public
 // path.win32.resolve() API. For valid namespaced filesystem paths, the
 // namespace prefix does not identify a different file or directory:
 // \\?\C:\foo -> C:\foo
 // \\?\UNC\server\share\foo -> \\server\share\foo
 // Keep all other namespaced forms intact. For example,
 // \\?\PHYSICALDRIVE0 is not a drive-absolute filesystem path, and
 // \\?\C:foo is drive-relative rather than drive-absolute.
 switch (ClassifyWindowsNamespacedPath(path)) {
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 path = path.substr(4);
 return;
 case WindowsNamespacedPathType::kUNCPath:
 path = "\\\\" + path.substr(8);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
}

std::string PathResolve(Environment* env,
 const std::vector<std::string_view>& paths) {
 std::string resolvedDevice = "";
Expand DownExpand Up@@ -132,6 +201,8 @@ std::string PathResolve(Environment* env,
 }
 }

 StripExtendedPathPrefixForPathResolve(path);

 const size_t len = path.length();
 int rootEnd = 0;
 std::string device = "";
Expand DownExpand Up@@ -330,11 +401,16 @@ void ToNamespacedPath(Environment* env, BufferValue* path) {
// namespace-prefixed path.
void FromNamespacedPath(std::string* path) {
#ifdef _WIN32
 if (path->starts_with("\\\\?\\UNC\\")) {
 *path = path->substr(8);
 path->insert(0, "\\\\");
 } else if (path->starts_with("\\\\?\\")) {
 *path = path->substr(4);
 switch (ClassifyWindowsNamespacedPath(*path)) {
 case WindowsNamespacedPathType::kUNCPath:
 *path = "\\\\" + path->substr(8);
 return;
 case WindowsNamespacedPathType::kDriveAbsolutePath:
 *path = path->substr(4);
 return;
 case WindowsNamespacedPathType::kNotNamespaced:
 case WindowsNamespacedPathType::kOtherNamespacedPath:
 return;
 }
#endif
}
Expand Down

33 changes: 33 additions & 0 deletions
test/cctest/test_path.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
#include "v8.h"

using node::BufferValue;
using node::FromNamespacedPath;
using node::PathResolve;
using node::ToNamespacedPath;

Expand DownExpand Up@@ -43,6 +44,13 @@ TEST_F(PathTest, PathResolve) {
 "\\\\.\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\PHYSICALDRIVE0"}),
 "\\\\?\\PHYSICALDRIVE0");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\foo"}), "C:\\foo");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:\\"}), "C:\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share"}),
 "\\\\server\\share\\");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\UNC\\server\\share\\dir"}),
 "\\\\server\\share\\dir");
 EXPECT_EQ(PathResolve(*env, {"\\\\?\\C:foo"}), "\\\\?\\C:foo");
#else
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "../", "file/"}), "/var/file");
 EXPECT_EQ(PathResolve(*env, {"/var/lib", "/../", "file/"}), "/file");
Expand DownExpand Up@@ -85,6 +93,11 @@ TEST_F(PathTest, ToNamespacedPath) {
 .ToLocalChecked());
 ToNamespacedPath(*env, &data_4);
 EXPECT_EQ(data_4.ToStringView(), "\\\\?\\c:\\Windows\\System");
 BufferValue data_5(
 isolate_,
 v8::String::NewFromUtf8(isolate_, "\\\\?\\C:\\").ToLocalChecked());
 ToNamespacedPath(*env, &data_5);
 EXPECT_EQ(data_5.ToStringView(), "\\\\?\\C:\\");
#else
 BufferValue data(
 isolate_,
Expand All@@ -93,3 +106,23 @@ TEST_F(PathTest, ToNamespacedPath) {
 EXPECT_EQ(data.ToStringView(), "hello world"); // Input should not be mutated
#endif
}

TEST_F(PathTest, FromNamespacedPath) {
#ifdef _WIN32
 std::string drive_absolute = "\\\\?\\C:\\foo";
 FromNamespacedPath(&drive_absolute);
 EXPECT_EQ(drive_absolute, "C:\\foo");

 std::string unc_absolute = "\\\\?\\UNC\\server\\share\\dir";
 FromNamespacedPath(&unc_absolute);
 EXPECT_EQ(unc_absolute, "\\\\server\\share\\dir");

 std::string device_path = "\\\\?\\PHYSICALDRIVE0";
 FromNamespacedPath(&device_path);
 EXPECT_EQ(device_path, "\\\\?\\PHYSICALDRIVE0");

 std::string drive_relative = "\\\\?\\C:foo";
 FromNamespacedPath(&drive_relative);
 EXPECT_EQ(drive_relative, "\\\\?\\C:foo");
#endif
}

22 changes: 22 additions & 0 deletions
test/es-module/test-esm-long-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,28 @@ describe('long path on Windows', () => {
 tmpdir.refresh();
 });

 it('check extended-length path in executeUserEntryPoint', async () => {
 const packageDirPath = tmpdir.resolve('issue-62446');
 const mainJsFilePath = path.resolve(packageDirPath, 'main.js');
 const namespacedMainJsPath = path.toNamespacedPath(mainJsFilePath);

 tmpdir.refresh();

 fs.mkdirSync(packageDirPath);
 fs.writeFileSync(mainJsFilePath, 'console.log("hello world");');

 const { code, signal, stderr, stdout } = await spawnPromisified(
 execPath,
 [namespacedMainJsPath],
 );
 assert.strictEqual(stderr.trim(), '');
 assert.strictEqual(stdout.trim(), 'hello world');
 assert.strictEqual(code, 0);
 assert.strictEqual(signal, null);

 tmpdir.refresh();
 });

 it('check long path in LegacyMainResolve - 1', () => {
 // Module layout will be the following:
 // package.json
Expand Down

62 changes: 62 additions & 0 deletions
test/parallel/test-compile-cache-namespaced-path-win.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
'use strict';

// This tests NODE_COMPILE_CACHE works with a Windows namespaced path.

const common = require('../common');
if (!common.isWindows) {
 common.skip('this test is Windows-specific.');
}

const { spawnSyncAndAssert } = require('../common/child_process');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
const path = require('path');

{
 tmpdir.refresh();
 const cacheDir = tmpdir.resolve('.compile_cache_dir');
 const namespacedCacheDir = path.toNamespacedPath(cacheDir);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /writing cache for .*empty\.js.*success/);
 return true;
 },
 });

 const topEntries = fs.readdirSync(cacheDir);
 assert.strictEqual(topEntries.length, 1);
 const cacheEntries = fs.readdirSync(path.join(cacheDir, topEntries[0]));
 assert.strictEqual(cacheEntries.length, 1);

 spawnSyncAndAssert(
 process.execPath,
 [fixtures.path('empty.js')],
 {
 env: {
 ...process.env,
 NODE_DEBUG_NATIVE: 'COMPILE_CACHE',
 NODE_COMPILE_CACHE: namespacedCacheDir,
 },
 cwd: tmpdir.path,
 },
 {
 stderr(output) {
 assert.match(output, /cache for .*empty\.js was accepted/);
 return true;
 },
 });
}

17 changes: 17 additions & 0 deletions
test/parallel/test-fs-realpath.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -558,6 +558,22 @@ function test_root_with_null_options(realpath, realpathSync, cb) {
 }));
}

function test_windows_namespaced_path(realpath, realpathSync, cb) {
 if (!common.isWindows) {
 cb();
 return;
 }

 const entry = tmp('issue-62446-entry.js');
 fs.writeFileSync(entry, 'console.log("ok");');
 const namespacedEntry = path.toNamespacedPath(entry);

 assertEqualPath(realpathSync(namespacedEntry), path.resolve(entry));
 asynctest(realpath, [namespacedEntry], cb, function(err, result) {
 assertEqualPath(result, path.resolve(entry));
 });
}

// ----------------------------------------------------------------------------

const tests = [
Expand All@@ -579,6 +595,7 @@ const tests = [
 test_up_multiple_with_null_options,
 test_root,
 test_root_with_null_options,
 test_windows_namespaced_path,
];
const numtests = tests.length;
let testsRun = 0;
Expand Down
Loading