BlueGit

timfa filemanager

Switch list chmod to shallow mode

Folder refresh permission repair now applies chmod only to the opened folder and its direct children, instead of walking the full subtree. This keeps navigation fast on large trees while still unblocking access as users browse deeper folders.

timfa Tim Falken · pushed by timfa

Authored 2026-05-25 · 5 months ago

Hash
e2b05e9580929824e1d60f5d7381c881c22bb49c
Parent
a61c3c57
2 files changed +53 −30
server/routes/files.js +40 −27
@@ -200,50 +200,63 @@ function envFlagEnabled (name)
200 200 return value === '1' || value === 'true' || value === 'yes' || value === 'on';
201 201 }
202 202
203 function applyRecursiveAccessChmod (startDir)
203 function applyListAccessChmod (startDir)
204 204 {
205 205 const dirMode = parseOctalMode(process.env.FILEMANAGER_LIST_ACCESS_CHMOD_DIR_MODE, 0o777);
206 206 const fileMode = parseOctalMode(process.env.FILEMANAGER_LIST_ACCESS_CHMOD_FILE_MODE, 0o666);
207 const queue = [path.resolve(startDir)];
207 const rootDir = path.resolve(startDir);
208 208
209 while (queue.length)
209 let rootStat;
210 try
211 {
212 rootStat = fs.lstatSync(rootDir);
213 } catch
210 214 {
211 const current = queue.pop();
212 if (!current) continue;
215 return;
216 }
213 217
214 let stat;
215 try
216 {
217 stat = fs.lstatSync(current);
218 } catch
219 {
220 continue;
221 }
218 if (rootStat.isSymbolicLink()) return;
219
220 try
221 {
222 fs.chmodSync(rootDir, rootStat.isDirectory() ? dirMode : fileMode);
223 } catch
224 {
225 // Continue best-effort; listing should still work when possible.
226 }
222 227
223 if (stat.isSymbolicLink()) continue;
228 if (!rootStat.isDirectory()) return;
224 229
230 let entries = [];
231 try
232 {
233 entries = fs.readdirSync(rootDir, { withFileTypes: true });
234 } catch
235 {
236 return;
237 }
238
239 for (const entry of entries)
240 {
241 const childPath = path.join(rootDir, entry.name);
242
243 let childStat;
225 244 try
226 245 {
227 fs.chmodSync(current, stat.isDirectory() ? dirMode : fileMode);
246 childStat = fs.lstatSync(childPath);
228 247 } catch
229 248 {
230 // Continue best-effort; listing should still work when possible.
249 continue;
231 250 }
232 251
233 if (!stat.isDirectory()) continue;
252 if (childStat.isSymbolicLink()) continue;
234 253
235 let entries = [];
236 254 try
237 255 {
238 entries = fs.readdirSync(current, { withFileTypes: true });
256 fs.chmodSync(childPath, childStat.isDirectory() ? dirMode : fileMode);
239 257 } catch
240 258 {
241 continue;
242 }
243
244 for (const entry of entries)
245 {
246 queue.push(path.join(current, entry.name));
259 // Continue best-effort; listing should still work when possible.
247 260 }
248 261 }
249 262 }
@@ -1113,10 +1126,10 @@ router.get('/list', requireAuth, (req, res) =>
1113 1126 {
1114 1127 try
1115 1128 {
1116 applyRecursiveAccessChmod(dir);
1129 applyListAccessChmod(dir);
1117 1130 } catch (err)
1118 1131 {
1119 logError('Best-effort chmod pass failed before directory listing.', err, { dir: String(dir || '') });
1132 logError('Best-effort shallow chmod pass failed before directory listing.', err, { dir: String(dir || '') });
1120 1133 }
1121 1134 }
1122 1135
@@ -200,50 +200,63 @@ function envFlagEnabled (name)
200 return value === '1' || value === 'true' || value === 'yes' || value === 'on';
200 return value === '1' || value === 'true' || value === 'yes' || value === 'on';
201}
201}
202
202
203function applyRecursiveAccessChmod (startDir)
203function applyListAccessChmod (startDir)
204{
204{
205 const dirMode = parseOctalMode(process.env.FILEMANAGER_LIST_ACCESS_CHMOD_DIR_MODE, 0o777);
205 const dirMode = parseOctalMode(process.env.FILEMANAGER_LIST_ACCESS_CHMOD_DIR_MODE, 0o777);
206 const fileMode = parseOctalMode(process.env.FILEMANAGER_LIST_ACCESS_CHMOD_FILE_MODE, 0o666);
206 const fileMode = parseOctalMode(process.env.FILEMANAGER_LIST_ACCESS_CHMOD_FILE_MODE, 0o666);
207 const queue = [path.resolve(startDir)];
207 const rootDir = path.resolve(startDir);
208
208
209 while (queue.length)
209 let rootStat;
210 try
211 {
212 rootStat = fs.lstatSync(rootDir);
213 } catch
210 {
214 {
211 const current = queue.pop();
215 return;
212 if (!current) continue;
216 }
213
217
214 let stat;
218 if (rootStat.isSymbolicLink()) return;
215 try
219
216 {
220 try
217 stat = fs.lstatSync(current);
221 {
218 } catch
222 fs.chmodSync(rootDir, rootStat.isDirectory() ? dirMode : fileMode);
219 {
223 } catch
220 continue;
224 {
221 }
225 // Continue best-effort; listing should still work when possible.
226 }
222
227
223 if (stat.isSymbolicLink()) continue;
228 if (!rootStat.isDirectory()) return;
224
229
230 let entries = [];
231 try
232 {
233 entries = fs.readdirSync(rootDir, { withFileTypes: true });
234 } catch
235 {
236 return;
237 }
238
239 for (const entry of entries)
240 {
241 const childPath = path.join(rootDir, entry.name);
242
243 let childStat;
225 try
244 try
226 {
245 {
227 fs.chmodSync(current, stat.isDirectory() ? dirMode : fileMode);
246 childStat = fs.lstatSync(childPath);
228 } catch
247 } catch
229 {
248 {
230 // Continue best-effort; listing should still work when possible.
249 continue;
231 }
250 }
232
251
233 if (!stat.isDirectory()) continue;
252 if (childStat.isSymbolicLink()) continue;
234
253
235 let entries = [];
236 try
254 try
237 {
255 {
238 entries = fs.readdirSync(current, { withFileTypes: true });
256 fs.chmodSync(childPath, childStat.isDirectory() ? dirMode : fileMode);
239 } catch
257 } catch
240 {
258 {
241 continue;
259 // Continue best-effort; listing should still work when possible.
242 }
243
244 for (const entry of entries)
245 {
246 queue.push(path.join(current, entry.name));
247 }
260 }
248 }
261 }
249}
262}
@@ -1113,10 +1126,10 @@ router.get('/list', requireAuth, (req, res) =>
1113 {
1126 {
1114 try
1127 try
1115 {
1128 {
1116 applyRecursiveAccessChmod(dir);
1129 applyListAccessChmod(dir);
1117 } catch (err)
1130 } catch (err)
1118 {
1131 {
1119 logError('Best-effort chmod pass failed before directory listing.', err, { dir: String(dir || '') });
1132 logError('Best-effort shallow chmod pass failed before directory listing.', err, { dir: String(dir || '') });
1120 }
1133 }
1121 }
1134 }
1122
1135
tests/files.routes.test.js +13 −3
@@ -689,18 +689,24 @@ describe('orphaned user folder access', () =>
689 689 });
690 690 });
691 691
692 describe('list access recursive chmod', () =>
692 describe('list access chmod', () =>
693 693 {
694 test('GET /api/files/list applies recursive chmod when enabled', async () =>
694 test('GET /api/files/list applies chmod to opened folder and direct children when enabled', async () =>
695 695 {
696 696 const nestedDir = path.join(rootDir, 'locked');
697 697 const nestedFile = path.join(nestedDir, 'data.txt');
698 const deepDir = path.join(nestedDir, 'deep');
699 const deepFile = path.join(deepDir, 'deep.txt');
698 700 fs.mkdirSync(nestedDir, { recursive: true });
701 fs.mkdirSync(deepDir, { recursive: true });
699 702 fs.writeFileSync(nestedFile, 'hello');
703 fs.writeFileSync(deepFile, 'deep');
700 704
701 705 fs.chmodSync(rootDir, 0o700);
702 706 fs.chmodSync(nestedDir, 0o700);
703 707 fs.chmodSync(nestedFile, 0o600);
708 fs.chmodSync(deepDir, 0o700);
709 fs.chmodSync(deepFile, 0o600);
704 710
705 711 process.env.FILEMANAGER_LIST_ACCESS_CHMOD = '1';
706 712
@@ -710,10 +716,14 @@ describe('list access recursive chmod', () =>
710 716 const rootMode = fs.statSync(rootDir).mode & 0o777;
711 717 const dirMode = fs.statSync(nestedDir).mode & 0o777;
712 718 const fileMode = fs.statSync(nestedFile).mode & 0o777;
719 const deepDirMode = fs.statSync(deepDir).mode & 0o777;
720 const deepFileMode = fs.statSync(deepFile).mode & 0o777;
713 721
714 722 expect(rootMode).toBe(0o777);
715 723 expect(dirMode).toBe(0o777);
716 expect(fileMode).toBe(0o666);
724 expect(fileMode).toBe(0o600);
725 expect(deepDirMode).toBe(0o700);
726 expect(deepFileMode).toBe(0o600);
717 727 });
718 728
719 729 test('GET /api/files/list leaves permissions unchanged when disabled', async () =>
@@ -689,18 +689,24 @@ describe('orphaned user folder access', () =>
689 });
689 });
690});
690});
691
691
692describe('list access recursive chmod', () =>
692describe('list access chmod', () =>
693{
693{
694 test('GET /api/files/list applies recursive chmod when enabled', async () =>
694 test('GET /api/files/list applies chmod to opened folder and direct children when enabled', async () =>
695 {
695 {
696 const nestedDir = path.join(rootDir, 'locked');
696 const nestedDir = path.join(rootDir, 'locked');
697 const nestedFile = path.join(nestedDir, 'data.txt');
697 const nestedFile = path.join(nestedDir, 'data.txt');
698 const deepDir = path.join(nestedDir, 'deep');
699 const deepFile = path.join(deepDir, 'deep.txt');
698 fs.mkdirSync(nestedDir, { recursive: true });
700 fs.mkdirSync(nestedDir, { recursive: true });
701 fs.mkdirSync(deepDir, { recursive: true });
699 fs.writeFileSync(nestedFile, 'hello');
702 fs.writeFileSync(nestedFile, 'hello');
703 fs.writeFileSync(deepFile, 'deep');
700
704
701 fs.chmodSync(rootDir, 0o700);
705 fs.chmodSync(rootDir, 0o700);
702 fs.chmodSync(nestedDir, 0o700);
706 fs.chmodSync(nestedDir, 0o700);
703 fs.chmodSync(nestedFile, 0o600);
707 fs.chmodSync(nestedFile, 0o600);
708 fs.chmodSync(deepDir, 0o700);
709 fs.chmodSync(deepFile, 0o600);
704
710
705 process.env.FILEMANAGER_LIST_ACCESS_CHMOD = '1';
711 process.env.FILEMANAGER_LIST_ACCESS_CHMOD = '1';
706
712
@@ -710,10 +716,14 @@ describe('list access recursive chmod', () =>
710 const rootMode = fs.statSync(rootDir).mode & 0o777;
716 const rootMode = fs.statSync(rootDir).mode & 0o777;
711 const dirMode = fs.statSync(nestedDir).mode & 0o777;
717 const dirMode = fs.statSync(nestedDir).mode & 0o777;
712 const fileMode = fs.statSync(nestedFile).mode & 0o777;
718 const fileMode = fs.statSync(nestedFile).mode & 0o777;
719 const deepDirMode = fs.statSync(deepDir).mode & 0o777;
720 const deepFileMode = fs.statSync(deepFile).mode & 0o777;
713
721
714 expect(rootMode).toBe(0o777);
722 expect(rootMode).toBe(0o777);
715 expect(dirMode).toBe(0o777);
723 expect(dirMode).toBe(0o777);
716 expect(fileMode).toBe(0o666);
724 expect(fileMode).toBe(0o600);
725 expect(deepDirMode).toBe(0o700);
726 expect(deepFileMode).toBe(0o600);
717 });
727 });
718
728
719 test('GET /api/files/list leaves permissions unchanged when disabled', async () =>
729 test('GET /api/files/list leaves permissions unchanged when disabled', async () =>