machine-bridge-mcp 2.0.0 → 3.0.0-beta.102
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/CHANGELOG.md +1142 -0
- package/CONTRIBUTING.md +23 -25
- package/GOVERNANCE.md +2 -2
- package/README.md +58 -20
- package/SECURITY.md +161 -120
- package/SUPPORT.md +1 -1
- package/browser-extension/broker-auth.js +83 -0
- package/browser-extension/broker-liveness.js +35 -0
- package/browser-extension/browser-error-boundary.js +96 -0
- package/browser-extension/browser-operations.js +1456 -101
- package/browser-extension/devtools-input.js +195 -34
- package/browser-extension/devtools-observation.js +429 -0
- package/browser-extension/devtools-session.js +48 -0
- package/browser-extension/manifest.json +4 -3
- package/browser-extension/page-automation.js +578 -118
- package/browser-extension/pairing-bootstrap.js +42 -0
- package/browser-extension/pairing.js +28 -12
- package/browser-extension/service-worker.js +126 -106
- package/docs/AGENT_CONTEXT.md +13 -10
- package/docs/ARCHITECTURE.md +159 -67
- package/docs/AUDIT.md +1302 -4
- package/docs/CLIENTS.md +19 -6
- package/docs/COMPUTER_USE.md +297 -0
- package/docs/ENGINEERING.md +72 -13
- package/docs/GETTING_STARTED.md +18 -20
- package/docs/LOCAL_AUTHORIZATION.md +115 -72
- package/docs/LOCAL_AUTOMATION.md +27 -21
- package/docs/LOGGING.md +40 -19
- package/docs/MANAGED_JOBS.md +37 -34
- package/docs/MULTI_ACCOUNT.md +98 -37
- package/docs/OPERATIONS.md +145 -51
- package/docs/OVERVIEW.md +14 -11
- package/docs/POLICY_REFERENCE.md +71 -3
- package/docs/PRIVACY.md +41 -2
- package/docs/PROJECT_STANDARDS.md +29 -6
- package/docs/RELEASING.md +238 -64
- package/docs/TESTING.md +150 -39
- package/docs/THREAT_MODEL.md +164 -67
- package/docs/TOOL_REFERENCE.md +653 -60
- package/docs/UPGRADING.md +78 -18
- package/native/macos/MachineBridgeBackgroundInput.swift +1051 -0
- package/native/macos/MachineBridgeBackgroundInputSmokeFixture.swift +295 -0
- package/native/macos/MachineBridgeTrustBroker.swift +233 -0
- package/package.json +94 -16
- package/scripts/accepted-candidate-tarball.mjs +77 -0
- package/scripts/candidate-runtime-store.mjs +93 -0
- package/scripts/check-plan.mjs +73 -3
- package/scripts/check-runner.mjs +129 -17
- package/scripts/commit-message-check.mjs +5 -2
- package/scripts/consumer-package-security.mjs +293 -0
- package/scripts/coverage-check.mjs +251 -15
- package/scripts/coverage-generation.mjs +41 -0
- package/scripts/coverage-range-merge.mjs +41 -0
- package/scripts/foreground-daemon-recovery.mjs +88 -0
- package/scripts/generate-policy-reference.mjs +28 -5
- package/scripts/generate-tool-reference.mjs +1 -1
- package/scripts/generate-worker-types.mjs +21 -11
- package/scripts/github-backlog.mjs +11 -10
- package/scripts/github-push.mjs +62 -16
- package/scripts/github-release-asset.mjs +58 -0
- package/scripts/github-release.mjs +241 -132
- package/scripts/global-package-installation.mjs +68 -0
- package/scripts/hardened-npm-session.mjs +42 -0
- package/scripts/install-published-prerelease.mjs +198 -0
- package/scripts/local-release-acceptance.mjs +103 -45
- package/scripts/macos-background-input-smoke.mjs +515 -0
- package/scripts/network-retry.mjs +8 -1
- package/scripts/npm-global-prefix.mjs +27 -0
- package/scripts/npm-publication-policy.mjs +17 -0
- package/scripts/official-mcp-conformance.mjs +267 -0
- package/scripts/persistent-activation-process.mjs +101 -0
- package/scripts/prepare-pinned-npm.mjs +12 -69
- package/scripts/prerelease-activation.mjs +160 -0
- package/scripts/privacy-check.mjs +14 -6
- package/scripts/promotion-digest.mjs +128 -0
- package/scripts/publish-npm.mjs +260 -0
- package/scripts/published-release.mjs +132 -0
- package/scripts/release-acceptance.mjs +62 -54
- package/scripts/release-browser-extension-store.mjs +172 -0
- package/scripts/release-candidate-manifest.mjs +52 -0
- package/scripts/release-channel.mjs +106 -0
- package/scripts/release-diagnostic.mjs +41 -0
- package/scripts/release-impact-check.mjs +12 -22
- package/scripts/release-oauth-canary-core.mjs +325 -0
- package/scripts/release-oauth-canary-evidence.mjs +100 -0
- package/scripts/release-oauth-canary.mjs +127 -0
- package/scripts/release-publication-guard.mjs +67 -0
- package/scripts/release-soak.mjs +284 -0
- package/scripts/release-state.mjs +1 -1
- package/scripts/run-checks.mjs +44 -7
- package/scripts/run-worker-dry-run.mjs +21 -0
- package/scripts/sarif-security-gate.mjs +2 -1
- package/scripts/sbom-check.mjs +106 -0
- package/scripts/start-release-candidate.mjs +267 -44
- package/scripts/syntax-check.mjs +36 -14
- package/scripts/verification-generation-guard.mjs +15 -0
- package/scripts/verification-idle-sleep-guard.mjs +37 -0
- package/scripts/verification-state.mjs +108 -0
- package/scripts/wrangler-command-lifecycle.mjs +115 -0
- package/src/local/account-access.mjs +13 -1
- package/src/local/account-admin-response.mjs +92 -0
- package/src/local/account-admin.mjs +52 -19
- package/src/local/agent-context-projection.mjs +26 -7
- package/src/local/agent-context.mjs +88 -49
- package/src/local/agent-skill-discovery.mjs +16 -5
- package/src/local/app-automation-macos-jxa.mjs +350 -0
- package/src/local/app-automation.mjs +873 -163
- package/src/local/application-capability-projection.mjs +24 -0
- package/src/local/authority-context.mjs +106 -0
- package/src/local/autostart-log-maintenance.mjs +36 -0
- package/src/local/browser-bridge-http.mjs +5 -3
- package/src/local/browser-bridge.mjs +109 -31
- package/src/local/browser-broker-auth-http.mjs +67 -0
- package/src/local/browser-broker-auth.mjs +98 -0
- package/src/local/browser-broker-routes.mjs +63 -20
- package/src/local/browser-broker-server.mjs +17 -7
- package/src/local/browser-command.mjs +79 -30
- package/src/local/browser-computer-observation-service.mjs +266 -0
- package/src/local/browser-extension-identity.mjs +50 -0
- package/src/local/browser-extension-path.mjs +22 -0
- package/src/local/browser-extension-protocol.mjs +50 -11
- package/src/local/browser-operation-service.mjs +147 -117
- package/src/local/browser-pairing-grant.mjs +109 -0
- package/src/local/browser-pairing-http.mjs +36 -0
- package/src/local/browser-pairing-launch.mjs +58 -0
- package/src/local/browser-pairing-store.mjs +85 -48
- package/src/local/browser-request-registry.mjs +40 -14
- package/src/local/browser-request-settlement.mjs +78 -0
- package/src/local/browser-resource-input.mjs +74 -0
- package/src/local/browser-trusted-input-health.mjs +63 -0
- package/src/local/call-authority.mjs +21 -0
- package/src/local/call-capacity.mjs +45 -0
- package/src/local/call-registry-drain.mjs +54 -0
- package/src/local/call-registry.mjs +30 -15
- package/src/local/capability-observer.mjs +5 -0
- package/src/local/capability-ranking.mjs +3 -2
- package/src/local/child-process-settlement.mjs +132 -0
- package/src/local/cli-account-admin.mjs +40 -6
- package/src/local/cli-activate.mjs +162 -0
- package/src/local/cli-local-admin.mjs +20 -45
- package/src/local/cli-options.mjs +12 -13
- package/src/local/cli-ready-output.mjs +52 -0
- package/src/local/cli-service.mjs +91 -11
- package/src/local/cli.mjs +232 -150
- package/src/local/computer-use-application-observation.mjs +224 -0
- package/src/local/computer-use-arguments.mjs +270 -0
- package/src/local/computer-use-deadline.mjs +50 -0
- package/src/local/computer-use-dispatch-settlement.mjs +40 -0
- package/src/local/computer-use-expectation.mjs +171 -0
- package/src/local/computer-use-observation.mjs +769 -0
- package/src/local/computer-use-recovery.mjs +82 -0
- package/src/local/computer-use-result-budget.mjs +145 -0
- package/src/local/computer-use-snapshot-store.mjs +67 -0
- package/src/local/computer-use.mjs +2255 -0
- package/src/local/daemon-http-relay-auth.mjs +26 -0
- package/src/local/daemon-http-relay-connection.mjs +298 -0
- package/src/local/daemon-http-relay-request.mjs +64 -0
- package/src/local/daemon-http-relay-sequence.mjs +49 -0
- package/src/local/daemon-process.mjs +40 -7
- package/src/local/delegated-process-sandbox.mjs +148 -0
- package/src/local/device-identity.mjs +156 -49
- package/src/local/device-root-provider.mjs +81 -0
- package/src/local/directory-metadata.mjs +47 -0
- package/src/local/doctor-reporting.mjs +23 -0
- package/src/local/durable-process-spec.mjs +80 -0
- package/src/local/errors.mjs +25 -15
- package/src/local/exclusive-file.mjs +74 -26
- package/src/local/execution-limits.mjs +9 -0
- package/src/local/execution-routing.mjs +276 -0
- package/src/local/execution-surface.mjs +23 -0
- package/src/local/file-mutation-coordinator.mjs +47 -0
- package/src/local/file-snapshot-preservation.mjs +24 -0
- package/src/local/filesystem-identity.mjs +54 -0
- package/src/local/fixed-process-environment.mjs +21 -0
- package/src/local/full-access-test.mjs +31 -13
- package/src/local/git-commit.mjs +69 -0
- package/src/local/git-config-safety.mjs +55 -0
- package/src/local/git-log-parser.mjs +41 -0
- package/src/local/git-metadata-boundary.mjs +77 -0
- package/src/local/git-metadata-tree-safety.mjs +59 -0
- package/src/local/git-operation-state.mjs +19 -0
- package/src/local/git-service.mjs +165 -30
- package/src/local/hardened-npm-download-timeout.mjs +46 -0
- package/src/local/hardened-npm-download.mjs +109 -0
- package/src/local/hardened-npm-extract.mjs +20 -0
- package/src/local/hardened-npm-verification.mjs +104 -0
- package/src/local/hardened-npm.mjs +199 -0
- package/src/local/job-runner.mjs +244 -89
- package/src/local/lifecycle.mjs +6 -0
- package/src/local/log.mjs +19 -45
- package/src/local/macos-background-input.mjs +398 -0
- package/src/local/macos-idle-sleep-assertion.mjs +65 -0
- package/src/local/macos-trust-broker.mjs +404 -0
- package/src/local/managed-job-cancellation.mjs +42 -0
- package/src/local/managed-job-capacity.mjs +16 -0
- package/src/local/managed-job-directory-generation.mjs +60 -0
- package/src/local/managed-job-directory.mjs +75 -0
- package/src/local/managed-job-durable-process.mjs +49 -0
- package/src/local/managed-job-lock.mjs +46 -14
- package/src/local/managed-job-plan.mjs +38 -14
- package/src/local/managed-job-projection.mjs +23 -15
- package/src/local/managed-job-retention.mjs +128 -0
- package/src/local/managed-job-runner-claim.mjs +70 -0
- package/src/local/managed-job-runner.mjs +35 -10
- package/src/local/managed-job-storage.mjs +22 -6
- package/src/local/managed-job-terminal-maintenance.mjs +40 -0
- package/src/local/managed-job-terminal.mjs +150 -0
- package/src/local/managed-jobs.mjs +424 -287
- package/src/local/npm-cli.mjs +42 -0
- package/src/local/npm-environment.mjs +37 -0
- package/src/local/operation-authorization.mjs +68 -324
- package/src/local/operation-risk.mjs +51 -4
- package/src/local/owner-state-lock.mjs +118 -0
- package/src/local/package-identity.mjs +9 -0
- package/src/local/patch.mjs +20 -18
- package/src/local/path-inspection.mjs +23 -0
- package/src/local/policy.mjs +19 -0
- package/src/local/private-toolchain-integrity.mjs +54 -0
- package/src/local/process-execution.mjs +87 -75
- package/src/local/process-foreground-timeout.mjs +50 -0
- package/src/local/process-identity.mjs +41 -7
- package/src/local/process-nonreplayable-settlement.mjs +50 -0
- package/src/local/process-result-projection.mjs +22 -0
- package/src/local/process-session-events.mjs +47 -0
- package/src/local/process-session-remote-activity.mjs +10 -0
- package/src/local/process-session-termination.mjs +73 -0
- package/src/local/process-sessions.mjs +144 -112
- package/src/local/process-tracker.mjs +140 -13
- package/src/local/process-tree-ownership-types.d.ts +37 -0
- package/src/local/process-tree-ownership.mjs +57 -0
- package/src/local/process-tree-signal.mjs +34 -0
- package/src/local/process-tree-snapshot.mjs +77 -0
- package/src/local/process-tree-supervisor.mjs +69 -0
- package/src/local/process-tree.mjs +11 -53
- package/src/local/project-metadata.mjs +19 -6
- package/src/local/relay-call-recovery.mjs +58 -38
- package/src/local/relay-connection-classification.mjs +131 -0
- package/src/local/relay-connection-support.mjs +91 -0
- package/src/local/relay-connection.mjs +179 -272
- package/src/local/relay-diagnostics.mjs +91 -0
- package/src/local/relay-heartbeat.mjs +119 -0
- package/src/local/relay-liveness.mjs +109 -0
- package/src/local/relay-peer-diagnostics.mjs +29 -0
- package/src/local/release-runtime-lock.mjs +18 -0
- package/src/local/remote-activity-idle-sleep-guard.mjs +77 -0
- package/src/local/remote-configuration.mjs +48 -0
- package/src/local/resilient-relay-connection.mjs +178 -0
- package/src/local/resource-admission-diagnostics.mjs +52 -0
- package/src/local/resource-admission-policy.mjs +115 -0
- package/src/local/resource-admission.mjs +339 -0
- package/src/local/resource-build-root.mjs +83 -0
- package/src/local/resource-cargo-concurrency.mjs +38 -0
- package/src/local/resource-cmake-concurrency.mjs +42 -0
- package/src/local/resource-command-concurrency.mjs +37 -0
- package/src/local/resource-command-profile.mjs +176 -0
- package/src/local/resource-coordinator-accounting.mjs +21 -0
- package/src/local/resource-cpu-window.mjs +20 -0
- package/src/local/resource-disk-headroom.mjs +13 -0
- package/src/local/resource-elastic-memory.mjs +19 -0
- package/src/local/resource-elastic-request.mjs +36 -0
- package/src/local/resource-foreground-wait.mjs +29 -0
- package/src/local/resource-go-concurrency.mjs +43 -0
- package/src/local/resource-gradle-concurrency.mjs +57 -0
- package/src/local/resource-host-cache.mjs +39 -0
- package/src/local/resource-host-darwin.mjs +54 -0
- package/src/local/resource-host-linux.mjs +35 -0
- package/src/local/resource-host-sample-file.mjs +23 -0
- package/src/local/resource-host-snapshot.mjs +99 -0
- package/src/local/resource-lease-accounting.mjs +119 -0
- package/src/local/resource-light-command.mjs +6 -0
- package/src/local/resource-make-concurrency.mjs +42 -0
- package/src/local/resource-maven-concurrency.mjs +38 -0
- package/src/local/resource-ninja-command-concurrency.mjs +20 -0
- package/src/local/resource-ninja-concurrency.mjs +28 -0
- package/src/local/resource-operations.mjs +26 -10
- package/src/local/resource-pressure.mjs +67 -0
- package/src/local/resource-probe-command.mjs +35 -0
- package/src/local/resource-process-admission.mjs +59 -0
- package/src/local/resource-process-ancestry-cache.mjs +43 -0
- package/src/local/resource-process-ancestry.mjs +32 -0
- package/src/local/resource-process-priority.mjs +15 -0
- package/src/local/resource-project-key.mjs +53 -0
- package/src/local/resource-pytest-concurrency.mjs +33 -0
- package/src/local/resource-release-control-classification.mjs +14 -0
- package/src/local/resource-release-control-executable.mjs +70 -0
- package/src/local/resource-release-control-workspace.mjs +41 -0
- package/src/local/resource-request-contract.mjs +30 -0
- package/src/local/resource-script-classification.mjs +44 -0
- package/src/local/resource-shell-analysis.mjs +58 -0
- package/src/local/resource-staging-recovery.mjs +97 -0
- package/src/local/resource-swift-concurrency.mjs +31 -0
- package/src/local/resource-transaction-lock.mjs +189 -0
- package/src/local/resource-wait.mjs +48 -0
- package/src/local/resource-waiters.mjs +139 -0
- package/src/local/resource-xcode-command.mjs +7 -0
- package/src/local/resource-xcode-concurrency.mjs +34 -0
- package/src/local/resource-xcode-non-build.mjs +19 -0
- package/src/local/runtime-activation.mjs +700 -0
- package/src/local/runtime-activity-projection.mjs +48 -0
- package/src/local/runtime-capabilities.mjs +48 -15
- package/src/local/runtime-diagnostic-state.mjs +14 -0
- package/src/local/runtime-diagnostics.mjs +40 -13
- package/src/local/runtime-info-projection.mjs +60 -0
- package/src/local/runtime-info-relay-projection.mjs +21 -0
- package/src/local/runtime-paths.mjs +2 -1
- package/src/local/runtime-process-routing.mjs +33 -0
- package/src/local/runtime-relay-connection-options.mjs +44 -0
- package/src/local/runtime-relay-control.mjs +98 -0
- package/src/local/runtime-relay.mjs +26 -50
- package/src/local/runtime-reporting.mjs +37 -21
- package/src/local/runtime-resource-service.mjs +77 -0
- package/src/local/runtime-tool-handlers.mjs +13 -10
- package/src/local/runtime.mjs +244 -208
- package/src/local/secure-file.mjs +73 -20
- package/src/local/security-audit-dispatch.mjs +35 -0
- package/src/local/security-audit-log.mjs +215 -0
- package/src/local/security-audit-state.mjs +139 -0
- package/src/local/security-audit-storage.mjs +135 -0
- package/src/local/security-audit-warning.mjs +31 -0
- package/src/local/security-audit-worker.mjs +87 -0
- package/src/local/service-convergence.mjs +42 -1
- package/src/local/service-definition.mjs +24 -0
- package/src/local/service-environment.mjs +18 -10
- package/src/local/service-owner.mjs +146 -0
- package/src/local/service-ownership.mjs +17 -0
- package/src/local/service-restart-handoff.mjs +64 -0
- package/src/local/service-restart-scheduler.mjs +49 -0
- package/src/local/service-runtime-convergence.mjs +52 -0
- package/src/local/service-runtime.mjs +105 -0
- package/src/local/service-status.mjs +60 -0
- package/src/local/service.mjs +385 -92
- package/src/local/shell.mjs +39 -19
- package/src/local/ssh-key.mjs +158 -42
- package/src/local/state-inventory.mjs +50 -24
- package/src/local/state-owner-lock-inventory.mjs +23 -0
- package/src/local/state-root-owned-namespaces.mjs +83 -0
- package/src/local/state-root-retirement.mjs +89 -0
- package/src/local/state.mjs +386 -96
- package/src/local/stdio.mjs +96 -66
- package/src/local/support-state-projection.mjs +30 -0
- package/src/local/system-network-route.mjs +76 -0
- package/src/local/systemd-removal.mjs +20 -0
- package/src/local/tool-executor.mjs +85 -20
- package/src/local/tool-result-boundary.mjs +51 -0
- package/src/local/toolchain-operation-lock.mjs +41 -0
- package/src/local/tools.mjs +7 -5
- package/src/local/trusted-executable.mjs +53 -0
- package/src/local/trusted-git-executable.mjs +34 -0
- package/src/local/trusted-github-cli.mjs +24 -0
- package/src/local/windows-service-convergence.mjs +49 -0
- package/src/local/windows-service.mjs +52 -45
- package/src/local/worker-deployment-fingerprint.mjs +102 -0
- package/src/local/worker-deployment.mjs +48 -60
- package/src/local/worker-health.mjs +12 -4
- package/src/local/worker-secret-file.mjs +37 -17
- package/src/local/workspace-file-service.mjs +156 -239
- package/src/local/workspace-file-transaction.mjs +189 -0
- package/src/local/workspace-search.mjs +55 -0
- package/src/local/wrangler-toolchain/package-lock.json +1505 -0
- package/src/local/wrangler-toolchain/package.json +23 -0
- package/src/local/wrangler-toolchain-verification.mjs +135 -0
- package/src/local/wrangler-toolchain.mjs +188 -0
- package/src/shared/access-contract.json +7 -1
- package/src/shared/activation-recovery.mjs +49 -0
- package/src/shared/admin-auth.d.mts +2 -1
- package/src/shared/admin-auth.mjs +3 -3
- package/src/shared/authority-revocation.d.mts +9 -0
- package/src/shared/authority-revocation.mjs +28 -0
- package/src/shared/daemon-auth.d.mts +11 -0
- package/src/shared/daemon-auth.mjs +17 -0
- package/src/shared/device-session-auth.d.mts +20 -0
- package/src/shared/device-session-auth.mjs +51 -0
- package/src/shared/foreground-timeout.d.mts +15 -0
- package/src/shared/foreground-timeout.mjs +70 -0
- package/src/shared/log-redaction.d.mts +9 -0
- package/src/shared/log-redaction.mjs +51 -0
- package/src/shared/mcp-protocol.d.mts +27 -0
- package/src/shared/mcp-protocol.mjs +275 -0
- package/src/shared/project-overview-projection.d.mts +4 -0
- package/src/shared/project-overview-projection.mjs +96 -0
- package/src/shared/relay-contract.json +28 -0
- package/src/shared/result-projection.d.mts +2 -1
- package/src/shared/result-projection.mjs +13 -2
- package/src/shared/server-metadata.json +15 -9
- package/src/shared/tool-argument-validation.d.mts +17 -0
- package/src/shared/tool-argument-validation.mjs +325 -0
- package/src/shared/tool-call-capacity.d.mts +41 -0
- package/src/shared/tool-call-capacity.mjs +59 -0
- package/src/shared/tool-catalog.json +626 -57
- package/src/worker/access.ts +12 -0
- package/src/worker/account-admin.ts +55 -33
- package/src/worker/authority-revocations.ts +174 -0
- package/src/worker/authority.ts +52 -6
- package/src/worker/daemon-auth.ts +49 -68
- package/src/worker/daemon-channel.ts +36 -0
- package/src/worker/daemon-http-auth.ts +63 -0
- package/src/worker/daemon-http-channel.ts +120 -0
- package/src/worker/daemon-http-controller.ts +163 -0
- package/src/worker/daemon-http-protocol.ts +62 -0
- package/src/worker/daemon-http-registry.ts +82 -0
- package/src/worker/daemon-last-observation.ts +30 -0
- package/src/worker/daemon-liveness.ts +8 -6
- package/src/worker/daemon-ready-dispatch.ts +17 -0
- package/src/worker/daemon-ready-messages.ts +73 -0
- package/src/worker/daemon-ready-waiters.ts +79 -0
- package/src/worker/daemon-recovery-budget.ts +13 -0
- package/src/worker/daemon-registry.ts +58 -0
- package/src/worker/daemon-relay-diagnostics.ts +127 -0
- package/src/worker/daemon-socket-attachment.ts +55 -0
- package/src/worker/daemon-sockets.ts +72 -62
- package/src/worker/daemon-status.ts +38 -0
- package/src/worker/device-session-verifier.ts +129 -0
- package/src/worker/dpop.ts +157 -0
- package/src/worker/durable-process-timeout.ts +29 -0
- package/src/worker/errors.ts +57 -0
- package/src/worker/http.ts +112 -26
- package/src/worker/index.ts +446 -440
- package/src/worker/mcp-access.ts +57 -0
- package/src/worker/mcp-controller.ts +188 -0
- package/src/worker/mcp-http-accept.ts +11 -0
- package/src/worker/mcp-http-contract.ts +322 -0
- package/src/worker/mcp-initialization-compat.ts +141 -0
- package/src/worker/mcp-jsonrpc.ts +11 -29
- package/src/worker/mcp-removed-protocol.ts +17 -0
- package/src/worker/mcp-response-proxy.ts +135 -0
- package/src/worker/mcp-response-stream.ts +65 -0
- package/src/worker/mcp-stale-schema-compat.ts +57 -0
- package/src/worker/mcp-stream-proxy-contract.ts +48 -0
- package/src/worker/mcp-tool-call-input.ts +23 -0
- package/src/worker/nonce-store.ts +33 -35
- package/src/worker/oauth-authorization-page.ts +21 -1
- package/src/worker/oauth-client-admin.ts +52 -0
- package/src/worker/oauth-client-contract.ts +38 -0
- package/src/worker/oauth-controller.ts +107 -47
- package/src/worker/oauth-field-contract.ts +31 -0
- package/src/worker/oauth-record-contract.ts +7 -0
- package/src/worker/oauth-refresh-authority.ts +27 -0
- package/src/worker/oauth-refresh-exchange.ts +162 -0
- package/src/worker/oauth-refresh-families.ts +130 -27
- package/src/worker/oauth-refresh-persistence.ts +116 -0
- package/src/worker/oauth-state.ts +33 -18
- package/src/worker/oauth-store-validation.ts +131 -0
- package/src/worker/oauth-token-derivation.ts +33 -0
- package/src/worker/oauth-token-issuance.ts +119 -0
- package/src/worker/oauth-tokens.ts +56 -190
- package/src/worker/observability.ts +38 -5
- package/src/worker/pending-admission.ts +15 -0
- package/src/worker/pending-call-capacity.ts +108 -0
- package/src/worker/pending-call-contract.ts +42 -5
- package/src/worker/pending-call-deadlines.ts +75 -0
- package/src/worker/pending-calls.ts +131 -125
- package/src/worker/runtime-alarm-storage.ts +37 -0
- package/src/worker/runtime-alarm.ts +136 -0
- package/src/worker/server-info-activity.ts +36 -0
- package/src/worker/server-info-tool-delivery.ts +15 -0
- package/src/worker/server-info.ts +168 -0
- package/src/worker/tool-catalog.ts +47 -1
- package/src/worker/tool-timeout.ts +75 -14
- package/src/worker/websocket-protocol.ts +26 -2
- package/src/worker/worker-edge-guard.ts +90 -0
- package/src/worker/worker-edge-log.ts +65 -0
- package/src/worker/worker-entry.ts +52 -0
- package/src/worker/worker-mcp-config.ts +23 -0
- package/src/worker/worker-metadata.ts +48 -0
- package/src/worker/worker-rate-limit-key.ts +30 -0
- package/src/worker/worker-runtime-config.ts +20 -0
- package/src/worker/worker-static-routes.ts +54 -0
- package/src/worker/worker-task-lifetime.ts +18 -0
- package/tsconfig.local.json +17 -1
- package/wrangler.jsonc +13 -0
- package/src/local/cli-approval.mjs +0 -117
- package/src/local/operation-state-lock.mjs +0 -92
- package/src/worker/mcp-session.ts +0 -72
|
@@ -2,14 +2,27 @@ import {
|
|
|
2
2
|
emptyOAuthRefreshStore,
|
|
3
3
|
isCurrentOAuthRefreshStore,
|
|
4
4
|
upgradeOAuthRefreshStore,
|
|
5
|
+
type ConsumedOAuthRefreshToken,
|
|
5
6
|
type OAuthRefreshStore,
|
|
7
|
+
type OAuthRefreshToken,
|
|
6
8
|
type OAuthStore,
|
|
7
9
|
} from "./oauth-state.ts";
|
|
8
10
|
import { HttpError } from "./http.ts";
|
|
11
|
+
import {
|
|
12
|
+
hasOnlyRecordFields, OAUTH_CONSUMED_REFRESH_FIELDS, OAUTH_REFRESH_TOKEN_FIELDS, OAUTH_REVOKED_REFRESH_FAMILY_FIELDS,
|
|
13
|
+
} from "./oauth-field-contract.ts";
|
|
14
|
+
import {
|
|
15
|
+
loadConsumedRefreshShards,
|
|
16
|
+
mergeLegacyAndShardedConsumed,
|
|
17
|
+
OAUTH_REFRESH_STORE_KEY,
|
|
18
|
+
saveOAuthRefreshStore,
|
|
19
|
+
} from "./oauth-refresh-persistence.ts";
|
|
20
|
+
export { OAUTH_REFRESH_STORE_KEY } from "./oauth-refresh-persistence.ts";
|
|
9
21
|
|
|
10
|
-
export const OAUTH_REFRESH_STORE_KEY = "oauth-refresh";
|
|
11
22
|
const MAX_CONSUMED_REFRESH_TOKENS = 4096;
|
|
12
23
|
const MAX_REVOKED_REFRESH_FAMILIES = 1024;
|
|
24
|
+
export const OAUTH_REFRESH_RETRY_GRACE_SECONDS = 30;
|
|
25
|
+
export const MAX_REFRESH_RETRY_ISSUES = 2;
|
|
13
26
|
const TOKEN_HASH_PATTERN = /^sha256:[a-f0-9]{64}$/;
|
|
14
27
|
const FAMILY_ID_PATTERN = /^mcp_family_[A-Za-z0-9_-]{43}$/;
|
|
15
28
|
|
|
@@ -18,11 +31,21 @@ export async function loadOAuthRefreshStore(
|
|
|
18
31
|
storage: DurableObjectStorage,
|
|
19
32
|
): Promise<OAuthRefreshStore> {
|
|
20
33
|
const raw = await storage.get<unknown>(OAUTH_REFRESH_STORE_KEY);
|
|
34
|
+
const shards = await loadConsumedRefreshShards(storage);
|
|
21
35
|
const store = raw === undefined ? emptyOAuthRefreshStore() : upgradeOAuthRefreshStore(raw);
|
|
22
|
-
if (!store || !
|
|
36
|
+
if (!store || !shards.valid || (raw === undefined && shards.present)) {
|
|
23
37
|
throw new HttpError(503, "oauth_refresh_state_schema_mismatch", "OAuth refresh-token state requires operator repair");
|
|
24
38
|
}
|
|
25
39
|
const migrated = raw !== undefined && !isCurrentOAuthRefreshStore(raw);
|
|
40
|
+
const legacyConsumedPresent = Object.keys(store.consumed).length > 0;
|
|
41
|
+
const mergedConsumed = mergeLegacyAndShardedConsumed(store.consumed, shards.consumed);
|
|
42
|
+
if (!mergedConsumed) {
|
|
43
|
+
throw new HttpError(503, "oauth_refresh_state_schema_mismatch", "OAuth refresh-token state requires operator repair");
|
|
44
|
+
}
|
|
45
|
+
store.consumed = mergedConsumed;
|
|
46
|
+
if (!validRefreshStoreRecords(store)) {
|
|
47
|
+
throw new HttpError(503, "oauth_refresh_state_schema_mismatch", "OAuth refresh-token state requires operator repair");
|
|
48
|
+
}
|
|
26
49
|
let changed = false;
|
|
27
50
|
const now = Math.floor(Date.now() / 1000);
|
|
28
51
|
for (const [token, value] of Object.entries(store.tokens)) {
|
|
@@ -46,6 +69,14 @@ export async function loadOAuthRefreshStore(
|
|
|
46
69
|
if (value.expires_at <= now) {
|
|
47
70
|
delete store.consumed[token];
|
|
48
71
|
changed = true;
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
if (Number.isSafeInteger(value.retry_until) && value.retry_until! < now) {
|
|
75
|
+
delete value.retry_until;
|
|
76
|
+
delete value.retry_issues;
|
|
77
|
+
delete value.source;
|
|
78
|
+
delete value.access_scope;
|
|
79
|
+
changed = true;
|
|
49
80
|
}
|
|
50
81
|
}
|
|
51
82
|
for (const [familyId, value] of Object.entries(store.revoked_families)) {
|
|
@@ -54,36 +85,61 @@ export async function loadOAuthRefreshStore(
|
|
|
54
85
|
changed = true;
|
|
55
86
|
}
|
|
56
87
|
}
|
|
57
|
-
if (pruneOAuthRefreshReplayState(store)) changed = true;
|
|
58
|
-
if (changed || migrated) await storage
|
|
88
|
+
if (pruneOAuthRefreshReplayState(store, oauthStore)) changed = true;
|
|
89
|
+
if (changed || migrated || legacyConsumedPresent) await saveOAuthRefreshStore(storage, store);
|
|
59
90
|
return store;
|
|
60
91
|
}
|
|
61
92
|
|
|
62
93
|
|
|
63
94
|
export function recordConsumedRefreshToken(
|
|
95
|
+
oauthStore: OAuthStore,
|
|
64
96
|
store: OAuthRefreshStore,
|
|
65
97
|
tokenHash: string,
|
|
66
|
-
|
|
98
|
+
source: OAuthRefreshToken,
|
|
67
99
|
expiresAt: number,
|
|
68
100
|
consumedAt = Math.floor(Date.now() / 1000),
|
|
101
|
+
accessScope = source.scope,
|
|
69
102
|
): void {
|
|
70
|
-
if (!TOKEN_HASH_PATTERN.test(tokenHash) || !FAMILY_ID_PATTERN.test(
|
|
103
|
+
if (!TOKEN_HASH_PATTERN.test(tokenHash) || !FAMILY_ID_PATTERN.test(source.family_id)) {
|
|
71
104
|
throw new Error("consumed refresh-token identity is invalid");
|
|
72
105
|
}
|
|
73
106
|
if (!Number.isSafeInteger(consumedAt) || !Number.isSafeInteger(expiresAt) || consumedAt <= 0 || expiresAt <= consumedAt) {
|
|
74
107
|
throw new Error("consumed refresh-token lifetime is invalid");
|
|
75
108
|
}
|
|
76
|
-
store.consumed[tokenHash] = {
|
|
77
|
-
|
|
109
|
+
store.consumed[tokenHash] = {
|
|
110
|
+
family_id: source.family_id,
|
|
111
|
+
consumed_at: consumedAt,
|
|
112
|
+
expires_at: expiresAt,
|
|
113
|
+
retry_until: Math.min(expiresAt, consumedAt + OAUTH_REFRESH_RETRY_GRACE_SECONDS),
|
|
114
|
+
retry_issues: 0,
|
|
115
|
+
source: { ...source },
|
|
116
|
+
access_scope: accessScope,
|
|
117
|
+
};
|
|
118
|
+
pruneOAuthRefreshReplayState(store, oauthStore);
|
|
78
119
|
}
|
|
79
120
|
|
|
80
|
-
export function
|
|
121
|
+
export function consumedRefreshRetrySource(
|
|
122
|
+
marker: ConsumedOAuthRefreshToken,
|
|
123
|
+
now = Math.floor(Date.now() / 1000),
|
|
124
|
+
): OAuthRefreshToken | null {
|
|
125
|
+
if (!marker.source || !Number.isSafeInteger(marker.retry_until) || marker.retry_until! < now) return null;
|
|
126
|
+
if (!Number.isSafeInteger(marker.retry_issues) || marker.retry_issues! < 0 || marker.retry_issues! >= MAX_REFRESH_RETRY_ISSUES) return null;
|
|
127
|
+
return { ...marker.source };
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
export function recordConsumedRefreshRetry(marker: ConsumedOAuthRefreshToken): void {
|
|
131
|
+
const current = Number.isSafeInteger(marker.retry_issues) ? marker.retry_issues! : 0;
|
|
132
|
+
marker.retry_issues = current + 1;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
export function pruneOAuthRefreshReplayState(store: OAuthRefreshStore, oauthStore?: OAuthStore): boolean {
|
|
81
136
|
let changed = false;
|
|
82
137
|
const consumed = Object.entries(store.consumed).sort((left, right) => (
|
|
83
138
|
left[1].consumed_at - right[1].consumed_at || left[0].localeCompare(right[0])
|
|
84
139
|
));
|
|
85
140
|
while (consumed.length > MAX_CONSUMED_REFRESH_TOKENS) {
|
|
86
|
-
const [tokenHash] = consumed.shift()!;
|
|
141
|
+
const [tokenHash, marker] = consumed.shift()!;
|
|
142
|
+
revokeRefreshFamilyRecords(oauthStore, store, marker.family_id, marker.expires_at);
|
|
87
143
|
delete store.consumed[tokenHash];
|
|
88
144
|
changed = true;
|
|
89
145
|
}
|
|
@@ -100,8 +156,48 @@ export function pruneOAuthRefreshReplayState(store: OAuthRefreshStore): boolean
|
|
|
100
156
|
|
|
101
157
|
function validRefreshStoreRecords(store: OAuthRefreshStore): boolean {
|
|
102
158
|
return Object.entries(store.tokens).every(([key, token]) => (
|
|
159
|
+
TOKEN_HASH_PATTERN.test(key) && validRefreshTokenRecord(token)
|
|
160
|
+
)) && Object.entries(store.consumed).every(([key, token]) => (
|
|
103
161
|
TOKEN_HASH_PATTERN.test(key)
|
|
104
162
|
&& plainRecord(token)
|
|
163
|
+
&& hasOnlyRecordFields(token, OAUTH_CONSUMED_REFRESH_FIELDS)
|
|
164
|
+
&& FAMILY_ID_PATTERN.test(token.family_id)
|
|
165
|
+
&& validTimestamp(token.consumed_at)
|
|
166
|
+
&& validTimestamp(token.expires_at)
|
|
167
|
+
&& token.consumed_at < token.expires_at
|
|
168
|
+
&& (token.retry_until === undefined || (
|
|
169
|
+
validTimestamp(token.retry_until)
|
|
170
|
+
&& token.retry_until >= token.consumed_at
|
|
171
|
+
&& token.retry_until <= token.expires_at
|
|
172
|
+
))
|
|
173
|
+
&& (token.retry_issues === undefined || (
|
|
174
|
+
Number.isSafeInteger(token.retry_issues)
|
|
175
|
+
&& token.retry_issues >= 0
|
|
176
|
+
&& token.retry_issues <= MAX_REFRESH_RETRY_ISSUES
|
|
177
|
+
))
|
|
178
|
+
&& (token.source === undefined || validRefreshTokenRecord(token.source))
|
|
179
|
+
&& (token.access_scope === undefined || (
|
|
180
|
+
typeof token.access_scope === "string"
|
|
181
|
+
&& token.access_scope.length > 0
|
|
182
|
+
&& token.access_scope.length <= 256
|
|
183
|
+
&& token.source !== undefined
|
|
184
|
+
&& scopeSubset(token.access_scope, token.source.scope)
|
|
185
|
+
))
|
|
186
|
+
&& ((token.source === undefined && token.retry_until === undefined && token.retry_issues === undefined)
|
|
187
|
+
|| (token.source !== undefined && token.retry_until !== undefined && token.retry_issues !== undefined
|
|
188
|
+
&& token.source.family_id === token.family_id))
|
|
189
|
+
)) && Object.entries(store.revoked_families).every(([familyId, value]) => (
|
|
190
|
+
FAMILY_ID_PATTERN.test(familyId)
|
|
191
|
+
&& plainRecord(value)
|
|
192
|
+
&& hasOnlyRecordFields(value, OAUTH_REVOKED_REFRESH_FAMILY_FIELDS)
|
|
193
|
+
&& value.reason === "replay"
|
|
194
|
+
&& validTimestamp(value.expires_at)
|
|
195
|
+
));
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
function validRefreshTokenRecord(token: OAuthRefreshToken): boolean {
|
|
199
|
+
return plainRecord(token)
|
|
200
|
+
&& hasOnlyRecordFields(token, OAUTH_REFRESH_TOKEN_FIELDS)
|
|
105
201
|
&& /^mcp_client_[A-Za-z0-9_-]{43}$/.test(token.client_id)
|
|
106
202
|
&& /^acct_[A-Za-z0-9_-]{20,96}$/.test(token.account_id)
|
|
107
203
|
&& Number.isSafeInteger(token.account_version)
|
|
@@ -115,30 +211,26 @@ function validRefreshStoreRecords(store: OAuthRefreshStore): boolean {
|
|
|
115
211
|
&& token.version.length > 0
|
|
116
212
|
&& token.version.length <= 256
|
|
117
213
|
&& FAMILY_ID_PATTERN.test(token.family_id)
|
|
214
|
+
&& (token.dpop_jkt === undefined || /^[A-Za-z0-9_-]{43}$/.test(token.dpop_jkt))
|
|
118
215
|
&& validTimestamp(token.issued_at)
|
|
119
216
|
&& validTimestamp(token.expires_at)
|
|
120
217
|
&& validTimestamp(token.family_expires_at)
|
|
121
218
|
&& token.issued_at < token.expires_at
|
|
122
|
-
&& token.expires_at <= token.family_expires_at
|
|
123
|
-
)) && Object.entries(store.consumed).every(([key, token]) => (
|
|
124
|
-
TOKEN_HASH_PATTERN.test(key)
|
|
125
|
-
&& plainRecord(token)
|
|
126
|
-
&& FAMILY_ID_PATTERN.test(token.family_id)
|
|
127
|
-
&& validTimestamp(token.consumed_at)
|
|
128
|
-
&& validTimestamp(token.expires_at)
|
|
129
|
-
&& token.consumed_at < token.expires_at
|
|
130
|
-
)) && Object.entries(store.revoked_families).every(([familyId, value]) => (
|
|
131
|
-
FAMILY_ID_PATTERN.test(familyId)
|
|
132
|
-
&& plainRecord(value)
|
|
133
|
-
&& value.reason === "replay"
|
|
134
|
-
&& validTimestamp(value.expires_at)
|
|
135
|
-
));
|
|
219
|
+
&& token.expires_at <= token.family_expires_at;
|
|
136
220
|
}
|
|
137
221
|
|
|
138
222
|
function validTimestamp(value: unknown): value is number {
|
|
139
223
|
return Number.isSafeInteger(value) && Number(value) > 0;
|
|
140
224
|
}
|
|
141
225
|
|
|
226
|
+
function scopeSubset(requested: string, granted: string): boolean {
|
|
227
|
+
const requestedScopes = requested.trim().split(/\s+/).filter(Boolean);
|
|
228
|
+
const grantedScopes = new Set(granted.trim().split(/\s+/).filter(Boolean));
|
|
229
|
+
return requestedScopes.length > 0
|
|
230
|
+
&& new Set(requestedScopes).size === requestedScopes.length
|
|
231
|
+
&& requestedScopes.every((scope) => grantedScopes.has(scope));
|
|
232
|
+
}
|
|
233
|
+
|
|
142
234
|
function validHttpsResource(value: unknown): boolean {
|
|
143
235
|
if (typeof value !== "string" || value.length > 2048) return false;
|
|
144
236
|
try {
|
|
@@ -160,13 +252,24 @@ export function revokeOAuthRefreshFamily(
|
|
|
160
252
|
refreshStore: OAuthRefreshStore,
|
|
161
253
|
familyId: string,
|
|
162
254
|
expiresAt: number,
|
|
255
|
+
): void {
|
|
256
|
+
revokeRefreshFamilyRecords(oauthStore, refreshStore, familyId, expiresAt);
|
|
257
|
+
pruneOAuthRefreshReplayState(refreshStore, oauthStore);
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
function revokeRefreshFamilyRecords(
|
|
261
|
+
oauthStore: OAuthStore | undefined,
|
|
262
|
+
refreshStore: OAuthRefreshStore,
|
|
263
|
+
familyId: string,
|
|
264
|
+
expiresAt: number,
|
|
163
265
|
): void {
|
|
164
266
|
for (const [key, token] of Object.entries(refreshStore.tokens)) {
|
|
165
267
|
if (token.family_id === familyId) delete refreshStore.tokens[key];
|
|
166
268
|
}
|
|
167
|
-
|
|
168
|
-
|
|
269
|
+
if (oauthStore) {
|
|
270
|
+
for (const [key, token] of Object.entries(oauthStore.tokens)) {
|
|
271
|
+
if (token.family_id === familyId) delete oauthStore.tokens[key];
|
|
272
|
+
}
|
|
169
273
|
}
|
|
170
274
|
refreshStore.revoked_families[familyId] = { expires_at: expiresAt, reason: "replay" };
|
|
171
|
-
pruneOAuthRefreshReplayState(refreshStore);
|
|
172
275
|
}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import type { ConsumedOAuthRefreshToken, OAuthRefreshStore } from "./oauth-state.ts";
|
|
2
|
+
import { hasOnlyRecordFields, OAUTH_CONSUMED_REFRESH_FIELDS, OAUTH_REFRESH_SHARD_FIELDS } from "./oauth-field-contract.ts";
|
|
3
|
+
|
|
4
|
+
export const OAUTH_REFRESH_STORE_KEY = "oauth-refresh";
|
|
5
|
+
const CONSUMED_SHARD_PREFIX = "oauth-refresh-consumed:";
|
|
6
|
+
const CONSUMED_SHARD_SCHEMA_VERSION = 1;
|
|
7
|
+
const CONSUMED_SHARD_COUNT = 8;
|
|
8
|
+
const MAX_CONSUMED_PER_SHARD = 1024;
|
|
9
|
+
const TOKEN_HASH_PATTERN = /^sha256:[a-f0-9]{64}$/;
|
|
10
|
+
|
|
11
|
+
export type OAuthRefreshPersistenceRead = Pick<DurableObjectStorage, "get">;
|
|
12
|
+
export type OAuthRefreshPersistenceWrite = Pick<DurableObjectStorage, "transaction">;
|
|
13
|
+
|
|
14
|
+
type ConsumedShard = {
|
|
15
|
+
schema_version: number;
|
|
16
|
+
records: Record<string, ConsumedOAuthRefreshToken>;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export interface LoadedConsumedRefreshShards {
|
|
20
|
+
consumed: Record<string, ConsumedOAuthRefreshToken>;
|
|
21
|
+
present: boolean;
|
|
22
|
+
valid: boolean;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export async function loadConsumedRefreshShards(
|
|
26
|
+
storage: OAuthRefreshPersistenceRead,
|
|
27
|
+
): Promise<LoadedConsumedRefreshShards> {
|
|
28
|
+
const keys = consumedShardKeys();
|
|
29
|
+
const raw = await storage.get<unknown>(keys);
|
|
30
|
+
if (!(raw instanceof Map)) throw new Error("OAuth refresh shard multi-read returned an invalid result");
|
|
31
|
+
const consumed: Record<string, ConsumedOAuthRefreshToken> = {};
|
|
32
|
+
let present = false;
|
|
33
|
+
for (let index = 0; index < keys.length; index += 1) {
|
|
34
|
+
const key = keys[index];
|
|
35
|
+
const value = raw.get(key);
|
|
36
|
+
if (value === undefined) continue;
|
|
37
|
+
present = true;
|
|
38
|
+
if (!validShardEnvelope(value) || Object.keys(value.records).length > MAX_CONSUMED_PER_SHARD) {
|
|
39
|
+
return { consumed: {}, present, valid: false };
|
|
40
|
+
}
|
|
41
|
+
for (const [tokenHash, marker] of Object.entries(value.records)) {
|
|
42
|
+
if (!TOKEN_HASH_PATTERN.test(tokenHash) || consumedShardIndex(tokenHash) !== index || Object.hasOwn(consumed, tokenHash)
|
|
43
|
+
|| !marker || typeof marker !== "object" || Array.isArray(marker)
|
|
44
|
+
|| !hasOnlyRecordFields(marker, OAUTH_CONSUMED_REFRESH_FIELDS)) {
|
|
45
|
+
return { consumed: {}, present, valid: false };
|
|
46
|
+
}
|
|
47
|
+
consumed[tokenHash] = marker;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return { consumed, present, valid: true };
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export function oauthRefreshPersistenceEntries(
|
|
54
|
+
store: OAuthRefreshStore,
|
|
55
|
+
): Readonly<Record<string, unknown>> {
|
|
56
|
+
const shards = Array.from({ length: CONSUMED_SHARD_COUNT }, () => ({
|
|
57
|
+
schema_version: CONSUMED_SHARD_SCHEMA_VERSION,
|
|
58
|
+
records: {} as Record<string, ConsumedOAuthRefreshToken>,
|
|
59
|
+
}));
|
|
60
|
+
const counts = Array.from({ length: CONSUMED_SHARD_COUNT }, () => 0);
|
|
61
|
+
for (const [tokenHash, marker] of Object.entries(store.consumed)) {
|
|
62
|
+
if (!TOKEN_HASH_PATTERN.test(tokenHash)) throw new Error("OAuth refresh consumed-token key is invalid");
|
|
63
|
+
const index = consumedShardIndex(tokenHash);
|
|
64
|
+
counts[index] += 1;
|
|
65
|
+
if (counts[index] > MAX_CONSUMED_PER_SHARD) throw new Error("OAuth refresh consumed-token shard capacity exceeded");
|
|
66
|
+
shards[index].records[tokenHash] = marker;
|
|
67
|
+
}
|
|
68
|
+
const entries: Record<string, unknown> = {
|
|
69
|
+
[OAUTH_REFRESH_STORE_KEY]: { ...store, consumed: {} },
|
|
70
|
+
};
|
|
71
|
+
const keys = consumedShardKeys();
|
|
72
|
+
for (let index = 0; index < keys.length; index += 1) entries[keys[index]] = shards[index];
|
|
73
|
+
return entries;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export async function saveOAuthRefreshStore(
|
|
77
|
+
storage: OAuthRefreshPersistenceWrite,
|
|
78
|
+
store: OAuthRefreshStore,
|
|
79
|
+
): Promise<void> {
|
|
80
|
+
await storage.transaction((transaction) => writeOAuthRefreshPersistenceEntries(transaction, store));
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
export async function writeOAuthRefreshPersistenceEntries(
|
|
84
|
+
storage: Pick<DurableObjectStorage, "put">,
|
|
85
|
+
store: OAuthRefreshStore,
|
|
86
|
+
): Promise<void> {
|
|
87
|
+
for (const [key, value] of Object.entries(oauthRefreshPersistenceEntries(store))) await storage.put(key, value);
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
export function mergeLegacyAndShardedConsumed(
|
|
91
|
+
legacy: Readonly<Record<string, ConsumedOAuthRefreshToken>>,
|
|
92
|
+
sharded: Readonly<Record<string, ConsumedOAuthRefreshToken>>,
|
|
93
|
+
): Record<string, ConsumedOAuthRefreshToken> | null {
|
|
94
|
+
const merged: Record<string, ConsumedOAuthRefreshToken> = { ...legacy };
|
|
95
|
+
for (const [tokenHash, marker] of Object.entries(sharded)) {
|
|
96
|
+
if (Object.hasOwn(merged, tokenHash)) return null;
|
|
97
|
+
merged[tokenHash] = marker;
|
|
98
|
+
}
|
|
99
|
+
return merged;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function consumedShardIndex(tokenHash: string): number {
|
|
103
|
+
return Number.parseInt(tokenHash.slice(7, 8), 16) % CONSUMED_SHARD_COUNT;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
function consumedShardKeys(): string[] {
|
|
107
|
+
return Array.from({ length: CONSUMED_SHARD_COUNT }, (_, index) => `${CONSUMED_SHARD_PREFIX}${index.toString(16)}`);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
function validShardEnvelope(value: unknown): value is ConsumedShard {
|
|
111
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
112
|
+
const shard = value as Partial<ConsumedShard>;
|
|
113
|
+
return hasOnlyRecordFields(value, OAUTH_REFRESH_SHARD_FIELDS)
|
|
114
|
+
&& shard.schema_version === CONSUMED_SHARD_SCHEMA_VERSION
|
|
115
|
+
&& Boolean(shard.records) && typeof shard.records === "object" && !Array.isArray(shard.records);
|
|
116
|
+
}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { normalizeAccountRole, type AccountRole } from "./access.ts";
|
|
2
|
+
import { OAUTH_CLIENT_REGISTRATION_REVISION } from "./oauth-client-contract.ts";
|
|
3
|
+
import { hasOnlyRecordFields, OAUTH_REFRESH_STORE_FIELDS } from "./oauth-field-contract.ts";
|
|
2
4
|
|
|
3
5
|
const OAUTH_STORE_SCHEMA_VERSION = 1;
|
|
4
|
-
const OAUTH_REFRESH_STORE_SCHEMA_VERSION =
|
|
6
|
+
const OAUTH_REFRESH_STORE_SCHEMA_VERSION = 3;
|
|
5
7
|
export const OFFLINE_ACCESS_SCOPE = "offline_access";
|
|
6
8
|
const PASSWORD_TOKEN_PATTERN = /^[a-z][a-z0-9_]{2,31}_[A-Za-z0-9_-]{43}$/;
|
|
7
9
|
const ACCOUNT_NAME_PATTERN = /^[a-z0-9][a-z0-9._-]{1,62}[a-z0-9]$/;
|
|
8
|
-
|
|
10
|
+
// Existing account identities remain readable across upgrades; new account creation uses ACCOUNT_NAME_PATTERN.
|
|
11
|
+
const PERSISTED_ACCOUNT_NAME_PATTERN = /^(?:[a-z0-9]|[a-z0-9][a-z0-9._-]{1,62}[a-z0-9])$/;
|
|
9
12
|
|
|
10
13
|
export interface AccountRecord {
|
|
11
14
|
account_id: string;
|
|
@@ -28,8 +31,14 @@ export interface OAuthClient {
|
|
|
28
31
|
last_used_at: number;
|
|
29
32
|
has_been_authorized?: boolean;
|
|
30
33
|
registration_identity?: string;
|
|
34
|
+
registration_revision?: number;
|
|
35
|
+
trusted_account_id?: string;
|
|
36
|
+
trusted_account_version?: number;
|
|
37
|
+
trusted_role?: AccountRole;
|
|
38
|
+
trusted_at?: number;
|
|
31
39
|
}
|
|
32
40
|
|
|
41
|
+
|
|
33
42
|
export interface OAuthCode {
|
|
34
43
|
client_id: string;
|
|
35
44
|
account_id: string;
|
|
@@ -52,6 +61,7 @@ export interface OAuthToken {
|
|
|
52
61
|
version: string;
|
|
53
62
|
expires_at: number;
|
|
54
63
|
family_id?: string;
|
|
64
|
+
dpop_jkt?: string;
|
|
55
65
|
}
|
|
56
66
|
|
|
57
67
|
export interface OAuthRefreshToken extends OAuthToken {
|
|
@@ -64,6 +74,10 @@ export interface ConsumedOAuthRefreshToken {
|
|
|
64
74
|
family_id: string;
|
|
65
75
|
consumed_at: number;
|
|
66
76
|
expires_at: number;
|
|
77
|
+
retry_until?: number;
|
|
78
|
+
retry_issues?: number;
|
|
79
|
+
source?: OAuthRefreshToken;
|
|
80
|
+
access_scope?: string;
|
|
67
81
|
}
|
|
68
82
|
|
|
69
83
|
export interface RevokedOAuthRefreshFamily {
|
|
@@ -128,21 +142,11 @@ export function emptyOAuthRefreshStore(): OAuthRefreshStore {
|
|
|
128
142
|
};
|
|
129
143
|
}
|
|
130
144
|
|
|
131
|
-
export function isCurrentOAuthStore(value: unknown): value is OAuthStore {
|
|
132
|
-
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
133
|
-
const store = value as Partial<OAuthStore>;
|
|
134
|
-
return store.schema_version === OAUTH_STORE_SCHEMA_VERSION
|
|
135
|
-
&& isRecord(store.accounts)
|
|
136
|
-
&& isRecord(store.clients)
|
|
137
|
-
&& isRecord(store.codes)
|
|
138
|
-
&& isRecord(store.tokens)
|
|
139
|
-
&& isRecord(store.auth_failures);
|
|
140
|
-
}
|
|
141
|
-
|
|
142
145
|
export function isCurrentOAuthRefreshStore(value: unknown): value is OAuthRefreshStore {
|
|
143
146
|
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
144
147
|
const store = value as Partial<OAuthRefreshStore>;
|
|
145
|
-
return
|
|
148
|
+
return hasOnlyRecordFields(value, OAUTH_REFRESH_STORE_FIELDS)
|
|
149
|
+
&& store.schema_version === OAUTH_REFRESH_STORE_SCHEMA_VERSION
|
|
146
150
|
&& isRecord(store.tokens)
|
|
147
151
|
&& isRecord(store.consumed)
|
|
148
152
|
&& isRecord(store.revoked_families);
|
|
@@ -151,11 +155,19 @@ export function isCurrentOAuthRefreshStore(value: unknown): value is OAuthRefres
|
|
|
151
155
|
export function upgradeOAuthRefreshStore(value: unknown): OAuthRefreshStore | null {
|
|
152
156
|
if (isCurrentOAuthRefreshStore(value)) return value;
|
|
153
157
|
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
|
154
|
-
const
|
|
155
|
-
if (
|
|
158
|
+
const previous = value as { schema_version?: unknown; tokens?: unknown; consumed?: unknown; revoked_families?: unknown };
|
|
159
|
+
if (previous.schema_version === 2 && isRecord(previous.tokens) && isRecord(previous.consumed) && isRecord(previous.revoked_families)) {
|
|
160
|
+
return {
|
|
161
|
+
schema_version: OAUTH_REFRESH_STORE_SCHEMA_VERSION,
|
|
162
|
+
tokens: previous.tokens as OAuthRefreshStore["tokens"],
|
|
163
|
+
consumed: previous.consumed as OAuthRefreshStore["consumed"],
|
|
164
|
+
revoked_families: previous.revoked_families as OAuthRefreshStore["revoked_families"],
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
if (previous.schema_version !== 1 || !isRecord(previous.tokens)) return null;
|
|
156
168
|
const upgraded = emptyOAuthRefreshStore();
|
|
157
169
|
const now = Math.floor(Date.now() / 1000);
|
|
158
|
-
for (const [key, raw] of Object.entries(
|
|
170
|
+
for (const [key, raw] of Object.entries(previous.tokens)) {
|
|
159
171
|
if (!raw || typeof raw !== "object" || Array.isArray(raw)) continue;
|
|
160
172
|
const token = raw as OAuthToken;
|
|
161
173
|
if (!Number.isSafeInteger(token.expires_at) || token.expires_at <= now) continue;
|
|
@@ -208,6 +220,9 @@ export function validateAuthorizationRequest(
|
|
|
208
220
|
const client = store.clients[clientId];
|
|
209
221
|
if (!client) return { error: "Unknown OAuth client.", status: 400 };
|
|
210
222
|
if (!client.redirect_uris.includes(redirectUri)) return { error: "redirect_uri is not registered.", status: 400 };
|
|
223
|
+
if (client.registration_revision !== OAUTH_CLIENT_REGISTRATION_REVISION) {
|
|
224
|
+
return { error: "OAuth client registration predates the current server contract. Recreate this app before authorizing it again.", status: 409 };
|
|
225
|
+
}
|
|
211
226
|
return { value: { client, clientId, redirectUri, codeChallenge, requestedResource, scope, state } };
|
|
212
227
|
}
|
|
213
228
|
|
|
@@ -218,7 +233,7 @@ export function normalizeAccountName(value: unknown): string | null {
|
|
|
218
233
|
|
|
219
234
|
export function accountByName(store: OAuthStore, name: unknown): AccountRecord | null {
|
|
220
235
|
const candidate = String(name ?? "").trim().toLowerCase();
|
|
221
|
-
const normalized =
|
|
236
|
+
const normalized = PERSISTED_ACCOUNT_NAME_PATTERN.test(candidate) ? candidate : null;
|
|
222
237
|
if (!normalized) return null;
|
|
223
238
|
return Object.values(store.accounts).find((account) => account.name === normalized) ?? null;
|
|
224
239
|
}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { normalizeAccountRole } from "./access.ts";
|
|
2
|
+
import type { AccountRecord, OAuthClient, OAuthCode, OAuthFailure, OAuthStore, OAuthToken } from "./oauth-state.ts";
|
|
3
|
+
import {
|
|
4
|
+
ACCOUNT_ID_PATTERN, AUTHORIZATION_CODE_PATTERN, AUTHORIZATION_IDENTITY_PATTERN, CLIENT_ID_PATTERN,
|
|
5
|
+
JWK_THUMBPRINT_PATTERN, REFRESH_FAMILY_ID_PATTERN, TOKEN_HASH_PATTERN,
|
|
6
|
+
} from "./oauth-record-contract.ts";
|
|
7
|
+
import {
|
|
8
|
+
hasOnlyRecordFields, OAUTH_ACCOUNT_FIELDS, OAUTH_CLIENT_FIELDS, OAUTH_CODE_FIELDS,
|
|
9
|
+
OAUTH_FAILURE_FIELDS, OAUTH_STORE_FIELDS, OAUTH_TOKEN_FIELDS,
|
|
10
|
+
} from "./oauth-field-contract.ts";
|
|
11
|
+
|
|
12
|
+
// Store validation preserves already-issued account identities; creation applies the stricter current rule.
|
|
13
|
+
const PERSISTED_ACCOUNT_NAME_PATTERN = /^(?:[a-z0-9]|[a-z0-9][a-z0-9._-]{1,62}[a-z0-9])$/;
|
|
14
|
+
const BOUNDED_SECRET_PATTERN = /^[A-Za-z0-9_-]{20,128}$/;
|
|
15
|
+
|
|
16
|
+
export function isCurrentOAuthStore(value: unknown): value is OAuthStore {
|
|
17
|
+
if (!plainRecord(value) || !hasOnlyRecordFields(value, OAUTH_STORE_FIELDS) || value.schema_version !== 1) return false;
|
|
18
|
+
if (!plainRecord(value.accounts) || !plainRecord(value.clients) || !plainRecord(value.codes)
|
|
19
|
+
|| !plainRecord(value.tokens) || !plainRecord(value.auth_failures)) return false;
|
|
20
|
+
return entriesMatch(value.accounts, (key, record) => ACCOUNT_ID_PATTERN.test(key) && validAccount(record, key))
|
|
21
|
+
&& entriesMatch(value.clients, (key, record) => CLIENT_ID_PATTERN.test(key) && validClient(record, key))
|
|
22
|
+
&& entriesMatch(value.codes, (key, record) => AUTHORIZATION_CODE_PATTERN.test(key) && validCode(record))
|
|
23
|
+
&& entriesMatch(value.tokens, (key, record) => TOKEN_HASH_PATTERN.test(key) && validToken(record))
|
|
24
|
+
&& entriesMatch(value.auth_failures, (key, record) => AUTHORIZATION_IDENTITY_PATTERN.test(key) && validFailure(record));
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function validAccount(value: unknown, key: string): value is AccountRecord {
|
|
28
|
+
if (!plainRecord(value) || !hasOnlyRecordFields(value, OAUTH_ACCOUNT_FIELDS)) return false;
|
|
29
|
+
return value.account_id === key
|
|
30
|
+
&& PERSISTED_ACCOUNT_NAME_PATTERN.test(stringValue(value.name))
|
|
31
|
+
&& boundedString(value.display_name, 128)
|
|
32
|
+
&& boundedString(value.role, 64)
|
|
33
|
+
&& typeof value.active === "boolean"
|
|
34
|
+
&& positiveInteger(value.version)
|
|
35
|
+
&& BOUNDED_SECRET_PATTERN.test(stringValue(value.password_salt))
|
|
36
|
+
&& BOUNDED_SECRET_PATTERN.test(stringValue(value.password_hash))
|
|
37
|
+
&& positiveInteger(value.created_at)
|
|
38
|
+
&& positiveInteger(value.updated_at)
|
|
39
|
+
&& Number(value.updated_at) >= Number(value.created_at);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function validClient(value: unknown, key: string): value is OAuthClient {
|
|
43
|
+
if (!plainRecord(value) || !hasOnlyRecordFields(value, OAUTH_CLIENT_FIELDS)
|
|
44
|
+
|| value.client_id !== key || !boundedString(value.client_name, 128)
|
|
45
|
+
|| !Array.isArray(value.redirect_uris) || value.redirect_uris.length < 1 || value.redirect_uris.length > 5
|
|
46
|
+
|| !value.redirect_uris.every((uri) => validRedirectUri(uri))
|
|
47
|
+
|| !positiveInteger(value.created_at) || !positiveInteger(value.last_used_at)
|
|
48
|
+
|| Number(value.last_used_at) < Number(value.created_at)
|
|
49
|
+
|| (value.has_been_authorized !== undefined && typeof value.has_been_authorized !== "boolean")
|
|
50
|
+
|| (value.registration_identity !== undefined && !AUTHORIZATION_IDENTITY_PATTERN.test(stringValue(value.registration_identity)))
|
|
51
|
+
|| (value.registration_revision !== undefined && !positiveInteger(value.registration_revision))) return false;
|
|
52
|
+
const trusted = [value.trusted_account_id, value.trusted_account_version, value.trusted_role];
|
|
53
|
+
if (trusted.every((item) => item === undefined)) return value.trusted_at === undefined;
|
|
54
|
+
return trusted.every((item) => item !== undefined)
|
|
55
|
+
&& ACCOUNT_ID_PATTERN.test(stringValue(value.trusted_account_id))
|
|
56
|
+
&& positiveInteger(value.trusted_account_version)
|
|
57
|
+
&& normalizeAccountRole(value.trusted_role) !== null
|
|
58
|
+
&& (value.trusted_at === undefined || positiveInteger(value.trusted_at));
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
function validCode(value: unknown): value is OAuthCode {
|
|
62
|
+
if (!plainRecord(value) || !hasOnlyRecordFields(value, OAUTH_CODE_FIELDS)) return false;
|
|
63
|
+
return CLIENT_ID_PATTERN.test(stringValue(value.client_id))
|
|
64
|
+
&& ACCOUNT_ID_PATTERN.test(stringValue(value.account_id))
|
|
65
|
+
&& positiveInteger(value.account_version)
|
|
66
|
+
&& boundedString(value.role, 64)
|
|
67
|
+
&& validRedirectUri(value.redirect_uri)
|
|
68
|
+
&& /^[A-Za-z0-9_-]{43}$/.test(stringValue(value.code_challenge))
|
|
69
|
+
&& boundedString(value.scope, 256)
|
|
70
|
+
&& validResource(value.resource)
|
|
71
|
+
&& positiveInteger(value.expires_at);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function validToken(value: unknown): value is OAuthToken {
|
|
75
|
+
if (!plainRecord(value) || !hasOnlyRecordFields(value, OAUTH_TOKEN_FIELDS)) return false;
|
|
76
|
+
return CLIENT_ID_PATTERN.test(stringValue(value.client_id))
|
|
77
|
+
&& ACCOUNT_ID_PATTERN.test(stringValue(value.account_id))
|
|
78
|
+
&& positiveInteger(value.account_version)
|
|
79
|
+
&& boundedString(value.role, 64)
|
|
80
|
+
&& boundedString(value.scope, 256)
|
|
81
|
+
&& validResource(value.resource)
|
|
82
|
+
&& boundedString(value.version, 256)
|
|
83
|
+
&& positiveInteger(value.expires_at)
|
|
84
|
+
&& (value.family_id === undefined || REFRESH_FAMILY_ID_PATTERN.test(stringValue(value.family_id)))
|
|
85
|
+
&& (value.dpop_jkt === undefined || JWK_THUMBPRINT_PATTERN.test(stringValue(value.dpop_jkt)));
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function validFailure(value: unknown): value is OAuthFailure {
|
|
89
|
+
if (!plainRecord(value) || !hasOnlyRecordFields(value, OAUTH_FAILURE_FIELDS)) return false;
|
|
90
|
+
return positiveInteger(value.count)
|
|
91
|
+
&& positiveInteger(value.window_started)
|
|
92
|
+
&& nonnegativeInteger(value.blocked_until)
|
|
93
|
+
&& positiveInteger(value.last_attempt)
|
|
94
|
+
&& Number(value.last_attempt) >= Number(value.window_started);
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
function validRedirectUri(value: unknown): boolean {
|
|
98
|
+
if (!boundedString(value, 1024)) return false;
|
|
99
|
+
try {
|
|
100
|
+
const url = new URL(value);
|
|
101
|
+
const secure = url.protocol === "https:";
|
|
102
|
+
const loopback = url.protocol === "http:" && ["127.0.0.1", "localhost", "[::1]"].includes(url.hostname);
|
|
103
|
+
return (secure || loopback) && !url.username && !url.password && !url.hash;
|
|
104
|
+
} catch { return false; }
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
function validResource(value: unknown): boolean {
|
|
108
|
+
if (!boundedString(value, 2048)) return false;
|
|
109
|
+
try {
|
|
110
|
+
const url = new URL(value);
|
|
111
|
+
const secure = url.protocol === "https:";
|
|
112
|
+
const loopback = url.protocol === "http:" && ["127.0.0.1", "localhost", "[::1]"].includes(url.hostname);
|
|
113
|
+
return (secure || loopback) && !url.username && !url.password && !url.hash;
|
|
114
|
+
} catch { return false; }
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
function entriesMatch(value: Record<string, unknown>, predicate: (key: string, record: unknown) => boolean): boolean {
|
|
118
|
+
return Object.entries(value).every(([key, record]) => predicate(key, record));
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
function plainRecord(value: unknown): value is Record<string, unknown> {
|
|
122
|
+
return Boolean(value) && typeof value === "object" && !Array.isArray(value);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function boundedString(value: unknown, maximum: number): value is string {
|
|
126
|
+
return typeof value === "string" && value.length > 0 && value.length <= maximum;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function stringValue(value: unknown): string { return typeof value === "string" ? value : ""; }
|
|
130
|
+
function positiveInteger(value: unknown): boolean { return Number.isSafeInteger(value) && Number(value) > 0; }
|
|
131
|
+
function nonnegativeInteger(value: unknown): boolean { return Number.isSafeInteger(value) && Number(value) >= 0; }
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
const DERIVATION_DOMAIN = "machine-bridge-mcp/oauth-refresh-replacement/v1";
|
|
2
|
+
|
|
3
|
+
export async function deriveRefreshReplacementPair(
|
|
4
|
+
keyMaterial: string,
|
|
5
|
+
consumedRefreshToken: string,
|
|
6
|
+
): Promise<{ accessToken: string; refreshToken: string }> {
|
|
7
|
+
if (!keyMaterial) throw new Error("OAuth token derivation key is not configured");
|
|
8
|
+
if (!/^mcp_rt_[A-Za-z0-9_-]{43}$/.test(consumedRefreshToken)) {
|
|
9
|
+
throw new Error("refresh replacement seed is invalid");
|
|
10
|
+
}
|
|
11
|
+
const encoder = new TextEncoder();
|
|
12
|
+
const key = await crypto.subtle.importKey(
|
|
13
|
+
"raw",
|
|
14
|
+
encoder.encode(keyMaterial),
|
|
15
|
+
{ name: "HMAC", hash: "SHA-256" },
|
|
16
|
+
false,
|
|
17
|
+
["sign"],
|
|
18
|
+
);
|
|
19
|
+
const [accessDigest, refreshDigest] = await Promise.all([
|
|
20
|
+
crypto.subtle.sign("HMAC", key, encoder.encode(`${DERIVATION_DOMAIN}\0access\0${consumedRefreshToken}`)),
|
|
21
|
+
crypto.subtle.sign("HMAC", key, encoder.encode(`${DERIVATION_DOMAIN}\0refresh\0${consumedRefreshToken}`)),
|
|
22
|
+
]);
|
|
23
|
+
return {
|
|
24
|
+
accessToken: `mcp_at_${base64Url(new Uint8Array(accessDigest))}`,
|
|
25
|
+
refreshToken: `mcp_rt_${base64Url(new Uint8Array(refreshDigest))}`,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function base64Url(bytes: Uint8Array): string {
|
|
30
|
+
let binary = "";
|
|
31
|
+
for (const byte of bytes) binary += String.fromCharCode(byte);
|
|
32
|
+
return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
|
|
33
|
+
}
|