@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -1,15 +1,43 @@
|
|
|
1
1
|
import { resolveTrustedWindowsPowerShellExe } from "./windows-elevation";
|
|
2
|
+
import { waitForSubprocessExit } from "./bounded-subprocess";
|
|
2
3
|
|
|
3
4
|
export interface WindowsPrivateEntry {
|
|
4
5
|
path: string;
|
|
5
6
|
directory: boolean;
|
|
6
7
|
}
|
|
8
|
+
/**
|
|
9
|
+
* Per-entry verification policy for {@link windowsEntriesAclMatches}.
|
|
10
|
+
*
|
|
11
|
+
* - "private" (default): the exact hardened-object rule — protected DACL, owner is the
|
|
12
|
+
* serving token (or Administrators only for an enabled elevated owner), and the only
|
|
13
|
+
* grantees are the token user with Full Control plus SYSTEM/Administrators.
|
|
14
|
+
* - "private-runtime-directory": the same DACL rule, for directories only; an
|
|
15
|
+
* Administrators owner also qualifies when that group is enabled in the token,
|
|
16
|
+
* independently of the token's default owner. Secret-file/pairing policy is unchanged.
|
|
17
|
+
* - "write-private": the POSIX mode&022==0 analog for objects we did NOT create — the
|
|
18
|
+
* serving token or a kernel-equivalent owner (SYSTEM, Administrators, TrustedInstaller)
|
|
19
|
+
* must own the object, and no grantee outside the trusted write set may hold write,
|
|
20
|
+
* create, delete or DACL/owner control. Read grants to anyone are fine.
|
|
21
|
+
* - "trusted-ancestry": the POSIX uid∈{euid,0} + non-shared-writable ancestor analog.
|
|
22
|
+
* The owner must be the serving token or a kernel-equivalent owner (SYSTEM,
|
|
23
|
+
* Administrators, TrustedInstaller — each can already take ownership of any object,
|
|
24
|
+
* so an ACL entry grants them nothing they lack). Untrusted grantees get read access
|
|
25
|
+
* only, except that an admin-owned ancestor may grant broad create-only rights
|
|
26
|
+
* (FILE_ADD_FILE / FILE_ADD_SUBDIRECTORY without delete or write-existing): that is
|
|
27
|
+
* the closest NTFS analog of a root-owned sticky directory such as C:\, whose stock
|
|
28
|
+
* ACL grants Authenticated Users add-subdirectory while refusing every other write.
|
|
29
|
+
*/
|
|
30
|
+
export type WindowsAclPolicy = "private" | "private-runtime-directory" | "write-private" | "trusted-ancestry";
|
|
31
|
+
export interface WindowsAclEntry extends WindowsPrivateEntry {
|
|
32
|
+
readonly policy?: WindowsAclPolicy;
|
|
33
|
+
}
|
|
7
34
|
export interface WindowsOwnerAclResult {
|
|
8
35
|
success: boolean;
|
|
9
36
|
timedOut: boolean;
|
|
10
37
|
stdout: string | Uint8Array;
|
|
11
38
|
}
|
|
12
39
|
export type WindowsOwnerAclRunner = (entries: readonly WindowsPrivateEntry[], timeoutMs: number) => WindowsOwnerAclResult;
|
|
40
|
+
export type WindowsOwnerAclAsyncRunner = (entries: readonly WindowsAclEntry[], timeoutMs: number) => Promise<WindowsOwnerAclResult>;
|
|
13
41
|
|
|
14
42
|
export const WINDOWS_OWNER_ACL_TIMEOUT_MS = 5_000;
|
|
15
43
|
const SID = /^S-1-\d+(?:-\d+)+$/i;
|
|
@@ -17,6 +45,24 @@ const ADMINISTRATORS = "S-1-5-32-544";
|
|
|
17
45
|
const PRIVILEGED_GRANTEES = new Set(["S-1-5-18", ADMINISTRATORS]); // LocalSystem, BUILTIN\Administrators
|
|
18
46
|
const PRIVATE_DACL_FLAGS = 0x1004; // DiscretionaryAclPresent | DiscretionaryAclProtected
|
|
19
47
|
const FULL_CONTROL = 2032127;
|
|
48
|
+
/** TrustedInstaller owns Windows component trees; it can already take ownership of any object. */
|
|
49
|
+
const TRUSTED_INSTALLER = "S-1-5-80-956008885-3418522649-1831038044-1853292631-2271478464";
|
|
50
|
+
/** Grantees a confined/ancestor policy treats as capable of anything already. */
|
|
51
|
+
const TRUSTED_WRITE_SIDS = new Set(["S-1-5-18", ADMINISTRATORS, TRUSTED_INSTALLER]);
|
|
52
|
+
/** Owners acceptable for an ancestor (POSIX uid 0 analogs). */
|
|
53
|
+
const TRUSTED_ANCESTOR_OWNERS = new Set(["S-1-5-18", ADMINISTRATORS, TRUSTED_INSTALLER]);
|
|
54
|
+
/** Admin-owned ancestors may carry broad create-only grants (the C:\ Authenticated-Users pattern). */
|
|
55
|
+
const STICKY_OWNERS = TRUSTED_ANCESTOR_OWNERS;
|
|
56
|
+
|
|
57
|
+
// Access-mask bits (unsigned 32-bit). Read-side grants any entry may hold without
|
|
58
|
+
// weakening confinement; create bits only a trusted-owner ancestor may share broadly;
|
|
59
|
+
// everything else counts as write and is confined to the trusted set.
|
|
60
|
+
const READ_MASK = 0x80000000 /* GENERIC_READ */ | 0x20000000 /* GENERIC_EXECUTE */
|
|
61
|
+
| 0x100000 /* SYNCHRONIZE */ | 0x20000 /* READ_CONTROL */
|
|
62
|
+
| 0x80 /* FILE_READ_ATTRIBUTES */ | 0x20 /* FILE_EXECUTE/TRAVERSE */
|
|
63
|
+
| 0x8 /* FILE_READ_EA */ | 0x1 /* FILE_READ_DATA/LIST */;
|
|
64
|
+
const CREATE_MASK = 0x4 /* FILE_APPEND_DATA/ADD_SUBDIRECTORY */ | 0x2 /* FILE_WRITE_DATA/ADD_FILE */;
|
|
65
|
+
const INHERIT_ONLY_ACE = 0x8;
|
|
20
66
|
|
|
21
67
|
// This script is constant. Literal paths are environment data, never PowerShell source.
|
|
22
68
|
// Read the descriptor through .NET (Owner, Group and Access, as Get-Acl does). Get-Acl is a module-autoloaded
|
|
@@ -42,7 +88,9 @@ try {
|
|
|
42
88
|
[Console]::WriteLine(('U|{0}|{1}|{2}' -f $identity.User.Value,$identity.Owner.Value,$enabled))
|
|
43
89
|
$sections=[System.Security.AccessControl.AccessControlSections]'Owner,Group,Access'
|
|
44
90
|
for ($i=0; $i -lt $count; $i++) {
|
|
45
|
-
|
|
91
|
+
if ([Environment]::GetEnvironmentVariable('OCX_ACL_STDIN') -eq '1') {
|
|
92
|
+
$path=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String([Console]::ReadLine()))
|
|
93
|
+
} else { $path=[Environment]::GetEnvironmentVariable(('OCX_ACL_PATH_{0}' -f $i)) }
|
|
46
94
|
if ([string]::IsNullOrEmpty($path)) { throw 'path' }
|
|
47
95
|
if ([System.IO.Directory]::Exists($path)) { $acl=[System.Security.AccessControl.DirectorySecurity]::new($path, $sections) }
|
|
48
96
|
else { $acl=[System.Security.AccessControl.FileSecurity]::new($path, $sections) }
|
|
@@ -70,7 +118,7 @@ try {
|
|
|
70
118
|
const ENCODED_ACL_SCRIPT = Buffer.from(ACL_SCRIPT, "utf16le").toString("base64");
|
|
71
119
|
|
|
72
120
|
function defaultWindowsOwnerAclRunner(entries: readonly WindowsPrivateEntry[], timeoutMs: number): WindowsOwnerAclResult {
|
|
73
|
-
const env: Record<string, string | undefined> = { ...process.env, OCX_ACL_COUNT: String(entries.length) };
|
|
121
|
+
const env: Record<string, string | undefined> = { ...process.env, OCX_ACL_COUNT: String(entries.length), OCX_ACL_STDIN: "0" };
|
|
74
122
|
for (let i = 0; i < entries.length; i++) env[`OCX_ACL_PATH_${i}`] = entries[i]!.path;
|
|
75
123
|
const result = Bun.spawnSync([
|
|
76
124
|
resolveTrustedWindowsPowerShellExe(), "-NoLogo", "-NoProfile", "-NonInteractive",
|
|
@@ -89,48 +137,166 @@ export function setWindowsOwnerAclRunnerForTests(runner: WindowsOwnerAclRunner |
|
|
|
89
137
|
ownerAclRunner = runner ?? defaultWindowsOwnerAclRunner;
|
|
90
138
|
}
|
|
91
139
|
|
|
92
|
-
/**
|
|
93
|
-
|
|
94
|
-
|
|
140
|
+
/** Parsed ACE record; opaque marks the four-field non-CommonAce marker the policy cannot evaluate. */
|
|
141
|
+
interface ParsedAce {
|
|
142
|
+
readonly opaque: boolean;
|
|
143
|
+
readonly type: number | null;
|
|
144
|
+
readonly flags: number | null;
|
|
145
|
+
readonly mask: number | null;
|
|
146
|
+
readonly sid: string | null;
|
|
147
|
+
readonly callback: boolean | null;
|
|
148
|
+
readonly malformed: boolean;
|
|
149
|
+
readonly raw: readonly string[];
|
|
150
|
+
}
|
|
151
|
+
interface ParsedEntry {
|
|
152
|
+
readonly owner: string;
|
|
153
|
+
readonly controlFlags: number;
|
|
154
|
+
/** null when the object reported a NULL DACL, which grants Everyone full access. */
|
|
155
|
+
readonly aces: readonly ParsedAce[] | null;
|
|
156
|
+
}
|
|
157
|
+
interface ParsedAclRun {
|
|
158
|
+
readonly user: string;
|
|
159
|
+
readonly acceptsAdministrators: boolean;
|
|
160
|
+
readonly administratorsEnabled: boolean;
|
|
161
|
+
readonly entries: readonly (ParsedEntry | null)[];
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/** Shared strict line-protocol parser; per-entry ACE semantics live in the policies. */
|
|
165
|
+
function parseAclProtocol(stdout: string | Uint8Array, count: number): ParsedAclRun | null {
|
|
166
|
+
if (count <= 0) return null;
|
|
95
167
|
// The script emits ASCII only. Reject BOMs, NULs, non-ASCII bytes and replacement decoding.
|
|
96
|
-
if (typeof stdout !== "string" && stdout.some(byte => byte > 127)) return
|
|
168
|
+
if (typeof stdout !== "string" && stdout.some(byte => byte > 127)) return null;
|
|
97
169
|
const text = typeof stdout === "string" ? stdout : Buffer.from(stdout).toString("ascii");
|
|
98
|
-
if (/[^\x20-\x7e\r\n]/.test(text)) return
|
|
170
|
+
if (/[^\x20-\x7e\r\n]/.test(text)) return null;
|
|
99
171
|
const normalized = text.replace(/\r\n/g, "\n");
|
|
100
|
-
if (normalized.includes("\r")) return
|
|
172
|
+
if (normalized.includes("\r")) return null;
|
|
101
173
|
const lines = (normalized.endsWith("\n") ? normalized.slice(0, -1) : normalized).split("\n");
|
|
102
|
-
if (lines.at(-1) !== "END") return
|
|
174
|
+
if (lines.at(-1) !== "END") return null;
|
|
103
175
|
const token = lines[0]!.split("|");
|
|
104
176
|
if (token.length !== 4 || token[0] !== "U" || !SID.test(token[1]!) || !SID.test(token[2]!)
|
|
105
|
-
|| (token[3] !== "True" && token[3] !== "False")) return
|
|
106
|
-
const
|
|
107
|
-
const acceptsAdministrators = token[2]!.toUpperCase() === ADMINISTRATORS && token[3] === "True";
|
|
177
|
+
|| (token[3] !== "True" && token[3] !== "False")) return null;
|
|
178
|
+
const entries: (ParsedEntry | null)[] = [];
|
|
108
179
|
let at = 1;
|
|
109
|
-
for (let i = 0; i <
|
|
180
|
+
for (let i = 0; i < count; i++) {
|
|
110
181
|
const entry = (lines[at++] ?? "").split("|");
|
|
182
|
+
// ACE count is unbounded for confined policies: ancestors legitimately carry many entries.
|
|
183
|
+
// -1 is the NULL-DACL marker (no ACE lines follow); the private policy still refuses it below.
|
|
111
184
|
if (entry.length !== 5 || entry[0] !== "E" || entry[1] !== String(i) || !SID.test(entry[2]!)
|
|
112
|
-
|| !/^(0|[1-9]\d{0,4})$/.test(entry[3]!) || !/^[1-3
|
|
113
|
-
const flags = Number(entry[3]);
|
|
114
|
-
if (flags > 0xffff || (flags & PRIVATE_DACL_FLAGS) !== PRIVATE_DACL_FLAGS) return false;
|
|
185
|
+
|| !/^(0|[1-9]\d{0,4})$/.test(entry[3]!) || !/^(-1|0|[1-9]\d{0,3})$/.test(entry[4]!)) return null;
|
|
115
186
|
const owner = entry[2]!.toUpperCase();
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
187
|
+
const controlFlags = Number(entry[3]);
|
|
188
|
+
const aceCount = Number(entry[4]);
|
|
189
|
+
if (aceCount === -1) {
|
|
190
|
+
// NULL DACL: the script emits count -1 and no ACE lines. It grants Everyone full access.
|
|
191
|
+
entries.push({ owner, controlFlags, aces: null });
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
const aces: ParsedAce[] = [];
|
|
195
|
+
for (let k = 0; k < aceCount; k++) {
|
|
196
|
+
const raw = (lines[at++] ?? "").split("|");
|
|
197
|
+
if (raw.length === 4 && raw[0] === "A" && raw[1] === String(i) && raw[3] === "X" && /^\d+$/.test(raw[2]!)) {
|
|
198
|
+
aces.push({ opaque: true, type: Number(raw[2]), flags: null, mask: null, sid: null, callback: null, malformed: false, raw });
|
|
199
|
+
} else if (raw.length === 7 && raw[0] === "A" && raw[1] === String(i) && /^-?\d+$/.test(raw[2]!)
|
|
200
|
+
&& /^\d+$/.test(raw[3]!) && /^-?\d+$/.test(raw[4]!) && SID.test(raw[5]!)
|
|
201
|
+
&& (raw[6] === "True" || raw[6] === "False")) {
|
|
202
|
+
aces.push({ opaque: false, type: Number(raw[2]), flags: Number(raw[3]), mask: Number(raw[4]),
|
|
203
|
+
sid: raw[5]!.toUpperCase(), callback: raw[6] === "True", malformed: false, raw });
|
|
204
|
+
} else {
|
|
205
|
+
aces.push({ opaque: false, type: null, flags: null, mask: null, sid: null, callback: null, malformed: true, raw });
|
|
206
|
+
}
|
|
130
207
|
}
|
|
131
|
-
|
|
208
|
+
entries.push({ owner, controlFlags, aces });
|
|
132
209
|
}
|
|
133
|
-
|
|
210
|
+
if (at !== lines.length - 1) return null;
|
|
211
|
+
return { user: token[1]!.toUpperCase(),
|
|
212
|
+
acceptsAdministrators: token[2]!.toUpperCase() === ADMINISTRATORS && token[3] === "True",
|
|
213
|
+
administratorsEnabled: token[3] === "True",
|
|
214
|
+
entries };
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
/** The exact hardened-object policy; unchanged by the shared parser. */
|
|
218
|
+
function privateEntryOk(entry: ParsedEntry | null, directory: boolean, run: ParsedAclRun, allowEnabledAdmin = false): boolean {
|
|
219
|
+
if (!entry || entry.aces === null) return false;
|
|
220
|
+
const flags = entry.controlFlags;
|
|
221
|
+
if (flags > 0xffff || (flags & PRIVATE_DACL_FLAGS) !== PRIVATE_DACL_FLAGS) return false;
|
|
222
|
+
const owner = entry.owner;
|
|
223
|
+
const user = run.user;
|
|
224
|
+
if (owner !== user && !(owner === ADMINISTRATORS
|
|
225
|
+
&& (run.acceptsAdministrators || (allowEnabledAdmin && run.administratorsEnabled)))) return false;
|
|
226
|
+
// The serving account needs its own Full Control entry. SYSTEM and Administrators may also hold plain
|
|
227
|
+
// allow entries: LocalSystem and an elevated administrator can already take ownership of any object, and a
|
|
228
|
+
// filtered administrator token holds Administrators only as deny-only, so the allow entry grants it nothing.
|
|
229
|
+
const grantees = new Set<string>();
|
|
230
|
+
for (const ace of entry.aces) {
|
|
231
|
+
if (ace.opaque || ace.malformed || ace.raw.length !== 7 || ace.raw[2] !== "0"
|
|
232
|
+
|| ace.raw[3] !== (directory ? "3" : "0") || !/^[1-9]\d{0,9}$/.test(ace.raw[4]!)
|
|
233
|
+
|| ace.callback !== false) return false;
|
|
234
|
+
const grantee = ace.sid!;
|
|
235
|
+
if (grantees.has(grantee)) return false;
|
|
236
|
+
grantees.add(grantee);
|
|
237
|
+
if (grantee === user ? ace.raw[4] !== String(FULL_CONTROL) : !PRIVILEGED_GRANTEES.has(grantee)) return false;
|
|
238
|
+
}
|
|
239
|
+
return grantees.has(user);
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
/**
|
|
243
|
+
* Confined-write and trusted-ancestry policies for objects this process did not create.
|
|
244
|
+
*
|
|
245
|
+
* Deny ACEs are permitted because they can only remove access; allow ACEs must be
|
|
246
|
+
* ordinary non-callback CommonAce entries. Inherit-only ACEs are skipped: they are
|
|
247
|
+
* templates for children, and every object this module protects carries its own
|
|
248
|
+
* hardened protected DACL, so an ancestor's template cannot grant anything inside it.
|
|
249
|
+
*/
|
|
250
|
+
function confinedEntryOk(entry: ParsedEntry | null, run: ParsedAclRun, policy: WindowsAclPolicy): boolean {
|
|
251
|
+
if (!entry || entry.aces === null || (entry.controlFlags & 0x4 /* SE_DACL_PRESENT */) === 0) return false;
|
|
252
|
+
const owner = entry.owner;
|
|
253
|
+
// Trusted ownership is independent of this token's elevation state: the owner
|
|
254
|
+
// controls the DACL, and a kernel-equivalent owner can already take ownership of
|
|
255
|
+
// any object, so accepting it grants nothing. A filtered token must still pass
|
|
256
|
+
// an Administrators-owned profile parent — gating on acceptsAdministrators
|
|
257
|
+
// would refuse the identical, legitimate directory when run non-elevated.
|
|
258
|
+
const owned = owner === run.user || TRUSTED_ANCESTOR_OWNERS.has(owner);
|
|
259
|
+
if (!owned) return false;
|
|
260
|
+
for (const ace of entry.aces) {
|
|
261
|
+
if (ace.malformed || ace.opaque || ace.callback === true || ace.type === null) return false;
|
|
262
|
+
if (ace.type === 1) continue; // ACCESS_DENIED: removes access, never grants it.
|
|
263
|
+
if (ace.type !== 0) return false; // only ACCESS_ALLOWED records can be evaluated.
|
|
264
|
+
if (ace.flags === null || ace.mask === null || ace.sid === null) return false;
|
|
265
|
+
if ((ace.flags & INHERIT_ONLY_ACE) !== 0) continue;
|
|
266
|
+
if (ace.sid === run.user || TRUSTED_WRITE_SIDS.has(ace.sid)) continue;
|
|
267
|
+
const createOk = policy === "trusted-ancestry" && STICKY_OWNERS.has(owner) ? CREATE_MASK : 0;
|
|
268
|
+
const allowed = (READ_MASK | createOk) >>> 0;
|
|
269
|
+
if (((ace.mask >>> 0) & ~allowed) !== 0) return false;
|
|
270
|
+
}
|
|
271
|
+
return true;
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
/** Pure, strict line-protocol parser and owner/effective-DACL policy. No account names or SDDL. */
|
|
275
|
+
export function windowsPrivateEntriesAclMatches(stdout: string | Uint8Array, entries: readonly WindowsPrivateEntry[]): boolean {
|
|
276
|
+
if (entries.length === 0) return false;
|
|
277
|
+
const run = parseAclProtocol(stdout, entries.length);
|
|
278
|
+
if (!run) return false;
|
|
279
|
+
return entries.every((entry, index) => privateEntryOk(run.entries[index] ?? null, entry.directory, run));
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
/**
|
|
283
|
+
* Mixed-policy evaluation for a batch of entries, each defaulting to "private".
|
|
284
|
+
* One PowerShell read covers the whole chain (ancestors, config root, store objects)
|
|
285
|
+
* so the ACL snapshot is taken once per operation phase, not per path.
|
|
286
|
+
*/
|
|
287
|
+
export function windowsEntriesAclMatches(stdout: string | Uint8Array, entries: readonly WindowsAclEntry[]): boolean {
|
|
288
|
+
if (entries.length === 0) return false;
|
|
289
|
+
const run = parseAclProtocol(stdout, entries.length);
|
|
290
|
+
if (!run) return false;
|
|
291
|
+
return entries.every((entry, index) => {
|
|
292
|
+
const policy = entry.policy ?? "private";
|
|
293
|
+
// Runtime roots can predate this token's default owner. Enabled membership is
|
|
294
|
+
// authoritative here; pairing/secret-file admission retains its stricter policy.
|
|
295
|
+
if (policy === "private-runtime-directory") return entry.directory
|
|
296
|
+
&& privateEntryOk(run.entries[index] ?? null, true, run, true);
|
|
297
|
+
return policy === "private" ? privateEntryOk(run.entries[index] ?? null, entry.directory, run)
|
|
298
|
+
: confinedEntryOk(run.entries[index] ?? null, run, policy);
|
|
299
|
+
});
|
|
134
300
|
}
|
|
135
301
|
|
|
136
302
|
/** Fresh, read-only verification; runner failures never disclose paths, SIDs or ACL output. */
|
|
@@ -141,3 +307,77 @@ export function verifyWindowsPrivateEntries(entries: readonly WindowsPrivateEntr
|
|
|
141
307
|
return result.success && !result.timedOut && windowsPrivateEntriesAclMatches(result.stdout, entries);
|
|
142
308
|
} catch { return false; }
|
|
143
309
|
}
|
|
310
|
+
|
|
311
|
+
/**
|
|
312
|
+
* Async counterpart of the sync runner: the PowerShell read is identical, but the
|
|
313
|
+
* caller's event loop is not held while waiting. This read-only lookup opts out of the
|
|
314
|
+
* post-kill reap wait (`waitForSubprocessExit(..., 0)`: see the helper contract below):
|
|
315
|
+
* on timeout it requests termination and returns `timedOut` without waiting for the
|
|
316
|
+
* kernel to release the child's handles. The late exit/result is ignored and stdout is
|
|
317
|
+
* not read. A stalled Get-Acl child may transiently touch owner, lock or ledger files
|
|
318
|
+
* and keep them busy (for example, causing a markDelete to fail) until the OS reaps it.
|
|
319
|
+
* This bounded availability risk avoids an unbounded caller stall; verification fails
|
|
320
|
+
* closed.
|
|
321
|
+
*/
|
|
322
|
+
async function defaultWindowsOwnerAclAsyncRunner(
|
|
323
|
+
entries: readonly WindowsAclEntry[],
|
|
324
|
+
timeoutMs: number,
|
|
325
|
+
): Promise<WindowsOwnerAclResult> {
|
|
326
|
+
// Whole-tree batches must not overflow Windows' environment block with paths.
|
|
327
|
+
// Base64 lines are data on stdin; no candidate text is PowerShell source.
|
|
328
|
+
const env: Record<string, string | undefined> = { ...process.env, OCX_ACL_COUNT: String(entries.length), OCX_ACL_STDIN: "1" };
|
|
329
|
+
const input = Buffer.from(entries.map(entry => Buffer.from(entry.path, "utf8").toString("base64")).join("\n") + "\n");
|
|
330
|
+
let proc;
|
|
331
|
+
try {
|
|
332
|
+
proc = Bun.spawn([
|
|
333
|
+
resolveTrustedWindowsPowerShellExe(), "-NoLogo", "-NoProfile", "-NonInteractive",
|
|
334
|
+
"-ExecutionPolicy", "Bypass", "-EncodedCommand", ENCODED_ACL_SCRIPT,
|
|
335
|
+
], {
|
|
336
|
+
env, stdin: input, stdout: "pipe", stderr: "ignore", windowsHide: true,
|
|
337
|
+
});
|
|
338
|
+
} catch {
|
|
339
|
+
return { success: false, timedOut: false, stdout: new Uint8Array() };
|
|
340
|
+
}
|
|
341
|
+
// No post-kill reap wait: that wait exists for children whose still-open handles
|
|
342
|
+
// gate a later removal (the icacls hardening case). This lookup holds no path it
|
|
343
|
+
// must release for the caller's own writes, but its transient Get-Acl handle can
|
|
344
|
+
// touch the verified owner, lock or ledger files, so abandoning a stalled child
|
|
345
|
+
// is not free: while it lingers it can refuse a markDelete and leave the lock
|
|
346
|
+
// busy until the kernel reaps it. That residual availability cost beats an
|
|
347
|
+
// unbounded caller stall — the verdict stays timedOut, the late result is never
|
|
348
|
+
// read, and the runner fails closed. windows-user-principal.ts opts out the
|
|
349
|
+
// same way for its read-only lookup.
|
|
350
|
+
// Drain while the verifier runs. A whole npm tree can fill the pipe before
|
|
351
|
+
// exit; waiting for exit first turns a valid batch into an artificial timeout.
|
|
352
|
+
const reading = proc.stdout ? new Response(proc.stdout).text().catch(() => "") : Promise.resolve("");
|
|
353
|
+
const { exitCode, timedOut } = await waitForSubprocessExit(proc, timeoutMs, 0);
|
|
354
|
+
const stdout = !timedOut ? await reading : "";
|
|
355
|
+
return { success: !timedOut && exitCode === 0, timedOut, stdout };
|
|
356
|
+
}
|
|
357
|
+
let ownerAclAsyncRunner: WindowsOwnerAclAsyncRunner = defaultWindowsOwnerAclAsyncRunner;
|
|
358
|
+
|
|
359
|
+
export function setWindowsOwnerAclAsyncRunnerForTests(runner: WindowsOwnerAclAsyncRunner | null): void {
|
|
360
|
+
ownerAclAsyncRunner = runner ?? defaultWindowsOwnerAclAsyncRunner;
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
/** Async mixed-policy verification; runner failures never disclose paths, SIDs or ACL output. */
|
|
364
|
+
export async function verifyWindowsEntriesAclAsync(entries: readonly WindowsAclEntry[], timeoutMs: number): Promise<boolean> {
|
|
365
|
+
if (entries.length === 0 || !Number.isFinite(timeoutMs) || timeoutMs <= 0) return false;
|
|
366
|
+
try {
|
|
367
|
+
const result = await ownerAclAsyncRunner(entries, Math.max(1, Math.min(WINDOWS_OWNER_ACL_TIMEOUT_MS, Math.floor(timeoutMs))));
|
|
368
|
+
return result.success && !result.timedOut && windowsEntriesAclMatches(result.stdout, entries);
|
|
369
|
+
} catch { return false; }
|
|
370
|
+
}
|
|
371
|
+
/** Async private-only verification for hardening paths that must yield; every entry uses the "private" policy. */
|
|
372
|
+
export async function verifyWindowsPrivateEntriesAsync(entries: readonly WindowsPrivateEntry[], timeoutMs: number): Promise<boolean> {
|
|
373
|
+
return verifyWindowsEntriesAclAsync(entries.map(({ path, directory }) => ({ path, directory, policy: "private" as const })), timeoutMs);
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
/** Synchronous admission/commit boundaries use the identical mixed-policy parser. */
|
|
377
|
+
export function verifyWindowsEntriesAcl(entries: readonly WindowsAclEntry[], timeoutMs: number): boolean {
|
|
378
|
+
if (entries.length === 0 || !Number.isFinite(timeoutMs) || timeoutMs <= 0) return false;
|
|
379
|
+
try {
|
|
380
|
+
const result = ownerAclRunner(entries, Math.max(1, Math.min(WINDOWS_OWNER_ACL_TIMEOUT_MS, Math.floor(timeoutMs))));
|
|
381
|
+
return result.success && !result.timedOut && windowsEntriesAclMatches(result.stdout, entries);
|
|
382
|
+
} catch { return false; }
|
|
383
|
+
}
|