Conversation
Contributor
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: trueThanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
|
✅ Deterministic PR hygiene checks passed. |
Contributor
✅ READY
Review readiness checklist
✅ 4/4 boxes ticked. Automatic ready-for-review conversion failed; please mark the pull request ready manually if it is still a draft. |
Owner
리뷰 · 우선순위 70 / 80이 PR은 서버 쪽 보안 구멍을 세 군데 막습니다. 첫째, GUI 페어링 코드(pairing grant)를 쓸 때 예전에는 “이 IP에서 틀린 추측이 너무 많았나?”를 먼저 보고, 맞으면 진짜 코드를 막아 버릴 수 있었습니다. 프록시 뒤에서 주소가 같으면 남의 실패 때문에 내 코드가 안 먹히는 셈입니다. 지금은 코드를 먼저 찾아보고, 진짜 코드면 그대로 교환합니다. 브라우저 Origin이 허용 목록에 없으면 틀린 추측을 세지도 않아서, 이상한 사이트에서 추측만 해도 제한 통이 안 찹니다. 둘째, 허브가 내려주는 서브에이전트 모델 이름이 이상한 글자(공백, 라인 - 메인테이너의 판단이 필요한 지점 너의 추천 이 댓글은 grok-bot이 작성했습니다 |
…CKS5 decoding Three server-side hardening fixes: - Pairing: look up the submitted grant before consulting the source throttle, so callers sharing an observed peer address cannot lock out a valid redemption, and skip limiter bookkeeping entirely for browser origins that are not allowed. - Claude agent injection: reject hub-supplied roster entries that are not model-id-shaped before they are interpolated into generated agent definitions, closing a prompt-injection channel through ocx-* agent files. - SOCKS5 fetch: cap decoded response bodies at 32 MiB so a small coded payload cannot expand without bound when a caller buffers it; identity bodies keep their existing streaming behavior.
luvs01
force-pushed
the
fix/server-hardening-pairing-roster-socks5
branch
from
September 21, 2026 13:49
b4587e2 to
bc28577
Compare
7 tasks
Collaborator
Author
|
Consolidated into #5516 in native Stack #5518. Source head: Superseded by #5516 at 92de8d4. All 1 unique non-merge contribution commit(s) from this PR head bc28577 are carried with verified patch equivalence and cherry-pick provenance: bc28577 -> fe56292. Subsequent code/test moves were checked and preserve the contribution. This closes a duplicate source in favor of the existing open stack; it does not claim the replacement has landed or passed release gates. Exact-head cross-platform checks and required independent review remain incomplete. Closing this duplicate standalone review entry at the author's request after verifying migration. This is not a merge or release claim; remaining integration checks and reviews are tracked on the draft replacement. Original branches are retained. |
3 tasks
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Verification
bun test tests/server/server-management-auth.test.ts— 47 pass, including the new regression assertions that a throttled source still redeems a valid grant and that disallowed-origin guesses create no limiter state.bun test tests/claude-integration/claude-agents-inject-client.test.ts tests/lib/socks5-fetch.test.ts— 43 pass, including the new roster-injection and decoded-size-ceiling regressions.bun teston the remaining direct importers of the touched modules (claude-agents-inject, claude-agent-startup-sync, pinned-http-content-coding, socks5-upload-lifecycle, transport-null-body, config, sidebar-routes, startup-prompt, native-profile-route-security, codex-auth-api, codex-prompt-route, codex-service-manager-probe, codex-v2-gate, combos, oauth-accounts-api, combo-management-api) — all pass.bun x tsc --noEmit— clean.bun run privacy:scanandbun run structure:check— pass.Checklist
Review readiness checklist
This PR stays in draft until every box below is ticked. Tick all four boxes once the requirements are met:
All CI tests are green on my local testing.
I pushed my PR to the latest dev commit.
I resolved all correct Codex and CodeRabbit findings.
My PR is ready for review.