From ebae9ab72ff4fb473a6f7b69ffd5cee79274c5ce Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 05:20:03 +0000 Subject: [PATCH 1/3] fix: restrict attribution settings permissions --- scripts/skills/update-ai-attribution.test.ts | 17 +++++++++++++++++ scripts/skills/update-ai-attribution.ts | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/skills/update-ai-attribution.test.ts b/scripts/skills/update-ai-attribution.test.ts index 3c1a94bee54..15c130f7710 100644 --- a/scripts/skills/update-ai-attribution.test.ts +++ b/scripts/skills/update-ai-attribution.test.ts @@ -3,6 +3,7 @@ import { mkdtempSync, readFileSync, rmSync, + statSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' @@ -16,6 +17,22 @@ import { } from './update-ai-attribution' describe('updateAttributionSettings', () => { + it('creates settings files with owner-only permissions', () => { + const home = mkdtempSync(join(tmpdir(), 'update-ai-attribution-')) + try { + updateAttributionSettings(home) + + expect( + statSync(join(home, '.claude', 'settings.json')).mode & 0o777 + ).toBe(0o600) + expect( + statSync(join(home, '.config', 'amp', 'settings.json')).mode & 0o777 + ).toBe(0o600) + } finally { + rmSync(home, { recursive: true, force: true }) + } + }) + it('updates only attribution settings without exposing other values', () => { const home = mkdtempSync(join(tmpdir(), 'update-ai-attribution-')) try { diff --git a/scripts/skills/update-ai-attribution.ts b/scripts/skills/update-ai-attribution.ts index 6e57767adb0..452306610ee 100644 --- a/scripts/skills/update-ai-attribution.ts +++ b/scripts/skills/update-ai-attribution.ts @@ -83,12 +83,12 @@ function parseSettings(content: string): Record { function writeSettings(path: string, content: string) { mkdirSync(dirname(path), { recursive: true }) const temporaryPath = `${path}.${process.pid}.tmp` - const mode = existsSync(path) ? statSync(path).mode : undefined + const mode = existsSync(path) ? statSync(path).mode & 0o777 : 0o600 try { writeFileSync(temporaryPath, content, { mode }) renameSync(temporaryPath, path) - if (mode !== undefined) chmodSync(path, mode) + chmodSync(path, mode) } finally { rmSync(temporaryPath, { force: true }) } From 9cc7ec7cb3fb0014278f155e302bab72979a906b Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 07:10:04 +0000 Subject: [PATCH 2/3] test: cover existing settings permissions Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/16587#discussion_r3911006898 --- scripts/skills/update-ai-attribution.test.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/skills/update-ai-attribution.test.ts b/scripts/skills/update-ai-attribution.test.ts index 15c130f7710..60c65f1db18 100644 --- a/scripts/skills/update-ai-attribution.test.ts +++ b/scripts/skills/update-ai-attribution.test.ts @@ -1,4 +1,5 @@ import { + chmodSync, mkdirSync, mkdtempSync, readFileSync, @@ -51,6 +52,8 @@ describe('updateAttributionSettings', () => { ampPath, '{\n // Keep this comment.\n "token": "amp-secret"\n}\n' ) + chmodSync(claudePath, 0o640) + chmodSync(ampPath, 0o660) const firstResults = updateAttributionSettings(home) const output = formatResults(firstResults) @@ -80,6 +83,8 @@ describe('updateAttributionSettings', () => { 'amp.git.commit.ampThread.enabled': false, 'amp.git.commit.coauthor.enabled': false }) + expect(statSync(claudePath).mode & 0o777).toBe(0o640) + expect(statSync(ampPath).mode & 0o777).toBe(0o660) expect( updateAttributionSettings(home).map(({ outcome }) => outcome) ).toEqual([ From 200e1dbf44ddde1649be32ad46bf61b4ee16eaff Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 07:12:11 +0000 Subject: [PATCH 3/3] fix: create settings temp files exclusively Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/16587#discussion_r3911006902 --- scripts/skills/update-ai-attribution.test.ts | 20 ++++++++++++++++++++ scripts/skills/update-ai-attribution.ts | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/scripts/skills/update-ai-attribution.test.ts b/scripts/skills/update-ai-attribution.test.ts index 60c65f1db18..d8b9351237c 100644 --- a/scripts/skills/update-ai-attribution.test.ts +++ b/scripts/skills/update-ai-attribution.test.ts @@ -5,6 +5,7 @@ import { readFileSync, rmSync, statSync, + symlinkSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' @@ -34,6 +35,25 @@ describe('updateAttributionSettings', () => { } }) + it('does not follow a symlink at the old predictable temporary path', () => { + const home = mkdtempSync(join(tmpdir(), 'update-ai-attribution-')) + try { + const claudeDirectory = join(home, '.claude') + const claudePath = join(claudeDirectory, 'settings.json') + const targetPath = join(home, 'target') + mkdirSync(claudeDirectory, { recursive: true }) + writeFileSync(targetPath, 'unchanged') + symlinkSync(targetPath, `${claudePath}.${process.pid}.tmp`) + + const [claudeResult] = updateAttributionSettings(home) + + expect(claudeResult.outcome).toBe('updated') + expect(readFileSync(targetPath, 'utf8')).toBe('unchanged') + } finally { + rmSync(home, { recursive: true, force: true }) + } + }) + it('updates only attribution settings without exposing other values', () => { const home = mkdtempSync(join(tmpdir(), 'update-ai-attribution-')) try { diff --git a/scripts/skills/update-ai-attribution.ts b/scripts/skills/update-ai-attribution.ts index 452306610ee..f55f251c31b 100644 --- a/scripts/skills/update-ai-attribution.ts +++ b/scripts/skills/update-ai-attribution.ts @@ -1,4 +1,5 @@ #!/usr/bin/env tsx +import { randomUUID } from 'node:crypto' import { chmodSync, existsSync, @@ -82,11 +83,11 @@ function parseSettings(content: string): Record { function writeSettings(path: string, content: string) { mkdirSync(dirname(path), { recursive: true }) - const temporaryPath = `${path}.${process.pid}.tmp` + const temporaryPath = `${path}.${randomUUID()}.tmp` const mode = existsSync(path) ? statSync(path).mode & 0o777 : 0o600 try { - writeFileSync(temporaryPath, content, { mode }) + writeFileSync(temporaryPath, content, { flag: 'wx', mode }) renameSync(temporaryPath, path) chmodSync(path, mode) } finally {