Merge pull request #1547 from quanticsoul4772/upstream/nominatim-cache-mode-windows

test(nominatim): check cache file modes only where POSIX modes exist
This commit is contained in:
German Khokhlov authored and GitHub committed 2026-11-09 16:44:00 +04:00
commit 3150a460aa
2 files changed
+15 -3

No files matched your search

@@ -0,0 +1,3 @@
- The Nominatim disk-cache test checks the cache directory and file modes
only where POSIX modes exist, so it no longer always fails on Windows
(quanticsoul4772, #1547).
+12 -3
View File
@@ -684,25 +684,34 @@ test('the disk cache survives a restart and stays within its bounds', async () =
await createNominatimCache({ dir, now: time.now }).get('k0'), await createNominatimCache({ dir, now: time.now }).get('k0'),
null, null,
); );
// The cache is private only through POSIX mode bits. Windows has none
// (directories stat as 0o666) and the cache keeps the checkout's ACLs,
// so these checks run, and privacy holds, only on POSIX systems.
const posixModes = process.platform !== 'win32';
if (posixModes) {
assert.equal( assert.equal(
fs.statSync(dir).mode & 0o777, fs.statSync(dir).mode & 0o777,
0o700, 0o700,
'the query cache directory is private', 'the query cache directory is private (POSIX modes)',
); );
}
const text = fs const text = fs
.readdirSync(dir) .readdirSync(dir)
.filter((name) => name.endsWith('.json')) .filter((name) => name.endsWith('.json'))
.map((name) => fs.readFileSync(path.join(dir, name), 'utf8')) .map((name) => fs.readFileSync(path.join(dir, name), 'utf8'))
.join('\n'); .join('\n');
assert.equal(text.includes('k4'), false, 'disk entries never store raw keys'); assert.equal(text.includes('k4'), false, 'disk entries never store raw keys');
if (posixModes) {
for (const name of fs for (const name of fs
.readdirSync(dir) .readdirSync(dir)
.filter((entry) => entry.endsWith('.json'))) .filter((entry) => entry.endsWith('.json'))) {
assert.equal( assert.equal(
fs.statSync(path.join(dir, name)).mode & 0o777, fs.statSync(path.join(dir, name)).mode & 0o777,
0o600, 0o600,
`${name} is private`, `${name} is private (POSIX modes)`,
); );
}
}
fs.rmSync(dir, { recursive: true, force: true }); fs.rmSync(dir, { recursive: true, force: true });
}); });