@sleep2agi/commhub-server 0.9.0-preview.25 → 0.9.0-preview.250
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 +129 -9
- package/bin/commhub.ts +93 -9
- package/build-info.json +7 -0
- package/package.json +10 -8
- package/src/ack-create-request-transport.test.ts +182 -0
- package/src/ack-create-request.test.ts +52 -8
- package/src/admin-delete-network-http.test.ts +228 -0
- package/src/admin-networks-http.test.ts +88 -0
- package/src/adoption-candidates-http.test.ts +140 -0
- package/src/adoption-candidates.ts +158 -0
- package/src/agent-access-batch.test.ts +210 -0
- package/src/agent-access.ts +487 -0
- package/src/agent-acl-groups-http.test.ts +247 -0
- package/src/agent-acl-http.test.ts +675 -0
- package/src/agent-acl-slice3-http.test.ts +717 -0
- package/src/agent-department-http.test.ts +215 -0
- package/src/agent-groups-perf.test.ts +223 -0
- package/src/agent-notice.ts +48 -0
- package/src/agent-team-whoami-http.test.ts +98 -0
- package/src/agent-teams-http.test.ts +330 -0
- package/src/agent-teams.ts +244 -0
- package/src/alias-baseline-2571.test.ts +162 -0
- package/src/alias-baseline.ts +113 -0
- package/src/alias-filter.test.ts +72 -0
- package/src/alias-filter.ts +42 -0
- package/src/api-host-supervisors-can-create-nodes.test.ts +350 -0
- package/src/api-host-supervisors-fallback.test.ts +6 -7
- package/src/api-host-supervisors-runtime-readiness.test.ts +195 -0
- package/src/api-nodes-shape.test.ts +95 -4
- package/src/auth-password-change-cli-tokens-http.test.ts +423 -0
- package/src/auth-sessions-http.test.ts +260 -0
- package/src/auth-validate.test.ts +5 -1
- package/src/auth-weak-password-login.test.ts +176 -0
- package/src/auth.ts +609 -51
- package/src/avatar-validate.test.ts +52 -2
- package/src/avatar-validate.ts +35 -1
- package/src/backfill-node-ids-2664.test.ts +128 -0
- package/src/binding-generation-http.test.ts +132 -0
- package/src/blocked-exit-on-reply.test.ts +122 -0
- package/src/broadcast-fanout-2721.test.ts +149 -0
- package/src/broadcast-fanout.ts +117 -0
- package/src/build-info.test.ts +60 -0
- package/src/build-info.ts +85 -0
- package/src/chain-attempt-dedup.test.ts +447 -0
- package/src/clip.test.ts +36 -0
- package/src/clip.ts +48 -0
- package/src/clone-node.test.ts +262 -0
- package/src/clone-node.ts +289 -0
- package/src/codex-config-flags.ts +77 -0
- package/src/codex-fork-contract.ts +23 -0
- package/src/codex-fork-migration.test.ts +38 -0
- package/src/commhub-bin-args.test.ts +85 -0
- package/src/config-apply-validate.test.ts +188 -1
- package/src/config-apply-validate.ts +222 -3
- package/src/cors-origins.test.ts +73 -0
- package/src/create-node-blocked-gate.test.ts +356 -0
- package/src/create-node-network-id.test.ts +91 -0
- package/src/create-node-tool-schema.test.ts +49 -0
- package/src/create-node-unicode-name.test.ts +126 -0
- package/src/create-node-validate.test.ts +199 -7
- package/src/create-node-validate.ts +232 -15
- package/src/create-node-workdir.test.ts +298 -0
- package/src/create-node.ts +88 -23
- package/src/daemon-provider-snapshots.test.ts +445 -0
- package/src/daemon-provider-snapshots.ts +327 -0
- package/src/daemon-token-owner-http.test.ts +292 -0
- package/src/dashboard-slash-routing-http.test.ts +109 -0
- package/src/db-adapter-guard.test.ts +148 -0
- package/src/db-adapter-translate.test.ts +128 -0
- package/src/db-adapter.ts +377 -91
- package/src/db-timestamp.test.ts +38 -0
- package/src/db-timestamp.ts +15 -0
- package/src/db.ts +1264 -153
- package/src/delivered-without-push.test.ts +140 -0
- package/src/department-groups-http.test.ts +209 -0
- package/src/department-groups-sync-http.test.ts +328 -0
- package/src/department-groups.ts +434 -0
- package/src/department-heads-http.test.ts +350 -0
- package/src/department-heads.ts +226 -0
- package/src/departments-agent-count.test.ts +132 -0
- package/src/departments-http.test.ts +185 -0
- package/src/departments-mcp.test.ts +128 -0
- package/src/departments.ts +318 -0
- package/src/desktop-message-seam.test.ts +150 -0
- package/src/desktop-message.test.ts +368 -0
- package/src/dm-file-scope-http.test.ts +178 -0
- package/src/empty-node-sweeper.test.ts +104 -0
- package/src/empty-node-sweeper.ts +88 -0
- package/src/env-transport-gate-http.test.ts +240 -0
- package/src/env-transport-gate.ts +80 -0
- package/src/env-transport-policy.ts +56 -0
- package/src/etag-of.test.ts +57 -0
- package/src/event-loop-lag.test.ts +180 -0
- package/src/event-loop-lag.ts +201 -0
- package/src/expiry-counters.test.ts +111 -0
- package/src/expiry-counters.ts +93 -0
- package/src/ext-token-shared.test.ts +60 -0
- package/src/ext-validation-regression.test.ts +131 -0
- package/src/external-schedule-edits-http.test.ts +321 -0
- package/src/external-schedule-edits-timestamps.test.ts +64 -0
- package/src/external-schedule-edits.ts +327 -0
- package/src/file-download-authz-dev-open.test.ts +1 -1
- package/src/file-download-authz.test.ts +73 -18
- package/src/file-download-date-bucket.test.ts +8 -26
- package/src/file-network-scope-dev-open.test.ts +97 -0
- package/src/file-network-scope.test.ts +732 -0
- package/src/group-membership-events-http.test.ts +264 -0
- package/src/group-messages-http.test.ts +483 -0
- package/src/group-messages.ts +297 -0
- package/src/health-anon-readers.ts +60 -0
- package/src/health-host-disk-2756.test.ts +71 -0
- package/src/health-redaction.test.ts +1541 -7
- package/src/host-supervisor-identity-http.test.ts +152 -0
- package/src/host-supervisor-identity.ts +92 -0
- package/src/host-supervisors-daemon-version.test.ts +137 -0
- package/src/http-gzip.test.ts +94 -0
- package/src/http-gzip.ts +112 -0
- package/src/hub-catalog-read-http.test.ts +641 -0
- package/src/hub-provider-config.test.ts +166 -0
- package/src/hub-provider-config.ts +202 -0
- package/src/hub-timestamp.test.ts +38 -0
- package/src/hub-timestamp.ts +27 -0
- package/src/human-dm.ts +215 -0
- package/src/human-inbox.ts +42 -0
- package/src/inbox-caller.ts +49 -0
- package/src/inbox-count-sse.test.ts +310 -0
- package/src/inbox-count.ts +29 -0
- package/src/index.ts +6 -2
- package/src/license-state.test.ts +56 -0
- package/src/license-state.ts +48 -0
- package/src/list-host-supervisors.test.ts +15 -4
- package/src/mcp-context-cost-http.test.ts +127 -0
- package/src/mcp-inflight.test.ts +92 -0
- package/src/mcp-inflight.ts +38 -0
- package/src/mcp-projects-events-http.test.ts +165 -0
- package/src/mcp-route-label-http.test.ts +120 -0
- package/src/mcp-write-network-resolution.test.ts +435 -0
- package/src/member-audit-network-id-http.test.ts +93 -0
- package/src/member-presence-http.test.ts +210 -0
- package/src/messages-ack-by-agent-http.test.ts +142 -0
- package/src/migrate-sqlite-to-pg.test.ts +47 -0
- package/src/migrate-sqlite-to-pg.ts +263 -0
- package/src/model-auth-notify-http.test.ts +181 -0
- package/src/model-auth-notify.ts +116 -0
- package/src/network-name-http.test.ts +75 -0
- package/src/network-rules-http.test.ts +169 -0
- package/src/network-rules.ts +129 -0
- package/src/network-scope.ts +276 -0
- package/src/network-token-membership-http.test.ts +186 -0
- package/src/node-alias-control.ts +12 -0
- package/src/node-attrs.test.ts +47 -2
- package/src/node-caller-identity-http.test.ts +1108 -0
- package/src/node-create-request-status-http.test.ts +105 -0
- package/src/node-daemon-bindings.test.ts +132 -0
- package/src/node-daemon-bindings.ts +135 -0
- package/src/node-failure-alert.test.ts +150 -0
- package/src/node-failure-alert.ts +177 -0
- package/src/node-files-transport.test.ts +347 -0
- package/src/node-health-codex-login.test.ts +120 -0
- package/src/node-health-dispatch-http.test.ts +373 -0
- package/src/node-health-guard.ts +121 -0
- package/src/node-health-passthrough.test.ts +115 -0
- package/src/node-health-store.ts +101 -0
- package/src/node-id-alias.test.ts +190 -0
- package/src/node-identity-conflict-http.test.ts +269 -0
- package/src/node-identity-conflict.ts +142 -0
- package/src/node-identity-mismatch.test.ts +74 -0
- package/src/node-in-flight-tasks.ts +31 -0
- package/src/node-lifecycle-controllable.test.ts +64 -0
- package/src/node-lifecycle-controllable.ts +53 -0
- package/src/node-lifecycle-read-http.test.ts +257 -0
- package/src/node-lifecycle-read.ts +124 -0
- package/src/node-logs-transport.test.ts +263 -0
- package/src/node-peer-allowlist.test.ts +114 -0
- package/src/node-permissions-http.test.ts +728 -0
- package/src/node-permissions.ts +494 -0
- package/src/node-request-retention.test.ts +281 -0
- package/src/node-request-retention.ts +120 -0
- package/src/node-secret-rest-http.test.ts +190 -0
- package/src/node-serviceability.test.ts +86 -0
- package/src/node-serviceability.ts +124 -0
- package/src/node-session-control-http.test.ts +310 -0
- package/src/node-session-control.ts +258 -0
- package/src/node-skills-transport.test.ts +212 -0
- package/src/node-token-identity.ts +35 -0
- package/src/node-token-ownership.ts +51 -0
- package/src/node-token-privilege-http.test.ts +158 -0
- package/src/not-found-api-http.test.ts +67 -0
- package/src/observer-avatar-http.test.ts +102 -9
- package/src/observer-push.test.ts +76 -0
- package/src/opencode-catalog-report-http.test.ts +139 -0
- package/src/opencode-v2-catalog.test.ts +268 -0
- package/src/opencode-v2-catalog.ts +356 -0
- package/src/package-version-consistency.test.ts +25 -0
- package/src/parent-source-marker.test.ts +50 -0
- package/src/password-network-tokens.ts +25 -0
- package/src/peer-reply-atomic.test.ts +462 -0
- package/src/peer-reply-capability.test.ts +70 -0
- package/src/pg-worker.ts +87 -0
- package/src/poll-pacing.test.ts +74 -0
- package/src/poll-pacing.ts +123 -0
- package/src/project-dir-warn-clear-http.test.ts +132 -0
- package/src/project-viewer-can-http.test.ts +116 -0
- package/src/provider-tools-shape.test.ts +150 -0
- package/src/push.test.ts +20 -10
- package/src/push.ts +373 -9
- package/src/redact-tokens.test.ts +86 -0
- package/src/redact-tokens.ts +43 -0
- package/src/rejection-counters.test.ts +72 -0
- package/src/rejection-counters.ts +173 -0
- package/src/rename.ts +38 -10
- package/src/reply-target-derivation.test.ts +96 -0
- package/src/report-status-handover-capabilities-http.test.ts +124 -0
- package/src/report-status-host-schema.test.ts +235 -0
- package/src/report-status-resume-id-handover.test.ts +184 -0
- package/src/report-status-secret-keys.test.ts +140 -0
- package/src/require-explicit-test-db.ts +9 -0
- package/src/requirement-due-reminders-http.test.ts +620 -0
- package/src/requirement-due-reminders.ts +416 -0
- package/src/requirement-events-http.test.ts +318 -0
- package/src/requirement-events.test.ts +45 -0
- package/src/requirement-events.ts +144 -0
- package/src/requirement-notify.ts +165 -0
- package/src/requirement-participant-notify-http.test.ts +309 -0
- package/src/requirement-tag-ops-http.test.ts +454 -0
- package/src/requirement-tag-tree-http.test.ts +275 -0
- package/src/requirement-tag-tree.ts +127 -0
- package/src/requirement-tags.ts +102 -0
- package/src/requirements-abandoned-http.test.ts +236 -0
- package/src/requirements-assignee-drift.test.ts +154 -0
- package/src/requirements-comment-http.test.ts +174 -0
- package/src/requirements-completed-at-migration.test.ts +70 -0
- package/src/requirements-errors-mcp-http.test.ts +164 -0
- package/src/requirements-errors.ts +158 -0
- package/src/requirements-etag-http.test.ts +91 -0
- package/src/requirements-http.test.ts +709 -0
- package/src/requirements-last-event-http.test.ts +349 -0
- package/src/requirements-list-mcp-slim-http.test.ts +155 -0
- package/src/requirements-list-slim-http.test.ts +324 -0
- package/src/requirements-mcp.test.ts +164 -0
- package/src/requirements-migrate.ts +283 -0
- package/src/requirements-owner-strict-mcp-http.test.ts +145 -0
- package/src/requirements-people-http.test.ts +114 -0
- package/src/requirements-people-mcp-http.test.ts +231 -0
- package/src/requirements-people.ts +196 -0
- package/src/requirements-priority-lowest.test.ts +114 -0
- package/src/requirements-projects-network-echo.test.ts +57 -0
- package/src/requirements-projects-parent-http.test.ts +123 -0
- package/src/requirements-search-http.test.ts +182 -0
- package/src/requirements-search.test.ts +32 -0
- package/src/requirements-search.ts +145 -0
- package/src/requirements-seq-http.test.ts +193 -0
- package/src/requirements-seq-migration.test.ts +63 -0
- package/src/requirements-start-date.test.ts +125 -0
- package/src/requirements-stats-http.test.ts +357 -0
- package/src/requirements-stats.ts +195 -0
- package/src/requirements-status-participants-http.test.ts +222 -0
- package/src/requirements-upgrade-e2e.test.ts +126 -0
- package/src/requirements-upgrade-migration.test.ts +98 -0
- package/src/requirements.ts +2205 -0
- package/src/resolve-port.test.ts +57 -0
- package/src/resolve-port.ts +44 -0
- package/src/rest-alias-network-fallback-http.test.ts +123 -0
- package/src/rest-alias-network-fallback.test.ts +60 -0
- package/src/rest-alias-network-fallback.ts +65 -0
- package/src/rest-explicit-columns-http.test.ts +266 -0
- package/src/rest-identity.test.ts +130 -0
- package/src/rest-identity.ts +141 -0
- package/src/rest-projections.ts +72 -0
- package/src/rest-read-network-real-chain.test.ts +97 -0
- package/src/rest-write-network-resolution.test.ts +133 -0
- package/src/restart-readiness-http.test.ts +121 -0
- package/src/restricted-files.ts +76 -0
- package/src/retention-first-sweep-quiet.test.ts +31 -0
- package/src/retention.test.ts +100 -40
- package/src/retention.ts +423 -104
- package/src/route-callers-http.test.ts +120 -0
- package/src/route-timing.test.ts +218 -0
- package/src/route-timing.ts +262 -0
- package/src/rules-file-duplicate-alias.test.ts +234 -0
- package/src/rules-file-session-target.test.ts +207 -0
- package/src/rules-file-transport.test.ts +237 -0
- package/src/runtime-label.test.ts +22 -0
- package/src/runtime-label.ts +21 -0
- package/src/runtime-readiness.ts +90 -0
- package/src/schedule-agent-mcp-http.test.ts +475 -0
- package/src/schedule-agent.ts +252 -0
- package/src/schedule-starved.test.ts +92 -0
- package/src/schedule-starved.ts +114 -0
- package/src/scheduled-backoff-http.test.ts +203 -0
- package/src/scheduled-backoff.ts +64 -0
- package/src/scheduled-doorbell-nodeless-session.test.ts +134 -0
- package/src/scheduled-failure-backoff-2622.test.ts +145 -0
- package/src/scheduled-failure-code.test.ts +73 -0
- package/src/scheduled-failure-code.ts +105 -0
- package/src/scheduled-failures-http.test.ts +279 -0
- package/src/scheduled-failures.ts +425 -0
- package/src/scheduled-noprogress-backoff-2622.test.ts +163 -0
- package/src/scheduled-offline-backoff-probe.test.ts +56 -0
- package/src/scheduled-offline.test.ts +131 -0
- package/src/scheduled-offline.ts +66 -0
- package/src/scheduled-outcome-guidance-http.test.ts +139 -0
- package/src/scheduled-outcome-guidance.ts +9 -0
- package/src/scheduled-reply-unread-http.test.ts +212 -0
- package/src/scheduled-requirement-wake-http.test.ts +285 -0
- package/src/scheduled-requirement-wake.ts +125 -0
- package/src/scheduled-run-terminal.test.ts +290 -0
- package/src/scheduled-skip-blocking-task.test.ts +120 -0
- package/src/scheduled-skip-path-backoff-2622.test.ts +98 -0
- package/src/scheduled-stuck-http.test.ts +316 -0
- package/src/scheduled-stuck-notice-cap.test.ts +80 -0
- package/src/scheduled-stuck.ts +219 -0
- package/src/scheduled-tasks-http.test.ts +679 -0
- package/src/scheduled-tasks.ts +959 -0
- package/src/scheduled-work-outcome-http.test.ts +154 -0
- package/src/scheduled-work-outcome.ts +50 -0
- package/src/scoped-secrets.ts +141 -0
- package/src/secret-echo-negative-control.test.ts +118 -0
- package/src/send-dedup-request-id.test.ts +229 -0
- package/src/send-reply-agent-warning.test.ts +38 -38
- package/src/send-reply-alias-optional.test.ts +131 -0
- package/src/send-reply-attachments.test.ts +458 -0
- package/src/send_dedup.test.ts +54 -0
- package/src/send_dedup.ts +52 -6
- package/src/serve-error.test.ts +73 -0
- package/src/serve-error.ts +56 -0
- package/src/server.ts +5134 -503
- package/src/session-task-on-dispatch.ts +14 -0
- package/src/session-token-ownership-http.test.ts +122 -0
- package/src/shared/codex-inventory.ts +41 -0
- package/src/shared/daemon-provider-login.ts +31 -0
- package/src/shared/daemon-provider-snapshot.ts +52 -0
- package/src/shared/external-schedule-contract.ts +60 -0
- package/src/shared/node-name.test.ts +62 -0
- package/src/shared/node-name.ts +161 -0
- package/src/shared/probe-host-allowlist-drift.test.ts +45 -0
- package/src/shared/provider-application.ts +29 -0
- package/src/shared/provider-collection.ts +14 -0
- package/src/shared/provider-initialization.ts +8 -0
- package/src/shared/reserved-env-drift.test.ts +10 -0
- package/src/shared/scoped-secret-contract.ts +5 -0
- package/src/shared/task-content-limit-drift.test.ts +28 -0
- package/src/shared/task-content-limit.ts +25 -0
- package/src/side-thread-command-transport.test.ts +312 -0
- package/src/side-thread-command-transport.ts +318 -0
- package/src/side-thread-http-integration.test.ts +233 -0
- package/src/side-thread-http.ts +504 -0
- package/src/side-thread-production.test.ts +72 -0
- package/src/side-thread-production.ts +118 -0
- package/src/side-thread.test.ts +1067 -0
- package/src/side-thread.ts +2499 -0
- package/src/skillhub-http.test.ts +142 -0
- package/src/sqlite-close-checkpoint.test.ts +78 -0
- package/src/start-node.test.ts +265 -0
- package/src/stats-versions-http.test.ts +65 -0
- package/src/status-alias-filter-http.test.ts +106 -0
- package/src/status-alias-resolver-http.test.ts +163 -0
- package/src/status-alias-resolver.ts +19 -0
- package/src/status-node-id-filter-http.test.ts +161 -0
- package/src/status-read-cache-http.test.ts +229 -0
- package/src/status-read-cache.ts +129 -0
- package/src/stop-delete-node.test.ts +567 -1
- package/src/task-access-http.test.ts +402 -0
- package/src/task-access.ts +420 -0
- package/src/task-activity.ts +60 -0
- package/src/task-auth-origin-http.test.ts +93 -0
- package/src/task-auth-origin.test.ts +24 -0
- package/src/task-auth-origin.ts +7 -0
- package/src/task-consumption.test.ts +498 -0
- package/src/task-diagnostic-http.test.ts +149 -0
- package/src/task-diagnostic.test.ts +115 -0
- package/src/task-diagnostic.ts +118 -0
- package/src/task-expiry-notice-http.test.ts +287 -0
- package/src/task-expiry-notice.ts +318 -0
- package/src/task-idempotency-mcp.test.ts +142 -0
- package/src/task-idempotency.test.ts +76 -0
- package/src/task-idempotency.ts +81 -0
- package/src/task-late-replies.ts +54 -0
- package/src/task-late-reply-http.test.ts +227 -0
- package/src/task-lifecycle-watcher-busy.test.ts +114 -0
- package/src/task-lifecycle-watcher.test.ts +209 -0
- package/src/task-lifecycle-watcher.ts +109 -0
- package/src/task-network-resolution-http.test.ts +140 -0
- package/src/task-offline-delivery-2668.test.ts +119 -0
- package/src/task-offline-delivery.ts +81 -0
- package/src/task-orphan-http.test.ts +287 -0
- package/src/task-orphan.ts +119 -0
- package/src/task-queue-ahead-http.test.ts +309 -0
- package/src/task-queue-ahead-scale.test.ts +236 -0
- package/src/task-queue-ahead.ts +186 -0
- package/src/task-rejection-log-http.test.ts +160 -0
- package/src/task-rejection-log.ts +61 -0
- package/src/task-sender-http.test.ts +143 -0
- package/src/task-stale-open-http.test.ts +292 -0
- package/src/task-stale-open.ts +103 -0
- package/src/tasks-pagination-http.test.ts +141 -0
- package/src/team-rules-status-http.test.ts +90 -0
- package/src/team-rules-status.test.ts +59 -0
- package/src/team-rules-status.ts +72 -0
- package/src/tmux-allowlist.test.ts +48 -0
- package/src/tool-audience-http.test.ts +230 -0
- package/src/tool-audience.ts +127 -0
- package/src/tools-list-json-schema.test.ts +94 -0
- package/src/tools.ts +4326 -420
- package/src/upload-early-reject-guard.test.ts +155 -0
- package/src/uploads-http.test.ts +86 -7
- package/src/uploads.ts +38 -4
- package/src/user-avatar-http.test.ts +74 -0
- package/src/user-avatar-image.ts +160 -0
- package/src/user-avatar-migration.test.ts +25 -0
- package/src/user-avatar-upload-http.test.ts +348 -0
- package/src/user-inbox-by-agent-http.test.ts +165 -0
- package/src/user-inbox-netid-notnull.test.ts +122 -0
- package/src/user-inbox-read-http.test.ts +223 -0
- package/src/user-inbox-schema.test.ts +54 -0
- package/src/version-stats.test.ts +66 -0
- package/src/version-stats.ts +109 -0
|
@@ -0,0 +1,327 @@
|
|
|
1
|
+
import { db } from "./db.js";
|
|
2
|
+
import { getUserNetworkRole } from "./auth.js";
|
|
3
|
+
import { pushEvent } from "./push.js";
|
|
4
|
+
import { parseExternalSchedulePatch, type ExternalSchedulePatch } from "./shared/external-schedule-contract.js";
|
|
5
|
+
import { parseHubTimestamp } from "./hub-timestamp";
|
|
6
|
+
|
|
7
|
+
type Auth = {
|
|
8
|
+
userId: string;
|
|
9
|
+
networkId: string | null;
|
|
10
|
+
username: string;
|
|
11
|
+
tokenId: string | null;
|
|
12
|
+
} | null;
|
|
13
|
+
|
|
14
|
+
export type ExternalScheduleEditContext = {
|
|
15
|
+
req: Request;
|
|
16
|
+
url: URL;
|
|
17
|
+
auth: Auth;
|
|
18
|
+
isUserToken: boolean;
|
|
19
|
+
isNodeToken: boolean;
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
type NodeRow = {
|
|
23
|
+
node_id: string;
|
|
24
|
+
alias: string | null;
|
|
25
|
+
network_id: string | null;
|
|
26
|
+
owner_user_id: string | null;
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
type EditRow = {
|
|
30
|
+
intent_id: string;
|
|
31
|
+
network_id: string;
|
|
32
|
+
node_id: string;
|
|
33
|
+
schedule_id: string;
|
|
34
|
+
base_revision: number;
|
|
35
|
+
patch_json: string;
|
|
36
|
+
status: string;
|
|
37
|
+
expires_at: number;
|
|
38
|
+
created_at: number;
|
|
39
|
+
delivered_at: number | null;
|
|
40
|
+
acked_at: number | null;
|
|
41
|
+
created_by_user: string;
|
|
42
|
+
created_by_token: string;
|
|
43
|
+
consumed_by_token: string | null;
|
|
44
|
+
result_revision: number | null;
|
|
45
|
+
error_code: string | null;
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
const INTENT_TTL_MS = 5 * 60_000;
|
|
49
|
+
const NODE_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,199}$/;
|
|
50
|
+
const SCHEDULE_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
|
|
51
|
+
|
|
52
|
+
function error(error: string, status: number, extra: Record<string, unknown> = {}): Response {
|
|
53
|
+
return Response.json({ ok: false, error, ...extra }, { status });
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
async function bodyObject(req: Request): Promise<Record<string, unknown>> {
|
|
57
|
+
const value = await req.json();
|
|
58
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("invalid_json");
|
|
59
|
+
return value as Record<string, unknown>;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function exactKeys(obj: Record<string, unknown>, allowed: readonly string[]): boolean {
|
|
63
|
+
const set = new Set(allowed);
|
|
64
|
+
return Object.keys(obj).every((key) => set.has(key));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function nodeRow(nodeId: string): NodeRow | null {
|
|
68
|
+
return db.get<NodeRow>(
|
|
69
|
+
"SELECT node_id, alias, network_id, owner_user_id FROM nodes WHERE node_id = ?1",
|
|
70
|
+
nodeId,
|
|
71
|
+
) ?? null;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function requireOwner(ctx: ExternalScheduleEditContext, node: NodeRow, networkId: unknown): Response | null {
|
|
75
|
+
if (!ctx.isUserToken || !ctx.auth?.tokenId) return error("user_token_required", 403);
|
|
76
|
+
if (!node.owner_user_id) return error("node_owner_unclaimed", 409);
|
|
77
|
+
if (ctx.auth.userId !== node.owner_user_id) return error("node_owner_required", 403);
|
|
78
|
+
if (typeof networkId !== "string" || networkId !== node.network_id) return error("cross_network_node", 403);
|
|
79
|
+
if (!getUserNetworkRole(ctx.auth.userId, networkId)) return error("network_membership_required", 403);
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function requireBoundNode(ctx: ExternalScheduleEditContext, node: NodeRow): Response | null {
|
|
84
|
+
if (!ctx.isNodeToken || !ctx.auth?.tokenId) return error("network_token_required", 403);
|
|
85
|
+
const token = db.get<{ token_id: string; user_id: string; network_id: string | null; name: string; bound_node_id: string | null }>(
|
|
86
|
+
"SELECT token_id, user_id, network_id, name, bound_node_id FROM api_tokens WHERE token_id = ?1",
|
|
87
|
+
ctx.auth.tokenId,
|
|
88
|
+
);
|
|
89
|
+
if (!token || token.bound_node_id !== node.node_id || token.network_id !== node.network_id || token.user_id !== node.owner_user_id) {
|
|
90
|
+
return error("node_token_binding_required", 403);
|
|
91
|
+
}
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function reportedSchedule(node: NodeRow, scheduleId: string): Record<string, unknown> | null {
|
|
96
|
+
const row = db.get<{ external_schedules: string }>(
|
|
97
|
+
`SELECT external_schedules FROM sessions
|
|
98
|
+
WHERE node_id = ?1 AND network_id = ?2 AND external_schedules IS NOT NULL
|
|
99
|
+
ORDER BY updated_at DESC LIMIT 1`,
|
|
100
|
+
node.node_id,
|
|
101
|
+
node.network_id,
|
|
102
|
+
);
|
|
103
|
+
if (!row) return null;
|
|
104
|
+
try {
|
|
105
|
+
const snapshot = JSON.parse(row.external_schedules) as any;
|
|
106
|
+
if (!Array.isArray(snapshot?.schedules)) return null;
|
|
107
|
+
return snapshot.schedules.find((entry: any) => entry?.id === scheduleId) ?? null;
|
|
108
|
+
} catch {
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// 🔴 #1650 —— 这些列是 SQLite `datetime('now')` 家族:**UTC 但不带时区标记**。
|
|
114
|
+
// `new Date("2026-08-30 21:04:11")` 会按**本机时区**解析(ES 规范:带时间且无偏移
|
|
115
|
+
// 的形式视为本地时间),而且不报错 —— 于是发给 API 消费方的是一个错的时刻,
|
|
116
|
+
// 误差就是这台机器的 offset。
|
|
117
|
+
// 另外原写法在字段是垃圾串时 `new Date(x).toISOString()` 会**抛 RangeError**,
|
|
118
|
+
// 足以把这个接口打成 500;`parseHubTimestamp` 解析失败返回 null,这里也返回 null。
|
|
119
|
+
// 复用 server.ts:1010 已在用的那个 helper,不自造第二套判据。
|
|
120
|
+
function hubIso(raw: unknown): string | null {
|
|
121
|
+
const ms = parseHubTimestamp(raw);
|
|
122
|
+
return ms === null ? null : new Date(ms).toISOString();
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function publicEdit(row: EditRow): Record<string, unknown> {
|
|
126
|
+
let patch: ExternalSchedulePatch = {};
|
|
127
|
+
try { patch = JSON.parse(row.patch_json); } catch {}
|
|
128
|
+
return {
|
|
129
|
+
intent_id: row.intent_id,
|
|
130
|
+
node_id: row.node_id,
|
|
131
|
+
schedule_id: row.schedule_id,
|
|
132
|
+
base_revision: row.base_revision,
|
|
133
|
+
patch,
|
|
134
|
+
status: row.status,
|
|
135
|
+
expires_at: hubIso(row.expires_at),
|
|
136
|
+
created_at: hubIso(row.created_at),
|
|
137
|
+
delivered_at: hubIso(row.delivered_at),
|
|
138
|
+
acked_at: hubIso(row.acked_at),
|
|
139
|
+
result_revision: row.result_revision,
|
|
140
|
+
error_code: row.error_code,
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
function audit(
|
|
145
|
+
userId: string | null,
|
|
146
|
+
username: string | null,
|
|
147
|
+
action: string,
|
|
148
|
+
intentId: string,
|
|
149
|
+
networkId: string,
|
|
150
|
+
detail: Record<string, unknown>,
|
|
151
|
+
): void {
|
|
152
|
+
db.run(
|
|
153
|
+
`INSERT INTO audit_log (user_id, username, action, target_type, target_id, detail, network_id)
|
|
154
|
+
VALUES (?1, ?2, ?3, 'external_schedule_edit', ?4, ?5, ?6)`,
|
|
155
|
+
[userId, username, action, intentId, JSON.stringify(detail), networkId],
|
|
156
|
+
);
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
function expireOpenIntents(node: NodeRow, now: number): void {
|
|
160
|
+
const expired = db.all<EditRow>(
|
|
161
|
+
"SELECT * FROM external_schedule_edits WHERE node_id = ?1 AND network_id = ?2 AND status IN ('pending', 'delivered') AND expires_at <= ?3",
|
|
162
|
+
node.node_id,
|
|
163
|
+
node.network_id,
|
|
164
|
+
now,
|
|
165
|
+
);
|
|
166
|
+
for (const row of expired) {
|
|
167
|
+
const changed = db.run(
|
|
168
|
+
"UPDATE external_schedule_edits SET status = 'expired', acked_at = ?1, error_code = 'intent_expired' WHERE intent_id = ?2 AND status IN ('pending', 'delivered') AND expires_at <= ?1",
|
|
169
|
+
[now, row.intent_id],
|
|
170
|
+
);
|
|
171
|
+
if (changed.changes === 1) {
|
|
172
|
+
audit(row.created_by_user, null, "external_schedule.edit_expired", row.intent_id, row.network_id, {
|
|
173
|
+
node_id: row.node_id, schedule_id: row.schedule_id, base_revision: row.base_revision, error_code: "intent_expired",
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
export async function handleExternalScheduleEditRequest(ctx: ExternalScheduleEditContext): Promise<Response | null> {
|
|
180
|
+
const match = ctx.url.pathname.match(/^\/api\/nodes\/([^/]+)\/external-schedule-edits(?:\/(pending|[^/]+)(?:\/(ack))?)?$/);
|
|
181
|
+
if (!match) return null;
|
|
182
|
+
const nodeId = decodeURIComponent(match[1]);
|
|
183
|
+
if (!NODE_ID_RE.test(nodeId)) return error("invalid_node_id", 400);
|
|
184
|
+
const tail = match[2] || null;
|
|
185
|
+
const ack = match[3] === "ack";
|
|
186
|
+
const node = nodeRow(nodeId);
|
|
187
|
+
if (!node) return error("node_not_found", 404);
|
|
188
|
+
|
|
189
|
+
if (tail === "pending" && ctx.req.method === "GET") {
|
|
190
|
+
const denied = requireBoundNode(ctx, node);
|
|
191
|
+
if (denied) return denied;
|
|
192
|
+
const now = Date.now();
|
|
193
|
+
const intent = db.transaction(() => {
|
|
194
|
+
expireOpenIntents(node, now);
|
|
195
|
+
const already = db.get<EditRow>(
|
|
196
|
+
`SELECT * FROM external_schedule_edits
|
|
197
|
+
WHERE node_id = ?1 AND network_id = ?2 AND status = 'delivered' AND consumed_by_token = ?3
|
|
198
|
+
ORDER BY delivered_at ASC LIMIT 1`,
|
|
199
|
+
node.node_id, node.network_id, ctx.auth!.tokenId,
|
|
200
|
+
);
|
|
201
|
+
if (already) return already;
|
|
202
|
+
const pending = db.get<EditRow>(
|
|
203
|
+
`SELECT * FROM external_schedule_edits
|
|
204
|
+
WHERE node_id = ?1 AND network_id = ?2 AND status = 'pending' AND expires_at > ?3
|
|
205
|
+
ORDER BY created_at ASC LIMIT 1`,
|
|
206
|
+
node.node_id, node.network_id, now,
|
|
207
|
+
);
|
|
208
|
+
if (!pending) return null;
|
|
209
|
+
const claimed = db.run(
|
|
210
|
+
`UPDATE external_schedule_edits SET status = 'delivered', delivered_at = ?1, consumed_by_token = ?2
|
|
211
|
+
WHERE intent_id = ?3 AND status = 'pending' AND expires_at > ?1`,
|
|
212
|
+
[now, ctx.auth!.tokenId, pending.intent_id],
|
|
213
|
+
);
|
|
214
|
+
if (claimed.changes !== 1) return null;
|
|
215
|
+
audit(pending.created_by_user, null, "external_schedule.edit_delivered", pending.intent_id, pending.network_id, {
|
|
216
|
+
node_id: pending.node_id, schedule_id: pending.schedule_id, base_revision: pending.base_revision,
|
|
217
|
+
});
|
|
218
|
+
return { ...pending, status: "delivered", delivered_at: now, consumed_by_token: ctx.auth!.tokenId };
|
|
219
|
+
});
|
|
220
|
+
return Response.json({ ok: true, intent: intent ? publicEdit(intent) : null });
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
if (tail && tail !== "pending" && ack && ctx.req.method === "POST") {
|
|
224
|
+
const denied = requireBoundNode(ctx, node);
|
|
225
|
+
if (denied) return denied;
|
|
226
|
+
let body: Record<string, unknown>;
|
|
227
|
+
try { body = await bodyObject(ctx.req); } catch { return error("invalid_json", 400); }
|
|
228
|
+
if (!exactKeys(body, ["status", "result_revision", "error_code"])) return error("invalid_ack", 400);
|
|
229
|
+
if (body.status !== "applied" && body.status !== "rejected") return error("invalid_ack", 400);
|
|
230
|
+
if (body.status === "applied" && !Number.isSafeInteger(body.result_revision)) return error("invalid_result_revision", 400);
|
|
231
|
+
if (body.status === "rejected" && body.result_revision !== undefined) return error("invalid_ack", 400);
|
|
232
|
+
if (body.error_code !== undefined && (typeof body.error_code !== "string" || !/^[a-z0-9_]{1,64}$/.test(body.error_code))) return error("invalid_error_code", 400);
|
|
233
|
+
const now = Date.now();
|
|
234
|
+
const result = db.transaction(() => {
|
|
235
|
+
const row = db.get<EditRow>("SELECT * FROM external_schedule_edits WHERE intent_id = ?1", tail);
|
|
236
|
+
if (!row || row.node_id !== node.node_id || row.network_id !== node.network_id || row.consumed_by_token !== ctx.auth!.tokenId) {
|
|
237
|
+
return { error: "intent_not_found", status: 404 } as const;
|
|
238
|
+
}
|
|
239
|
+
if (row.status === "applied" || row.status === "rejected") {
|
|
240
|
+
const requestedRevision = body.status === "applied" ? Number(body.result_revision) : null;
|
|
241
|
+
const requestedError = body.error_code ?? null;
|
|
242
|
+
if (row.status === body.status && row.result_revision === requestedRevision && row.error_code === requestedError) {
|
|
243
|
+
return { row, idempotent: true } as const;
|
|
244
|
+
}
|
|
245
|
+
return { error: "intent_already_terminal", status: 409 } as const;
|
|
246
|
+
}
|
|
247
|
+
if (row.status !== "delivered") return { error: "intent_not_delivered", status: 409 } as const;
|
|
248
|
+
if (body.status === "applied" && Number(body.result_revision) !== row.base_revision + 1) {
|
|
249
|
+
return { error: "invalid_result_revision", status: 409 } as const;
|
|
250
|
+
}
|
|
251
|
+
const changed = db.run(
|
|
252
|
+
`UPDATE external_schedule_edits SET status = ?1, acked_at = ?2, result_revision = ?3, error_code = ?4
|
|
253
|
+
WHERE intent_id = ?5 AND status = 'delivered' AND consumed_by_token = ?6`,
|
|
254
|
+
[body.status, now, body.status === "applied" ? Number(body.result_revision) : null, body.error_code ?? null, row.intent_id, ctx.auth!.tokenId],
|
|
255
|
+
);
|
|
256
|
+
if (changed.changes !== 1) return { error: "intent_state_conflict", status: 409 } as const;
|
|
257
|
+
audit(row.created_by_user, null, `external_schedule.edit_${body.status}`, row.intent_id, row.network_id, {
|
|
258
|
+
node_id: row.node_id, schedule_id: row.schedule_id, base_revision: row.base_revision,
|
|
259
|
+
result_revision: body.status === "applied" ? Number(body.result_revision) : null,
|
|
260
|
+
error_code: body.error_code ?? null,
|
|
261
|
+
});
|
|
262
|
+
return { row: { ...row, status: String(body.status), acked_at: now, result_revision: body.status === "applied" ? Number(body.result_revision) : null, error_code: body.error_code ?? null } } as const;
|
|
263
|
+
});
|
|
264
|
+
if ("error" in result) return error(result.error, result.status);
|
|
265
|
+
return Response.json({ ok: true, intent: publicEdit(result.row), ...(result.idempotent ? { idempotent: true } : {}) });
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
if (tail) return error("not_found", 404);
|
|
269
|
+
|
|
270
|
+
if (ctx.req.method === "GET") {
|
|
271
|
+
const denied = requireOwner(ctx, node, ctx.url.searchParams.get("network_id"));
|
|
272
|
+
if (denied) return denied;
|
|
273
|
+
const rows = db.all<EditRow>(
|
|
274
|
+
"SELECT * FROM external_schedule_edits WHERE node_id = ?1 AND network_id = ?2 AND created_by_user = ?3 ORDER BY created_at DESC LIMIT 100",
|
|
275
|
+
node.node_id, node.network_id, ctx.auth!.userId,
|
|
276
|
+
);
|
|
277
|
+
return Response.json({ ok: true, edits: rows.map(publicEdit) });
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
if (ctx.req.method !== "POST") return error("method_not_allowed", 405);
|
|
281
|
+
let body: Record<string, unknown>;
|
|
282
|
+
try { body = await bodyObject(ctx.req); } catch { return error("invalid_json", 400); }
|
|
283
|
+
if (!exactKeys(body, ["network_id", "schedule_id", "base_revision", "patch"])) return error("invalid_request", 400);
|
|
284
|
+
const denied = requireOwner(ctx, node, body.network_id);
|
|
285
|
+
if (denied) return denied;
|
|
286
|
+
if (typeof body.schedule_id !== "string" || !SCHEDULE_ID_RE.test(body.schedule_id)) return error("invalid_schedule_id", 400);
|
|
287
|
+
if (!Number.isSafeInteger(body.base_revision) || Number(body.base_revision) < 0) return error("invalid_revision", 400);
|
|
288
|
+
let patch: ExternalSchedulePatch;
|
|
289
|
+
try { patch = parseExternalSchedulePatch(body.patch); } catch (e: any) { return error(String(e?.message || "invalid_patch"), 400); }
|
|
290
|
+
const schedule = reportedSchedule(node, body.schedule_id);
|
|
291
|
+
if (!schedule) return error("schedule_not_found", 404);
|
|
292
|
+
if (schedule.kind !== "cron" || schedule.editable !== true || !Number.isSafeInteger(schedule.revision)) return error("schedule_read_only", 409);
|
|
293
|
+
if (Number(schedule.revision) !== Number(body.base_revision)) return error("revision_conflict", 409, { current_revision: schedule.revision });
|
|
294
|
+
|
|
295
|
+
const intentId = `sei_${crypto.randomUUID()}`;
|
|
296
|
+
const now = Date.now();
|
|
297
|
+
try {
|
|
298
|
+
db.transaction(() => {
|
|
299
|
+
// Re-read ownership + snapshot inside the write transaction so a
|
|
300
|
+
// concurrent owner/snapshot change cannot slip between preflight and INSERT.
|
|
301
|
+
const currentNode = nodeRow(node.node_id);
|
|
302
|
+
if (!currentNode || currentNode.owner_user_id !== ctx.auth!.userId || currentNode.network_id !== node.network_id) throw new Error("node_owner_changed");
|
|
303
|
+
const current = reportedSchedule(currentNode, body.schedule_id as string);
|
|
304
|
+
if (!current || current.editable !== true || current.kind !== "cron") throw new Error("schedule_read_only");
|
|
305
|
+
if (Number(current.revision) !== Number(body.base_revision)) throw new Error("revision_conflict");
|
|
306
|
+
db.run(
|
|
307
|
+
`INSERT INTO external_schedule_edits
|
|
308
|
+
(intent_id, network_id, node_id, schedule_id, base_revision, patch_json, status, expires_at, created_at, created_by_user, created_by_token)
|
|
309
|
+
VALUES (?1, ?2, ?3, ?4, ?5, ?6, 'pending', ?7, ?8, ?9, ?10)`,
|
|
310
|
+
[intentId, node.network_id, node.node_id, body.schedule_id, body.base_revision, JSON.stringify(patch), now + INTENT_TTL_MS, now, ctx.auth!.userId, ctx.auth!.tokenId],
|
|
311
|
+
);
|
|
312
|
+
audit(ctx.auth!.userId, ctx.auth!.username, "external_schedule.edit_requested", intentId, node.network_id!, {
|
|
313
|
+
node_id: node.node_id, schedule_id: body.schedule_id, base_revision: body.base_revision, fields: Object.keys(patch).sort(),
|
|
314
|
+
});
|
|
315
|
+
});
|
|
316
|
+
} catch (e: any) {
|
|
317
|
+
const code = String(e?.message || "edit_create_failed");
|
|
318
|
+
if (/UNIQUE|duplicate key/i.test(code)) return error("edit_in_flight", 409);
|
|
319
|
+
if (code === "revision_conflict") return error(code, 409);
|
|
320
|
+
if (code === "schedule_read_only") return error(code, 409);
|
|
321
|
+
if (code === "node_owner_changed") return error(code, 409);
|
|
322
|
+
throw e;
|
|
323
|
+
}
|
|
324
|
+
try { pushEvent(node.alias || node.node_id, { type: "external_schedule_edit", intent_id: intentId }, node.network_id); } catch {}
|
|
325
|
+
const created = db.get<EditRow>("SELECT * FROM external_schedule_edits WHERE intent_id = ?1", intentId)!;
|
|
326
|
+
return Response.json({ ok: true, intent: publicEdit(created) }, { status: 202 });
|
|
327
|
+
}
|
|
@@ -27,7 +27,7 @@ const UPLOADS_DIR = mkdtempSync(join(tmpdir(), "anet-495-devopen-fs-"));
|
|
|
27
27
|
|
|
28
28
|
// Set env BEFORE importing anything that touches db-adapter.ts or
|
|
29
29
|
// server.ts (both capture env at module load).
|
|
30
|
-
process.env.COMMHUB_DB
|
|
30
|
+
process.env.COMMHUB_DB ||= SERVER_DB;
|
|
31
31
|
process.env.COMMHUB_UPLOADS_DIR = UPLOADS_DIR;
|
|
32
32
|
process.env.HOST = "127.0.0.1";
|
|
33
33
|
process.env.COMMHUB_DEV_OPEN = "1";
|
|
@@ -34,7 +34,7 @@ const MASTER_TOKEN = process.env.COMMHUB_AUTH_TOKEN ?? `master-495-${Date.now()}
|
|
|
34
34
|
// Set env BEFORE importing anything that pulls in db-adapter.ts (which
|
|
35
35
|
// refuses to open a default DB under NODE_ENV=test) or server.ts (which
|
|
36
36
|
// captures DEV_OPEN + AUTH_TOKEN at module load).
|
|
37
|
-
process.env.COMMHUB_DB
|
|
37
|
+
process.env.COMMHUB_DB ||= SERVER_DB;
|
|
38
38
|
process.env.COMMHUB_UPLOADS_DIR = UPLOADS_DIR;
|
|
39
39
|
process.env.HOST = "127.0.0.1";
|
|
40
40
|
process.env.COMMHUB_AUTH_TOKEN = MASTER_TOKEN;
|
|
@@ -56,6 +56,16 @@ const rA = register(nameA, "BootstrapPw123Aa!", undefined, "userA");
|
|
|
56
56
|
if (!rA.ok) throw new Error(`userA register failed: ${rA.error}`);
|
|
57
57
|
const userAToken = rA.token!;
|
|
58
58
|
const userAUserId = rA.user!.user_id;
|
|
59
|
+
const userANetworkId = rA.network_id!;
|
|
60
|
+
|
|
61
|
+
// #503 — userA joins userB's network below, which makes userA a
|
|
62
|
+
// SAME-network peer. Cross-network denial needs a principal who is in
|
|
63
|
+
// neither, so userC exists purely to be an outsider.
|
|
64
|
+
const nameC = `userccc_495_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
|
|
65
|
+
const rC = register(nameC, "BootstrapPw123Aa!", undefined, "userC");
|
|
66
|
+
if (!rC.ok) throw new Error(`userC register failed: ${rC.error}`);
|
|
67
|
+
const userCToken = rC.token!;
|
|
68
|
+
const userCUserId = rC.user!.user_id;
|
|
59
69
|
|
|
60
70
|
const nameB = `userbbb_495_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
|
|
61
71
|
const rB = register(nameB, "BootstrapPw123Aa!", undefined, "userB");
|
|
@@ -94,7 +104,8 @@ if (!userBNetworkId) throw new Error("userB default network not found");
|
|
|
94
104
|
// Add userA as a member of userB's default network. This is what makes
|
|
95
105
|
// the "same-network non-owner" test cell meaningful — without it, that
|
|
96
106
|
// test would only prove cross-network denial, which is a weaker claim.
|
|
97
|
-
|
|
107
|
+
// 多用户 Agent 权限:新成员默认只看授权 Agent;本测试测的是「完全信任的成员」旧语义,显式 agent_access=all。
|
|
108
|
+
const addMember = addNetworkMember(userBNetworkId, userAUserId, "member", userBUserId, { agentAccess: "all" });
|
|
98
109
|
if (!addMember.ok) throw new Error(`add userA to userB network failed: ${addMember.error}`);
|
|
99
110
|
|
|
100
111
|
const { bootServer } = await import("./server.js");
|
|
@@ -132,10 +143,16 @@ afterAll(() => {
|
|
|
132
143
|
delete process.env.COMMHUB_AUTH_TOKEN;
|
|
133
144
|
});
|
|
134
145
|
|
|
135
|
-
|
|
146
|
+
// #503 — a utok_ holder in more than one network must name the target
|
|
147
|
+
// network; the server refuses to guess ("first network" is not assumed).
|
|
148
|
+
// Callers using a single-network token can still omit it.
|
|
149
|
+
async function uploadAs(token: string, content: Uint8Array, filename: string, networkId?: string): Promise<string> {
|
|
136
150
|
const form = new FormData();
|
|
137
151
|
form.append("file", new Blob([content], { type: "application/octet-stream" }), filename);
|
|
138
|
-
const
|
|
152
|
+
const url = networkId
|
|
153
|
+
? `${BASE}/api/upload?network_id=${encodeURIComponent(networkId)}`
|
|
154
|
+
: `${BASE}/api/upload`;
|
|
155
|
+
const res = await fetch(url, {
|
|
139
156
|
method: "POST",
|
|
140
157
|
body: form,
|
|
141
158
|
headers: { Authorization: `Bearer ${token}` },
|
|
@@ -152,6 +169,10 @@ async function downloadAs(token: string | null, fileId: string): Promise<Respons
|
|
|
152
169
|
return fetch(`${BASE}/api/files/${fileId}`, { headers });
|
|
153
170
|
}
|
|
154
171
|
|
|
172
|
+
async function downloadWithQueryToken(token: string, fileId: string): Promise<Response> {
|
|
173
|
+
return fetch(`${BASE}/api/files/${fileId}?token=${encodeURIComponent(token)}`);
|
|
174
|
+
}
|
|
175
|
+
|
|
155
176
|
describe.skipIf(!isProdMode)("#495 — GET /api/files/:file_id authorization (owner-only staged)", () => {
|
|
156
177
|
let userBFileId = "";
|
|
157
178
|
|
|
@@ -173,27 +194,36 @@ describe.skipIf(!isProdMode)("#495 — GET /api/files/:file_id authorization (ow
|
|
|
173
194
|
expect(await res.text()).toBe("agent-blob");
|
|
174
195
|
});
|
|
175
196
|
|
|
176
|
-
test("🔴 non-owner (
|
|
177
|
-
|
|
197
|
+
test("🔴 cross-network non-owner (userC) downloads userB's file → 404 (was 200 pre-#495)", async () => {
|
|
198
|
+
// Precondition — userC is in NEITHER of userB's networks, so the 404
|
|
199
|
+
// is cross-network denial. This row used to use userA, but #503 made
|
|
200
|
+
// userA a legitimate same-network reader; keeping userA here would
|
|
201
|
+
// have turned #495's guarantee into a test that asserts nothing.
|
|
202
|
+
const rows = db.all<{ network_id: string }>(
|
|
203
|
+
"SELECT network_id FROM network_members WHERE user_id = ?1 AND network_id = ?2",
|
|
204
|
+
userCUserId, userBNetworkId,
|
|
205
|
+
);
|
|
206
|
+
expect(rows.length).toBe(0);
|
|
207
|
+
const res = await downloadAs(userCToken, userBFileId);
|
|
178
208
|
expect(res.status).toBe(404);
|
|
179
209
|
const body: any = await res.json();
|
|
180
210
|
expect(body.error).toBe("not_found");
|
|
181
211
|
});
|
|
182
212
|
|
|
183
|
-
test("🔴 same-network non-owner (userA is a member of userB's network) →
|
|
184
|
-
// Precondition — userA really is a member of userB's default
|
|
185
|
-
//
|
|
186
|
-
//
|
|
187
|
-
// not "cross-network denied".
|
|
213
|
+
test("🔴 same-network non-owner (userA is a member of userB's network) → 200 (#503 lifted the #495 staged carve-out)", async () => {
|
|
214
|
+
// Precondition — userA really is a member of userB's default network
|
|
215
|
+
// (added in module setup), so the 200 represents "same-network peer
|
|
216
|
+
// allowed" rather than an owner match or an admin bypass.
|
|
188
217
|
const rows = db.all<{ network_id: string }>(
|
|
189
218
|
"SELECT network_id FROM network_members WHERE user_id = ?1 AND network_id = ?2",
|
|
190
219
|
userAUserId, userBNetworkId,
|
|
191
220
|
);
|
|
192
221
|
expect(rows.length).toBe(1);
|
|
222
|
+
expect(db.get<{ role: string }>("SELECT role FROM users WHERE user_id = ?1", userAUserId)?.role)
|
|
223
|
+
.not.toBe("admin");
|
|
193
224
|
const res = await downloadAs(userAToken, userBFileId);
|
|
194
|
-
expect(res.status).toBe(
|
|
195
|
-
|
|
196
|
-
expect(body.error).toBe("not_found");
|
|
225
|
+
expect(res.status).toBe(200);
|
|
226
|
+
expect(await res.text()).toBe("secret-from-B");
|
|
197
227
|
});
|
|
198
228
|
|
|
199
229
|
test("admin caller downloads any file → 200 (operational access preserved)", async () => {
|
|
@@ -213,6 +243,13 @@ describe.skipIf(!isProdMode)("#495 — GET /api/files/:file_id authorization (ow
|
|
|
213
243
|
expect(res.status).toBe(401);
|
|
214
244
|
});
|
|
215
245
|
|
|
246
|
+
test("🔴 valid query token is refused on file GET (credential must stay out of URLs)", async () => {
|
|
247
|
+
const res = await downloadWithQueryToken(userBToken, userBFileId);
|
|
248
|
+
expect(res.status).toBe(401);
|
|
249
|
+
const body: any = await res.json();
|
|
250
|
+
expect(body.error).toBe("unauthorized");
|
|
251
|
+
});
|
|
252
|
+
|
|
216
253
|
test("non-owner request for an UNKNOWN file_id → 404 with same shape as owner-denied (no enumeration signal)", async () => {
|
|
217
254
|
const res = await downloadAs(userAToken, "0123456789abcdef0123456789abcdef");
|
|
218
255
|
expect(res.status).toBe(404);
|
|
@@ -232,6 +269,10 @@ async function headAs(token: string | null, fileId: string): Promise<Response> {
|
|
|
232
269
|
return fetch(`${BASE}/api/files/${fileId}`, { method: "HEAD", headers });
|
|
233
270
|
}
|
|
234
271
|
|
|
272
|
+
async function headWithQueryToken(token: string, fileId: string): Promise<Response> {
|
|
273
|
+
return fetch(`${BASE}/api/files/${fileId}?token=${encodeURIComponent(token)}`, { method: "HEAD" });
|
|
274
|
+
}
|
|
275
|
+
|
|
235
276
|
describe.skipIf(!isProdMode)("#500 CR2 — HEAD /api/files/:file_id authorization (parity with GET)", () => {
|
|
236
277
|
let userBFileId = "";
|
|
237
278
|
|
|
@@ -247,8 +288,10 @@ describe.skipIf(!isProdMode)("#500 CR2 — HEAD /api/files/:file_id authorizatio
|
|
|
247
288
|
expect(res.headers.get("x-content-type-options")).toBe("nosniff");
|
|
248
289
|
});
|
|
249
290
|
|
|
250
|
-
test("🔴 cross-
|
|
251
|
-
|
|
291
|
+
test("🔴 cross-network HEAD (userC HEAD userB's file) → 404 via helper (was fallback 200 pre-CR2)", async () => {
|
|
292
|
+
// userC, not userA — #503 makes userA a same-network reader, so the
|
|
293
|
+
// GET/HEAD parity claim needs a principal who is genuinely denied.
|
|
294
|
+
const res = await headAs(userCToken, userBFileId);
|
|
252
295
|
expect(res.status).toBe(404);
|
|
253
296
|
// 404 must originate from authorizeFileDownload, not the fallback
|
|
254
297
|
// page. Body is application/json ({"ok":false,"error":"not_found"})
|
|
@@ -269,6 +312,11 @@ describe.skipIf(!isProdMode)("#500 CR2 — HEAD /api/files/:file_id authorizatio
|
|
|
269
312
|
expect(res.status).toBe(401);
|
|
270
313
|
});
|
|
271
314
|
|
|
315
|
+
test("🔴 valid query token is refused on file HEAD (same gate as GET)", async () => {
|
|
316
|
+
const res = await headWithQueryToken(userBToken, userBFileId);
|
|
317
|
+
expect(res.status).toBe(401);
|
|
318
|
+
});
|
|
319
|
+
|
|
272
320
|
test("admin HEAD any file → 200 (operational access preserved on HEAD)", async () => {
|
|
273
321
|
const res = await headAs(adminToken, userBFileId);
|
|
274
322
|
expect(res.status).toBe(200);
|
|
@@ -284,7 +332,9 @@ describe.skipIf(!isProdMode)("#500 CR2 — HEAD /api/files/:file_id authorizatio
|
|
|
284
332
|
// in the authorizeFileDownload comment and this test enforces it.
|
|
285
333
|
describe.skipIf(!isProdMode)("#500 CR2 — upload persists truthy owner_id (D1)", () => {
|
|
286
334
|
test("D1: userA authenticated upload → index entry owner_id === userA.userId (never null)", async () => {
|
|
287
|
-
|
|
335
|
+
// userA belongs to two networks (own default + userB's), so #503
|
|
336
|
+
// requires the target network to be named explicitly.
|
|
337
|
+
const fileId = await uploadAs(userAToken, new TextEncoder().encode("owner-persistence-check"), "d1.bin", userANetworkId);
|
|
288
338
|
const { readFileSync } = await import("fs");
|
|
289
339
|
const entryPath = join(UPLOADS_DIR, ".index", `${fileId}.json`);
|
|
290
340
|
expect(existsSync(entryPath)).toBe(true);
|
|
@@ -314,13 +364,18 @@ describe.skipIf(!isProdMode)("#495 — null-owner policy in production (DEV_OPEN
|
|
|
314
364
|
// reproduces the shape a DEV_OPEN or legacy master upload would
|
|
315
365
|
// create, without needing to spin up a second server in a
|
|
316
366
|
// different mode.
|
|
317
|
-
nullOwnerFileId = await uploadAs(userAToken, new TextEncoder().encode("legacy-blob"), "legacy.txt");
|
|
367
|
+
nullOwnerFileId = await uploadAs(userAToken, new TextEncoder().encode("legacy-blob"), "legacy.txt", userANetworkId);
|
|
318
368
|
const { readFileSync: rfs, writeFileSync: wfs } = await import("fs");
|
|
319
369
|
const entryFile = join(UPLOADS_DIR, ".index", `${nullOwnerFileId}.json`);
|
|
320
370
|
if (!existsSync(entryFile)) throw new Error(`index entry not found: ${entryFile}`);
|
|
321
371
|
const entry = JSON.parse(rfs(entryFile, "utf-8"));
|
|
322
372
|
entry.owner = null;
|
|
323
373
|
entry.owner_id = null;
|
|
374
|
+
// #503 — a true legacy entry predates network attribution entirely.
|
|
375
|
+
// Deleting the key (rather than nulling it) matches what the writer
|
|
376
|
+
// emits when there is no attribution, so this fixture exercises the
|
|
377
|
+
// legacy compatibility branch instead of the network branch.
|
|
378
|
+
delete entry.network_id;
|
|
324
379
|
wfs(entryFile, JSON.stringify(entry, null, 2));
|
|
325
380
|
});
|
|
326
381
|
|
|
@@ -34,7 +34,7 @@ const UPLOADS_DIR = mkdtempSync(join(tmpdir(), "anet-509-fs-"));
|
|
|
34
34
|
|
|
35
35
|
// Set env BEFORE importing anything that pulls in db-adapter.ts or
|
|
36
36
|
// server.ts (which capture DEV_OPEN + AUTH_TOKEN at module load).
|
|
37
|
-
process.env.COMMHUB_DB
|
|
37
|
+
process.env.COMMHUB_DB ||= SERVER_DB;
|
|
38
38
|
process.env.COMMHUB_UPLOADS_DIR = UPLOADS_DIR;
|
|
39
39
|
process.env.HOST = "127.0.0.1";
|
|
40
40
|
delete process.env.COMMHUB_DEV_OPEN;
|
|
@@ -263,35 +263,17 @@ describe.skipIf(!isProdMode)("#509 — download uses index date_bucket, not toda
|
|
|
263
263
|
dateBucket: BUCKET_YESTERDAY,
|
|
264
264
|
content,
|
|
265
265
|
});
|
|
266
|
-
//
|
|
267
|
-
//
|
|
268
|
-
//
|
|
269
|
-
// Bun runtime. Measured 2026-07-30 with byte-identical code:
|
|
270
|
-
// bun 1.2.22 → 200 + full body bun 1.3.14 → 206 + correct slice
|
|
271
|
-
// So both statuses are legitimate and this test must pass on both.
|
|
272
|
-
//
|
|
273
|
-
// 🔴 But "accept either status" must NOT mean "assert nothing". The first
|
|
274
|
-
// version guarded the body check with `if (status === 200)`, so on the
|
|
275
|
-
// runtime production actually runs (206) the body assertion never
|
|
276
|
-
// executed — the test claimed to prove the blob path resolved correctly
|
|
277
|
-
// while only ever checking a status code. Each branch asserts its own
|
|
278
|
-
// bytes, and an unrecognised status fails loudly rather than silently
|
|
279
|
-
// skipping.
|
|
266
|
+
// #514: Range is now handled in application code, not delegated to Bun.
|
|
267
|
+
// That makes 206 the only valid result across Bun versions; accepting 200
|
|
268
|
+
// here would re-open the runtime-dependent behavior this test guards.
|
|
280
269
|
const res = await fetch(`${BASE}/api/files/${fileId}`, {
|
|
281
270
|
method: "GET",
|
|
282
271
|
headers: { Authorization: `Bearer ${userAToken}`, Range: "bytes=0-4" },
|
|
283
272
|
});
|
|
284
|
-
expect(
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
// resolved blob is the planted one, not some other bucket's file).
|
|
289
|
-
expect(await res.text()).toBe("01234");
|
|
290
|
-
expect(res.headers.get("content-range")).toBe(`bytes 0-4/${content.byteLength}`);
|
|
291
|
-
} else {
|
|
292
|
-
// Runtime ignored Range: body must be the complete planted blob.
|
|
293
|
-
expect(await res.text()).toBe("0123456789ABCDEFGHIJ");
|
|
294
|
-
}
|
|
273
|
+
expect(res.status).toBe(206);
|
|
274
|
+
expect(await res.text()).toBe("01234");
|
|
275
|
+
expect(res.headers.get("content-range")).toBe(`bytes 0-4/${content.byteLength}`);
|
|
276
|
+
expect(res.headers.get("content-length")).toBe("5");
|
|
295
277
|
});
|
|
296
278
|
|
|
297
279
|
test("Door 3 conditional: yesterday's file with If-None-Match → served or 304, never 404", async () => {
|