Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

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

Commit 5821362

Browse files
codebytereaduh95
authored andcommitted
module: do not split a portable compile cache by uid
A portable compile cache is meant to be reused wherever the same module layout is found, which includes being generated once (at build time, say) and shipped read-only with an application for whoever runs it. On platforms with uids the cache subdirectory is suffixed with the uid of the user who created it, so such a cache is only ever found by that one user. Omit the suffix in portable mode: a user who cannot write to the directory still reads it, and a failed write is only a cache miss. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65293 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 797ef40 commit 5821362

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

‎doc/api/cli.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,9 @@ Enable the [module compile cache][] for the Node.js instance. See the documentat
37043704

37053705
### `NODE_COMPILE_CACHE_PORTABLE=1`
37063706

3707-
When set to 1, the [module compile cache][] can be reused across different directory
3708-
locations as long as the module layout relative to the cache directory remains the same.
3707+
When set to 1, the [module compile cache][] can be reused across different directory
3708+
locations as long as the module layout relative to the cache directory remains the same,
3709+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
37093710

37103711
### `NODE_DEBUG=module[,…]`
37113712

‎doc/api/module.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ to the cache directory remains the same. This would be done on a best-effort bas
405405
Node.js cannot compute the location of a module relative to the cache directory, the module
406406
will not be cached.
407407
408+
A portable cache is also not split by user: on platforms with uids the
409+
cache subdirectory of a non-portable cache is suffixed with the uid of the
410+
user who created it, so it is only found by that user, while a portable
411+
cache uses the same subdirectory for every user. This lets a cache generated
412+
once (for example at build time, then shipped read-only with an application)
413+
be read by whoever runs the code; a user who cannot write to the directory
414+
still reads it, and a failed write only means the module is compiled again.
415+
408416
There are two ways to enable the portable mode:
409417
410418
1. Using the portable option in [`module.enableCompileCache()`][]:

‎doc/node.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,9 @@ Enable the module compile cache for the Node.js instance. See the documentation
18581858
module compile cache for details.
18591859
.
18601860
.ItEvNODE_COMPILE_CACHE_PORTABLEAr1
1861-
When set to 1, the module compile cache can be reused across different directory
1862-
locations as long as the module layout relative to the cache directory remains the same.
1861+
When set to 1, the module compile cache can be reused across different directory
1862+
locations as long as the module layout relative to the cache directory remains the same,
1863+
and by any user (the cache subdirectory is not suffixed with the creating user's uid).
18631864
.
18641865
.ItEvNODE_DEBUGArmodule[,…]
18651866
\fB','\fR-separated list of core modules that should print debug information.

‎src/compile_cache.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ uint32_t GetHash(const char* data, size_t size) {
4444
returncrc32(crc, reinterpret_cast<const Bytef*>(data), size);
4545
}
4646

47-
std::string GetCacheVersionTag() {
47+
std::string GetCacheVersionTag(EnableOption option) {
48+
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
49+
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
50+
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
4851
// On platforms where uids are available, use different folders for
4952
// different users to avoid cache miss due to permission incompatibility.
5053
// On platforms where uids are not available, bare with the cache miss.
5154
// This should be fine on Windows, as there local directories tend to be
5255
// user-specific.
53-
std::string tag = std::string(NODE_VERSION) + '-' + std::string(NODE_ARCH) +
54-
'-' + Uint32ToHex(ScriptCompiler::CachedDataVersionTag());
55-
#ifdef NODE_IMPLEMENTS_POSIX_CREDENTIALS
56-
tag += '-' + std::to_string(getuid());
56+
// A portable cache is meant to be reused wherever the same layout is
57+
// found, including by other users (e.g. a cache generated at build time
58+
// and shipped read-only with an application), so it is not split by uid:
59+
// a user who cannot write to it still reads it, and a failed write is
60+
// only a cache miss.
61+
if (option != EnableOption::PORTABLE) {
62+
tag += '-' + std::to_string(getuid());
63+
}
5764
#endif
5865
return tag;
5966
}
@@ -532,11 +539,12 @@ CompileCacheHandler::CompileCacheHandler(Environment* env)
532539
// Directory structure:
533540
// - Compile cache directory (from NODE_COMPILE_CACHE)
534541
// - $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG-$UID
542+
// ($UID is omitted for a portable cache)
535543
// - $FILENAME_AND_MODULE_TYPE_HASH.cache: a hash of filename + module type
536544
CompileCacheEnableResult CompileCacheHandler::Enable(Environment* env,
537545
const std::string& dir,
538546
EnableOption option) {
539-
std::string cache_tag = GetCacheVersionTag();
547+
std::string cache_tag = GetCacheVersionTag(option);
540548
std::string absolute_cache_dir_base = PathResolve(env, {dir});
541549
std::string cache_dir_with_tag =
542550
absolute_cache_dir_base + kPathSeparator + cache_tag;

‎test/parallel/test-compile-cache-api-portable.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ const NODE_TEST_COMPILE_CACHE_OPTIONS = JSON.stringify({ directory: cacheRel, po
5757
);
5858
}
5959

60+
// The cache subdirectory of a portable cache is not suffixed with the uid,
61+
// so a cache generated by one user is found by another.
62+
{
63+
const[tag]=fs.readdirSync(path.join(workDir,cacheRel));
64+
// $NODE_VERSION-$ARCH-$CACHE_DATA_VERSION_TAG, with no -$UID.
65+
assert.match(tag,newRegExp(`^${process.version}-${process.arch}-[0-9a-f]+$`));
66+
}
67+
6068
// Second run — moved directory, but same relative cache path
6169
{
6270
constmovedWorkDir=`${workDir}_moved`;

0 commit comments

Comments
 (0)