Skip to content

fix(security): combine install discovery, credential, and transport hardening - #5515

Closed
luvs01 wants to merge 11 commits into
devfrom
stack/c-sec-install
Closed

luvs01 wants to merge 11 commits into
devfrom
stack/c-sec-install

Conversation

@luvs01

@luvs01 luvs01 commented Sep 22, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Combine install-time hardening from #5359, #5285, and #5322 into the bottom layer of the security stack targeting dev.

Verification

  • Current head: 843f2993eb5ab0bcab1144fc46b062852c963bd9. This follow-up changes only documentation and the specific test consumers listed below; production source is byte-identical to the preceding published head d6552899a60cf93a992e1f8cbd0da60601602d79.
  • Hosted CI exposed structure/runtime.md growing to 602 lines when the branch was combined with newer dev. Two overlapping Remote Workspace descriptions were consolidated without losing their contracts or links. The same patch was verified against both exact failing merge trees (602 to 600) and dev (600 to 598), without raising the 600-line budget. Final combined structure checks passed.
  • All 18 original install-hardening contribution paths retain their verified patches; this follow-up adds only the shared documentation compaction. The preceding d6552899 lower layer independently passed pinned Bun 1.4.0 typecheck and structure. Earlier combined type/size and registered frame-log/layout regressions remain historical evidence; no full-suite pass is claimed.
  • Full-suite/cross-platform completion, exact updated-head hosted CI and independent security review remain incomplete. No test timeout or safety boundary was weakened. This PR stays draft.

Checklist

  • Scope stays focused and avoids unrelated cleanup.

  • Docs or release notes were updated when needed.

  • Security-sensitive changes were reviewed for secrets, auth, and unsafe defaults.

Review readiness

  • Local CI is green on this exact head.

  • Branch is based on the current dev commit at preparation time.

  • All correct Codex and CodeRabbit findings are fixed on the combined head.

  • Ready-for-review confirmation.

Wrapper detection now reads a bounded prefix through the already held handle instead of refusing files larger than SHIM_PROBE_BYTES, and an inspection refusal propagates as unavailable rather than marker absence. Also covers metadataOnly with maxBytes 0 and returns a Promise from the deriveInstallationInput dependency contract.

(cherry picked from commit 71ad231)
cmd.exe resolves a bare `npm` from PATH entries under the directory
opencodex was launched from, so a project-local install such as
`node_modules\.bin` could hijack the update flow. Extend the
current-directory skip to the whole cwd subtree while still
allowing the default global prefix `%APPDATA%\npm` when the
shell sits in an ancestor directory like the user's home.

Signed-off-by: luvs01 <27862058+luvs01@users.noreply.github.com>
(cherry picked from commit 61de854)
…ial-file modes

- normalizeHubOrigin now rejects non-loopback http:// before any request is built, so every hub call site (discovery, pairing, key management, usage, catalog, desktop snapshots) shares one transport boundary instead of relying on per-site guards.

- The Alibaba pre-migration config snapshot is chmod 0600 + Windows ACL-hardened between copy and publish, so the credential-bearing backup is never exposed with inherited permissions.

- The env-gated live frame-forensics log is created with owner-only mode 0600 on both append paths.

(cherry picked from commit b1f5046)
…me logs

alibaba-region-backup: the swallowed chmodSync error could publish a credential-bearing snapshot with weak permissions on POSIX; Windows keeps hardenSecretPath as the required control. live.ts: appendFileSync's mode only applies at creation, so a pre-existing permissive OCX_LIVE_FRAME_LOG stayed readable; appendOwnerOnly fchmod's the opened descriptor instead.
(cherry picked from commit 4625bd6)
openSync's create mode does not retighten an existing permissive file, and a swallowed fchmodSync failure would still append the record. hardenLogDescriptor is fail-closed on POSIX and best-effort on Windows; the injectable harden seam lets the regression test prove no record is appended after a hardening failure.

(cherry picked from commit 479487cae3e1faa72cd8e70c50396cc64be42b48)
@coderabbitai

coderabbitai Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true

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.

@luvs01
luvs01 added this pull request to stack #5518 September 22, 2026 09:51
@github-actions

Copy link
Copy Markdown
Contributor

✅ Deterministic PR hygiene checks passed.

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

github-actions Bot commented Sep 22, 2026 •

Copy link
Copy Markdown
Contributor

✅ READY

  • all PR quality gates passed.

Hygiene

✅ Deterministic PR hygiene checks passed.

@lidge-jun

Copy link
Copy Markdown
Owner

리뷰 · 우선순위 62 / 80

이 PR은 Windows 설치 발견·업데이트·허브 연결·비밀 파일 권한을 한꺼번에 단단히 하는 보안 스택이다. 베이스는 선호하는 dev이고, 헤드는 stack/c-sec-install입니다. 위로는 #5516 → #5517이 이어집니다. 제목은 stack/c sec install이고, 설명란은 템플릿만 있어서 비어 있습니다.

Codex CLI 설치 후보를 고를 때, 예전처럼 아무 파일이나 열어보지 않고 로컬 볼륨·리파스 거절하는 held-handle 검사(inspectWindowsInstallationFiles)로만 존재·마커를 봅니다. 그래서 PATH에 네트워크 경로가 있어도 발견 단계에서 네트워크 I/O가 나가지 않습니다. 큰 wrapper는 앞부분만(prefixOnly) 읽고, 검사 거절(refused)이 나오면 뒤쪽 PATH 후보를 “진짜 런처”처럼 증명하지 않고 멈춥니다. 래퍼 마커를 못 읽으면 “마커 없음”이 아니라 unavailable로 처리합니다. 업데이트용 npm 고르기는 실행 디렉터리만이 아니라 cwd 아래 서브트리(node_modules\.bin 등)도 건너뛰고, %APPDATA%\npm 전역 prefix만 예외로 둡니다. 허브 URL은 normalizeHubOrigin에서 원격 plaintext HTTP를 한 번에 막고, 페어링·usage·데스크톱 스냅샷도 같은 경계를 씁니다. Alibaba 지역 이전 전에 만드는 설정 백업은 게시 전에 0600/ACL로 조이고, 조이기 실패면 백업을 올리지 않습니다. 라이브 프레임 진단 로그(OCX_LIVE_FRAME_LOG)는 이미 있던 느슨한 파일도 디스크립터를 다시 조이고, 조이기 실패면 기록을 안 남깁니다. 테스트와 structure/runtime.md도 같이 왔습니다. 커밋들은 #5359·#5285·#5322 쪽 고치기를 cherry-pick한 형태입니다.

라인 - PR 설명: Summary/Verification이 템플릿 그대로라 enforce-target이 빈 설명으로 막히고 draft가 유지됩니다.
라인 - tests/server/server-live.test.ts — file-size ratchet이 GREW입니다. 프레임 로그 harden 테스트를 같은 큰 파일에 붙여서 CI test 4/4가 깨집니다. 캡 갱신이나 테스트 분리/축로가 필요합니다.
라인 - src/server/live.ts hardenLogDescriptor — Windows에서는 fchmod 실패를 삼키고 끝납니다. POSIX는 fail-closed인데, Windows 프레임 로그는 ACL harden(hardenSecretPath 같은 것)이 없어서 이미 열려 있던 느슨한 파일이 그대로일 수 있습니다. Alibaba 백업 쪽과는 기준이 다릅니다.
라인 - src/client/hub-client.ts — normalizeHubOrigin이 이미 전송 경계를 검사한 뒤에도 usage/desktop/pairing 경로에서 isHubTransportPermitted를 한 번 더 부릅니다. 동작은 안전하지만 중복입니다.
라인 - 같은 고치기가 열린 단독 PR로도 있습니다. #5359(설치 발견 held-handle/네트워크 차단), #5285(npm cwd 서브트리 제외), #5322(plaintext hub·자격증명 파일 모드).

메인테이너의 판단이 필요한 지점

이 스택(#5515→#5516→#5517)을 본선으로 두고 #5359·#5285·#5322를 무효로 닫을지, 아니면 단독 PR을 남기고 스택을 버릴지 정해야 합니다. 프레임 로그를 Windows에서도 Alibaba 백업처럼 ACL까지 강제할지, 지금처럼 POSIX만 엄격히 할지 제품 기준을 맞춰야 합니다. cwd가 바로 %APPDATA%\npm일 때 전역 npm도 고르지 않고 null로 가는 회귀 테스트가 의도한 보수적 동작인지(업데이트 실패 vs 하이재킹 방지)도 한 번 확인이 필요합니다.

너의 추천

보안 방향은 맞습니다. 머지 전에 설명란을 커밋 요약 수준으로 채우고, server-live.test.ts ratchet(GREW)을 고친 뒤 CI를 초록으로 만드세요. 스택을 채택한다면 중복 단독 PR(#5359·#5285·#5322)은 닫는 편이 낫습니다. types.ts/config.ts 쪼개기·preview deploy는 이번 변경과 무관합니다.

이 댓글은 grok-bot이 작성했습니다

@luvs01 luvs01 changed the title stack/c sec install fix(security): combine install discovery, credential, and transport hardening Sep 22, 2026
Move the descriptor-hardening and metadata-only cases into server-live-frame-log.test.ts so the live suite stays under the file-size ratchet cap; register the new file in the server lane.
@lidge-jun

Copy link
Copy Markdown
Owner

Carried into #5610 as 90c7225 (squash of this PR's own diff at head 843f299, authorship kept, with a two-line structure/runtime.md reflow so the combined stacks stay within the 600-line budget). Review follow-ups in #5610 keep Windows PATH discovery going past a missing candidate (e7feb77) and require Windows ACL hardening before frame-log appends (701aecf, 265b4a5). Closing as superseded by #5610. Thanks @luvs01.

@lidge-jun lidge-jun closed this Sep 22, 2026
lidge-jun added a commit that referenced this pull request Sep 23, 2026
)

* fix(service): combine startup ownership, token binding, and slot retention

Carries #5512 by @luvs01 (head a12b2ad), which
consolidates #5477, #5306 and #5357:

- bind the service API token to its owning state, canonicalize qualified-localhost
  binds, and carry WSL ownership state honestly (#5477);
- take a fresh task listing for the second startup ownership decision (#5306);
- retain workflow slots for streaming turns (#5357);
- own server-auth fixture lifetime and project a current-schema config for it.

Squashed from the PR's own diff (origin/dev...a12b2ad) onto current dev.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(server): self-heal a replaced package tree via drain-and-restart

Carries #5513 by @luvs01 (head 4d168f1), which
consolidates #5393 and its scheduler follow-up: detect a replaced installed package
tree, degrade health honestly, and drive a timer-driven, retryable drain-and-restart
whose verify step is deferred past scheduler re-entry. The guard factory lives in
src/server/index/package-tree-guard.ts.

Squashed from the PR's own diff (a12b2ad...4d168f1) onto the #5512 carry.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(security): combine install discovery, credential, and transport hardening

Carries #5515 by @luvs01 (head 843f299), which
consolidates #5359, #5285 and #5322:

- keep selected Codex installation discovery off network filesystems, probe
  oversized wrappers through a held-handle prefix read, and stop a PATH scan at a
  refused probe (#5359);
- exclude npm candidates inside the launch directory subtree (#5285);
- refuse plaintext remote hub origins, fail closed on POSIX chmod for credential
  files, and skip the frame-log write when descriptor hardening fails (#5322).

Squashed from the PR's own diff (origin/dev...843f299) onto the chain carry.
Integration: structure/runtime.md wording reflowed by two lines so the combined
service and security stacks stay within the 600-line structure budget.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(security): combine management-auth and boundary hardening

Carries #5516 by @luvs01 (head 245d542), which
consolidates #5326, #5312, #5363 and #5317:

- harden pairing redemption, agent roster intake, and SOCKS5 decoding (#5326);
- guard gh resolution, anchor the grok managed-region fences to whole lines, and
  bound provider-controlled text (#5312);
- harden management-auth admission and provenance (#5363);
- bound the /healthz version before it reaches diagnostics (#5317).

Squashed from the PR's own diff (843f299...245d542) onto the #5515 carry.
Integration: both stacks rewrote the shared server-auth test fixtures. The carry
keeps the #5512 current-schema fixture projection and config helper (including
its 4 KiB boundary case) and adds this PR's Aside sync capability assertions.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(security): combine adapter argv and upstream-body hardening

Carries #5517 by @luvs01 (head 260a87b), which
consolidates #5315 and #5336:

- stage Qoder and CodeBuddy system prompts in private files instead of
  child-process argv, with exclusive creation and owned cleanup (#5315);
- bound upstream error bodies and resolve account-scoped transports (Copilot,
  Devin) from the same OAuth snapshot as the bearer (#5336).

Squashed from the PR's own diff (245d542...260a87b) onto the #5516 carry.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* feat(codebuddy): integrate capture-only tools with private prompt staging

Carries #5582 by @luvs01 (head 3061ef9), which
integrates the capture-only CodeBuddy tool bridge from #5148 by @mdwsk88 with the
private prompt staging from #5517. Requests with a tool catalog advertise only the
allowed tools through an isolated MCP server that captures calls without executing
them; the client keeps approval, sandboxing and execution. Pre-init, undeclared,
excessive or incomplete calls are rejected, streamed malformed tool arguments are
suppressed, bridge staging failures return a fixed message, and an opt-in live
acceptance harness is included. Design context: #5146.

Squashed from the PR's own diff (260a87b...3061ef9) onto the #5517 carry.

Co-authored-by: mdwsk88 <924038395@qq.com>

* fix(client): bound total hub catalog response lifetime

Carries #5252 by @luvs01 (head 779ef91): give the
hub catalog body read an overall deadline (24x the inactivity window, capped at
120 s) on top of the inactivity window, and release refused, HTTP-error and 304
bodies without awaiting their cancellation.

Squashed from the PR's own diff (origin/dev...779ef91).

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(grok): reserve model aliases only when the written config stays valid

Reimplements #5281 by @luvs01. A user sub-table such as [model.ocx-mine.extra]
only creates an implicit parent, so it no longer forces the generated table to a
suffixed alias. The alias choice is now checked against the bytes actually
written: the unsuffixed alias is used only when the final config (after
model-reference rewriting) parses; otherwise the conservative choice that also
reserves deeper headers is used, and a valid user file for which neither choice
parses is refused without writing. Malformed user TOML keeps the previous
conservative reservation.

The original change reserved only exact two-segment headers, which could emit a
duplicate [model.x] table when the user defines model.x through dotted keys.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(codex-auth): scope Codex OAuth cancellation to the originating flow

Reimplements #4923 by @luvs01 on the current login-state layout (in-flight
controllers moved to src/oauth/login-flow-state.ts in #5220). Cancelling a Codex
login was keyed only by provider, so a stale modal posting an old flowId could
abort a newer attempt, and a cancel without a flowId expired every pending flow.

- Each in-flight controller records the flowId that started it; a cancel whose
  flowId does not match the active attempt is refused before anything aborts.
- POST /api/codex-auth/login/cancel requires a non-empty flowId, rejects unknown
  or non-pending flows with 400 without touching any row, and expires only that
  flow. Provider-wide cancellation through /api/oauth/login/cancel is unchanged.
- ocx account cancel requires --flow for Codex providers and sends no request
  without it.

The dashboard's 409 recovery keeps its code; its ownerless cancel is now refused,
so it ends in the existing "already in progress" message instead of superseding a
flow it does not own.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(socks5): bound compressed event streams by expansion, not total size

Review follow-up to the #5516 carry. The 32 MiB decoded-body cap applied to every
gzip/deflate response, so a long, normally compressed SSE stream through the
SOCKS5 tunnel was cut once its cumulative output crossed the cap. Buffered
responses keep the absolute cap; event streams may continue while decoded bytes
stay within the greater of 32 MiB or 128x the coded bytes consumed, which still
stops high-ratio bombs.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(codex): keep scanning PATH past a missing Windows candidate

Review follow-up to the #5515 carry. The held-handle reader reported a missing
file or directory as open-refused, so the default existence probe stopped the
PATH scan at the first absent PATHEXT candidate (for example codex.com) before it
reached an installed codex.cmd. NtCreateFile's object-name-not-found and
object-path-not-found statuses now map to a distinct not-found result that lets
the scan continue; every other failure still refuses.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(server): require Windows ACL hardening before a frame-log append

Review follow-up to the #5515 carry. On Windows the frame log ignored a failed
permission change and appended anyway. Each append now hardens the target with
the required Windows ACL helper and checks that the path still names the opened
file before writing; any failure writes nothing.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(devin): bind catalog authority to the tenant destination

Review follow-up to the #5517 carry.

- The observe-only OAuth snapshot applied the Copilot-validated apiBaseUrl to
  every provider, so a crafted Devin credential could carry a Copilot host that
  the snapshot claimed as its own. The overlay now applies only to github-copilot.
- Devin's live roster, stale fallback and cooldown were keyed by the token alone
  while discovery also depends on the validated tenant URL. The catalog authority
  and the matching routing-cache resolver now fingerprint the token together with
  the validated destination URL.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(codebuddy): fail closed on unverified bridge turns and staging collisions

Review follow-up to the #5582 carry.

- With the capture-only tool bridge armed, a successful terminal event is no
  longer accepted unless the CLI's system/init frame confirmed the bridge server;
  a turn that ends without it fails with tool_bridge_init_missing.
- A tool_use block that arrives only in the complete assistant message, without
  the partial tool events the bridge captures, now fails the turn instead of
  being dropped silently; partial captures are deduplicated by id.
- The catalog and MCP config staging files are created exclusively (wx, 0600),
  like the prompt file, so a pre-existing file fails before spawn.
- The history-argument repair for a missing JSON object prefix is documented and
  tested as a provider-agnostic contract; other malformed strings keep {}.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>
Co-authored-by: mdwsk88 <924038395@qq.com>

* fix(service): keep service-command ownership bound to the recorded home

Review follow-up to the #5512 carry. On WSL with CODEX_HOME unset, the carried
allowance treated a legacy Linux ~/.codex install record as owned when discovery
now selects the Windows profile, so service stop could stop the Linux-home
service and then restore native Codex in the Windows home, and repair could
rewrite the recorded home. Service commands again require the exact recorded
home and name it in the refusal; the unattended startup inspector reaches the
same foreign verdict.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(server): veto a package-tree restart when its server stops or loses ownership

Review follow-up to the #5513 carry.

- A package-tree restart accepted by the guard stayed scheduled after an explicit
  server.stop(), so the drain-and-respawn could reopen a server the caller had
  stopped. The caller that accepted a pending restart now receives a veto, and
  the guard uses it on dispose.
- When running as a supervised service child, the automatic path checks service
  home ownership when accepting and again before the handoff; a mismatch keeps
  the 503 fence and skips the restart.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(security): resolve gh from fixed paths and look up pairing grants by digest

Review follow-ups to the #5516 carry.

- On Windows the automatically polled star-status route derived gh.exe roots from
  ProgramFiles and LOCALAPPDATA, so a process environment could select any
  absolute directory. Windows candidates are now the fixed system install paths,
  and the child PATH is only the resolved executable's directory. Other installs
  report gh as unavailable, which only hides the sidebar star state.
- Pairing redemption looked each guess up by scanning every live grant; the map
  is keyed by the grant digest, so the lookup is now a direct get. A valid grant
  still redeems behind a throttled source.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* test(server): cover the one-shot Aside sync capability end to end

Review follow-up to the #5516 carry, which added a one-shot, HMAC-bound
capability for the default ocx sync path without exercising it. A real listener
now proves single use, refusal on replay, wrong path, query, method, pid or port,
expiry and a bad MAC, and that the CLI default path performs the attestation and
a bodyless POST (through a narrow transport seam).

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* test: register the review follow-up test files in the layout maps

Adds the three new test files from the L4 review follow-ups to both
scripts/test-layout/layout.json and tests/fixtures/test-layout-expected.json.

* test(grok): pin re-injection and strip for a nested user model table

Review follow-up to the #5281 reimplementation: two injections are byte
identical, every intermediate file parses, and strip restores the exact user
content.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(server): harden a Windows frame log once per file identity

Re-review follow-up: requiring Windows ACL hardening on every append spawned
icacls for every relayed frame and could stall the realtime relay. The hardened
file identity (device and inode) is now remembered for the log path; an
unchanged file skips the respawn, and a replaced file at the same path is
hardened again before any write.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* docs(structure): describe the package-tree restart veto and ownership recheck

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(server): stop an automatic restart from handing off after an explicit shutdown

Security review follow-up to the #5513 carry. Once an automatic package-tree
restart entered its drain, an operator shutdown (signal or management stop)
could still be followed by the restart handoff, because the drain cannot tell
its own listener stop from an independent one. Explicit shutdown paths now mark
the process, and an admission-bound restart checks that mark before every
handoff step. Manually requested restarts keep their behavior.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix(server): mark a management stop before its asynchronous teardown

Security re-review follow-up: the management stop route marked the explicit
shutdown only after awaiting the shared teardown, so an automatic restart
draining concurrently could reach its handoff in that window. The mark now
precedes the first await after the stop is accepted.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* test(server): allow post-lookup pruning in the pairing digest regression

The digest-lookup regression trapped every iteration of the grant map, so a
valid redemption failed once session minting pruned expired grants after the
lookup (hosted CI test 4/4). The trap now fails only on a scan that precedes the
digest lookup, which is the regression it guards.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

* fix: repair standalone bridge and restart ownership

Use the compiled CLI as the capture-only MCP entrypoint, release automatic restart fences on veto, align Devin discovery, and tighten Windows and local transport handling. Apply the documented Qoder prompt environment for both regions and update focused regressions and operator docs.

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>

Co-authored-by: mdwsk88 <924038395@qq.com>

---------

Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>
Co-authored-by: mdwsk88 <924038395@qq.com>
@lidge-jun
lidge-jun deleted the stack/c-sec-install branch September 26, 2026 01:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants