Skip to content

fix(connect): seed missing config under mutation lock to avoid bootstrap race - #408

Open
luvs01 wants to merge 20 commits into
Devfrom
codex/propose-fix-for-configuration-overwrite-vulnerability
Open

fix(connect): seed missing config under mutation lock to avoid bootstrap race#408
luvs01 wants to merge 20 commits into
Devfrom
codex/propose-fix-for-configuration-overwrite-vulnerability

Conversation

@luvs01

@luvs01 luvs01 commented Sep 3, 2026

Copy link
Copy Markdown
Owner

Motivation

  • Prevent a TOCTOU race where the client bootstrap observed a missing config.json and later wrote factory defaults outside the shared mutation transaction, which could overwrite a concurrently created valid config and erase sensitive settings.

Description

  • Add PersistedConfigMutationOptions with createIfMissing to mutatePersistedConfig and a test hook setPersistedConfigMutationBeforeLockForTests to cover the pre-lock race window.
  • Change mutatePersistedConfig to accept options?: PersistedConfigMutationOptions, invoke a before-lock test hook, acquire the shared mutation lock, re-read the persisted snapshot, and only create+persist factory defaults while holding the lock when the file is still genuinely absent; malformed config still fails closed.
  • Update commitClientConnection to call mutatePersistedConfig(..., { createIfMissing: getDefaultConfig }) instead of doing an unlocked saveConfig fallback, so bootstrap defaults are created inside the mutation transaction and any concurrently written top-level fields are preserved or rebased.
  • Add a deterministic regression test tests/client-connect.test.ts that injects a competing saveConfig just before lock acquisition and verifies that listener settings, admission keys, and the new client block are preserved (and that the outcome is committed).

Testing

  • Ran the focused test: ./node_modules/bun/bin/bun.exe test tests/client-connect.test.ts, which passed (20 tests, 0 failures).
  • Ran typecheck with bun x tsc --noEmit which succeeded.
  • Ran bun run privacy:scan which passed.
  • Verified git diff --check and the focused file diffs; a full bun run test was started but encountered unrelated pre-existing lab/timeouter and server-auth expectations in unrelated tests during a long parallel run (the fix was validated by the focused suite above).

Codex Task

lidge-jun and others added 20 commits August 25, 2026 10:36
release: promote dev into main for v2.32.1
# Conflicts:
#	package.json
[WRONG BRANCH] merge dev into main for the v2.33.0 release
Promotes the dev integration line onto main. The resulting tree is byte-identical
to origin/dev, including package.json at 2.34.0.

The package.json conflict is resolved to dev's side, NOT to main's stale 2.33.0.
Earlier promotions (lidge-jun#2553, lidge-jun#2507) kept the target's version so the release bump
would land on its own "release: vX.Y.Z" commit. That is no longer legal: this very
delta adds tests/release-version-line.test.ts, which fails when the in-tree version
sits behind the highest release tag. With v2.34.0-preview.20260827 now published,
2.33.0 orders behind it, so a promotion carrying the stale line turns CI red on
every shard that runs the suite.

The consequence for the release step is that scripts/release.ts skips the bump
(release.ts:568, currentVersion === version), so v2.34.0 gets tagged on this merge
commit rather than on a separate release commit. The workflow creates the tag itself
after publishing and validates expected-sha against the checked-out commit, so the
tag still names exactly the audited tree.
[WRONG BRANCH] promote dev onto main for v2.34.0
[WRONG BRANCH] promote dev onto main for v2.35.0
[WRONG BRANCH] promote dev onto main for v2.36.0
[WRONG BRANCH] promote dev to main for the v2.37.0 release
[WRONG BRANCH] promote dev onto main for v2.38.0
[WRONG BRANCH] promote dev onto main for v2.39.0
…rkflow call (lidge-jun#3262)

Both v2.40.0 release dispatches (33615174183 preview, 33615177849 main) died
at startup_failure: a workflow_call cannot grant its callee more than the
calling job holds, and dev-version-bump.yml's job declares contents+pull-
requests write. lidge-jun#3129 wired the call but never dispatched a release, so this
is its first live run. The caller job now declares exactly the callee's two
permissions; no other job in release.yml gains anything.

Co-authored-by: jun <jun@lidge.dev>
(cherry picked from commit 7ce0ba5)
…400-relfix

release: carry the release.yml permissions fix onto main for v2.40.0
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 3, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review Completed 2026-09-03T05:48:39.773590Z 995c19f PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown

Deterministic PR hygiene checks passed.

@github-actions github-actions Bot added the bug Something isn't working label Sep 3, 2026
@coderabbitai

coderabbitai Bot commented Sep 3, 2026

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Team

Run ID: 1ed05efb-722f-423f-8573-96d58c0c054c


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot changed the title fix(connect): seed missing config under mutation lock to avoid bootstrap race [WRONG BRANCH] fix(connect): seed missing config under mutation lock to avoid bootstrap race Sep 3, 2026
@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown

✅ READY

  • all PR quality gates passed.

Hygiene

Deterministic PR hygiene checks passed.

@github-actions
github-actions Bot marked this pull request as draft September 3, 2026 05:47
@luvs01 luvs01 changed the title [WRONG BRANCH] fix(connect): seed missing config under mutation lock to avoid bootstrap race fix(connect): seed missing config under mutation lock to avoid bootstrap race Sep 3, 2026
@luvs01
luvs01 changed the base branch from main to dev September 3, 2026 06:21
@github-actions
github-actions Bot marked this pull request as ready for review September 3, 2026 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

aardvark bug Something isn't working codex

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants