Skip to content

fix(cli): preserve permissions when replacing settings #13293

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

Merged
wenshao merged 7 commits into from
Oct 6, 2026
+345 −4
Merged

fix(cli): preserve permissions when replacing settings #13293

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b30d1cd
fix(cli): preserve permissions when replacing settings
doudouOUC Oct 3, 2026
37b137e
fix(cli): tolerate unsupported settings chmod
doudouOUC Oct 3, 2026
bc2d583
test(cli): cover unsupported chmod permissions
doudouOUC Oct 3, 2026
47fc0cf
fix(cli): keep default permissions for symlink replacements
doudouOUC Oct 3, 2026
4c8a8e1
fix(cli): tolerate missing settings during permission capture
doudouOUC Oct 4, 2026
e477bac
fix(cli): tolerate refused chmod within existing permissions
doudouOUC Oct 5, 2026
9fa9393
chore: merge main to refresh PR lint gate
doudouOUC Oct 5, 2026
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
Prev Previous commit
Next Next commit
test(cli): cover unsupported chmod permissions
  • Loading branch information
@doudouOUC
doudouOUC committed Oct 3, 2026
commit bc2d5837aa6fd37ef3b40da63b535558cfb3f117
40 changes: 40 additions & 0 deletions packages/cli/src/utils/write-with-backup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,46 @@ describe('writeWithBackup', () => {
);

describe.skipIf(process.platform === 'win32')('POSIX permissions', () => {
it.each([
['ENOSYS', 0o022],
['ENOTSUP', 0o022],
['ENOSYS', 0o077],
['ENOTSUP', 0o077],
] as const)(
'does not widen permissions when chmod returns %s under umask %o',
(code, mask) => {
const previousMask = process.umask(mask);
try {
vi.mocked(fs.chmodSync).mockImplementation(() => {
throw Object.assign(new Error(code), { code });
});
for (const mode of [0o600, 0o640]) {
nativeFs.writeFileSync(targetPath, 'old');
nativeFs.chmodSync(targetPath, mode);
vi.mocked(fs.renameSync).mockImplementation((...args) => {
expect(nativeFs.statSync(args[0]).mode & 0o777).toBe(
mode & ~mask,
);
expect(nativeFs.statSync(targetPath).mode & 0o777).toBe(mode);
nativeFs.renameSync(...args);
});

writeWithBackupSync(targetPath, 'new');

expect(fs.chmodSync).toHaveBeenLastCalledWith(
expect.any(String),
mode,
);
expect(fs.statSync(targetPath).mode & 0o777).toBe(mode & ~mask);
expect(fs.readFileSync(targetPath, 'utf8')).toBe('new');
expect(fs.readdirSync(tempDir)).toEqual(['settings.json']);
}
} finally {
process.umask(previousMask);
}
},
);

it.each([0o022, 0o077])(
'preserves existing modes under umask %o',
(mask) => {
Expand Down
Loading