@sleep2agi/commhub-server 0.9.0-preview.2 → 0.9.0-preview.200
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 +130 -10
- package/bin/commhub.ts +99 -11
- package/package.json +7 -7
- package/src/ack-create-request-transport.test.ts +182 -0
- package/src/ack-create-request.test.ts +374 -0
- 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 +137 -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 +659 -0
- package/src/agent-acl-slice3-http.test.ts +267 -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 +271 -0
- package/src/api-host-supervisors-runtime-readiness.test.ts +195 -0
- package/src/api-nodes-shape.test.ts +279 -0
- package/src/auth-password-change-cli-tokens-http.test.ts +423 -0
- package/src/auth-sessions-http.test.ts +250 -0
- package/src/auth-validate.test.ts +5 -1
- package/src/auth-weak-password-login.test.ts +176 -0
- package/src/auth.ts +611 -51
- package/src/avatar-validate.test.ts +163 -0
- package/src/avatar-validate.ts +103 -0
- package/src/backfill-node-ids-2664.test.ts +128 -0
- package/src/binding-generation-http.test.ts +121 -0
- package/src/blocked-exit-on-reply.test.ts +122 -0
- package/src/boot-side-effect.test.ts +124 -0
- package/src/broadcast-fanout-2721.test.ts +118 -0
- package/src/broadcast-fanout.ts +98 -0
- package/src/chain-attempt-dedup.test.ts +447 -0
- package/src/clone-node.test.ts +248 -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-sec1.test.ts +107 -0
- package/src/config-apply-validate.test.ts +134 -1
- package/src/config-apply-validate.ts +111 -5
- package/src/create-node-blocked-gate.test.ts +356 -0
- package/src/create-node-network-id.test.ts +79 -0
- package/src/create-node-tool-schema.test.ts +49 -0
- package/src/create-node-unicode-name.test.ts +120 -0
- package/src/create-node-validate.test.ts +379 -0
- package/src/create-node-validate.ts +423 -0
- package/src/create-node-workdir.test.ts +289 -0
- package/src/create-node.test.ts +354 -0
- package/src/create-node.ts +411 -0
- package/src/daemon-provider-snapshots.test.ts +421 -0
- package/src/daemon-provider-snapshots.ts +327 -0
- package/src/daemon-token-owner-http.test.ts +236 -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 +1501 -152
- 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 +330 -0
- package/src/department-heads.ts +226 -0
- package/src/departments-agent-count.test.ts +129 -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 +177 -0
- package/src/env-transport-gate.ts +74 -0
- package/src/env-transport-policy.ts +21 -0
- package/src/event-loop-lag.test.ts +139 -0
- package/src/event-loop-lag.ts +150 -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 +135 -0
- package/src/file-download-authz.test.ts +404 -0
- package/src/file-download-date-bucket.test.ts +436 -0
- 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 +482 -0
- package/src/group-messages.ts +297 -0
- package/src/health-host-disk-2756.test.ts +49 -0
- package/src/health-redaction.test.ts +685 -0
- 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 +187 -0
- package/src/hub-provider-config.test.ts +139 -0
- package/src/hub-provider-config.ts +105 -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 +15 -2172
- package/src/lifecycle-guard.ts +50 -0
- package/src/list-host-supervisors.test.ts +315 -0
- 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 +162 -0
- package/src/mcp-route-label-http.test.ts +120 -0
- package/src/mcp-write-network-resolution.test.ts +432 -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 +139 -0
- package/src/node-alias-control.ts +12 -0
- package/src/node-attrs-validate.ts +88 -0
- package/src/node-attrs.test.ts +258 -0
- package/src/node-caller-identity-http.test.ts +1083 -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 +344 -0
- package/src/node-health-codex-login.test.ts +120 -0
- package/src/node-health-dispatch-http.test.ts +279 -0
- package/src/node-health-guard.ts +105 -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 +250 -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 +79 -0
- package/src/node-permissions-http.test.ts +345 -0
- package/src/node-permissions.ts +393 -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 +209 -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 +442 -0
- package/src/observer-push.test.ts +252 -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 +352 -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 +455 -0
- package/src/peer-reply-capability.test.ts +70 -0
- package/src/pg-worker.ts +87 -0
- package/src/probe-validate.test.ts +221 -0
- package/src/probe-validate.ts +104 -0
- package/src/probe.test.ts +80 -0
- package/src/probe.ts +200 -0
- package/src/project-dir-warn-clear-http.test.ts +132 -0
- package/src/project-viewer-can-http.test.ts +116 -0
- package/src/push.test.ts +20 -10
- package/src/push.ts +466 -13
- package/src/redact-tokens.test.ts +65 -0
- package/src/redact-tokens.ts +40 -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 +268 -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 +425 -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-comment-http.test.ts +167 -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 +163 -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-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 +2027 -0
- package/src/resolve-port.test.ts +57 -0
- package/src/resolve-port.ts +44 -0
- package/src/response-charset.test.ts +130 -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 +211 -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 +391 -0
- package/src/schedule-agent.ts +192 -0
- package/src/schedule-starved.test.ts +92 -0
- package/src/schedule-starved.ts +114 -0
- package/src/scheduled-backoff-http.test.ts +193 -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 +377 -0
- package/src/scheduled-noprogress-backoff-2622.test.ts +133 -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 +279 -0
- package/src/scheduled-requirement-wake.ts +125 -0
- package/src/scheduled-run-terminal.test.ts +268 -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 +312 -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 +139 -0
- package/src/send-dedup-request-id.test.ts +229 -0
- package/src/send-reply-agent-warning.test.ts +202 -0
- 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 +38 -0
- package/src/serve-error.ts +27 -0
- package/src/server.ts +5997 -0
- 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 +54 -0
- package/src/shared/probe-host-allowlist.ts +128 -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 +53 -0
- package/src/shared/reserved-env.test.ts +35 -0
- package/src/shared/reserved-env.ts +31 -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 +108 -0
- package/src/sqlite-close-checkpoint.test.ts +78 -0
- package/src/start-node.test.ts +264 -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 +122 -0
- package/src/stop-delete-node.test.ts +1286 -0
- 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 +482 -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 +315 -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 +152 -0
- package/src/task-lifecycle-watcher-busy.test.ts +114 -0
- package/src/task-lifecycle-watcher.test.ts +204 -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 +49 -0
- package/src/task-sender-http.test.ts +143 -0
- package/src/task-stale-open-http.test.ts +290 -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/tool-audience-http.test.ts +230 -0
- package/src/tool-audience.ts +120 -0
- package/src/tools-list-json-schema.test.ts +94 -0
- package/src/tools.ts +5815 -348
- package/src/update-provider.test.ts +234 -0
- package/src/upload-early-reject-guard.test.ts +155 -0
- package/src/uploads-http.test.ts +97 -15
- package/src/uploads.test.ts +66 -0
- package/src/uploads.ts +138 -5
- 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 +161 -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/vault.test.ts +200 -0
- package/src/vault.ts +156 -0
- package/src/version-stats.test.ts +66 -0
- package/src/version-stats.ts +109 -0
package/src/uploads.ts
CHANGED
|
@@ -53,6 +53,17 @@ export const UPLOAD_RATE_MAX_ENTRIES = 50_000;
|
|
|
53
53
|
// traversal.
|
|
54
54
|
export const FILE_ID_REGEX = /^[A-Za-z0-9_-]{8,64}$/;
|
|
55
55
|
|
|
56
|
+
// Stored extension tokens have one invariant at every path boundary:
|
|
57
|
+
// either no extension, or a leading dot followed by 1-16 ASCII
|
|
58
|
+
// alphanumeric characters. Keep this separate from sanitizeExt(), which
|
|
59
|
+
// parses a client filename and therefore deliberately has different
|
|
60
|
+
// capture/anchoring semantics.
|
|
61
|
+
const EXT_TOKEN_REGEX = /^\.[A-Za-z0-9]{1,16}$/;
|
|
62
|
+
|
|
63
|
+
function isValidExtToken(ext: unknown): ext is string {
|
|
64
|
+
return typeof ext === "string" && (ext === "" || EXT_TOKEN_REGEX.test(ext));
|
|
65
|
+
}
|
|
66
|
+
|
|
56
67
|
export type GeneratedFile = {
|
|
57
68
|
fileId: string;
|
|
58
69
|
ext: string;
|
|
@@ -94,14 +105,51 @@ export function sanitizeExt(filename: string | undefined | null): string {
|
|
|
94
105
|
return match ? "." + match[1].toLowerCase() : "";
|
|
95
106
|
}
|
|
96
107
|
|
|
108
|
+
// YYYY-MM-DD bucket string regex — matches what getDateBucket produces
|
|
109
|
+
// and what an index entry's `date_bucket` field is validated against.
|
|
110
|
+
const DATE_BUCKET_REGEX = /^\d{4}-\d{2}-\d{2}$/;
|
|
111
|
+
|
|
97
112
|
/**
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
*
|
|
113
|
+
* Validate a date_bucket string against BOTH shape (YYYY-MM-DD regex)
|
|
114
|
+
* AND real-calendar semantics: rejects "2026-02-30", "2026-13-01",
|
|
115
|
+
* "2026-00-15", leap-day-on-non-leap-year, etc. Shape-only check is not
|
|
116
|
+
* enough because the regex accepts any digit combination in each
|
|
117
|
+
* position.
|
|
118
|
+
*
|
|
119
|
+
* Used as a pre-check by the download handler before it calls into
|
|
120
|
+
* pathForExistingBlob — a non-calendar bucket is a 404 (invalid input
|
|
121
|
+
* rejected at the boundary), NOT a 500 (uncaught throw from deep in
|
|
122
|
+
* the read path). Distinguishing these matters: 500 says "server
|
|
123
|
+
* failed"; 404 says "we know your request is bad, refused early".
|
|
124
|
+
*/
|
|
125
|
+
export function isValidCalendarBucket(bucket: unknown): bucket is string {
|
|
126
|
+
if (typeof bucket !== "string") return false;
|
|
127
|
+
if (!DATE_BUCKET_REGEX.test(bucket)) return false;
|
|
128
|
+
// Round-trip via Date to reject non-calendar shapes like "2026-02-30"
|
|
129
|
+
// or "2026-13-01". `Date.UTC` coerces overflow ("2026-02-30" becomes
|
|
130
|
+
// "2026-03-02") — if the ISO round-trip doesn't equal the input, the
|
|
131
|
+
// caller supplied a non-calendar bucket.
|
|
132
|
+
const [yStr, mStr, dStr] = bucket.split("-");
|
|
133
|
+
const y = Number(yStr), m = Number(mStr), d = Number(dStr);
|
|
134
|
+
if (m < 1 || m > 12) return false;
|
|
135
|
+
if (d < 1 || d > 31) return false;
|
|
136
|
+
const roundtrip = new Date(Date.UTC(y, m - 1, d)).toISOString().slice(0, 10);
|
|
137
|
+
return roundtrip === bucket;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/**
|
|
141
|
+
* Build the storage path for a NEW upload. Computes today's date bucket
|
|
142
|
+
* from the runtime clock (or `opts.now` for tests). Use ONLY for creating
|
|
143
|
+
* a fresh blob; for reading an existing blob whose bucket is already
|
|
144
|
+
* recorded in the index, use pathForExistingBlob() instead.
|
|
145
|
+
*
|
|
146
|
+
* The file_id and ext are validated against strict regexes; any
|
|
147
|
+
* path-separator or `..` segment from a malicious client gets rejected
|
|
148
|
+
* at the regex layer before any I/O.
|
|
101
149
|
*/
|
|
102
150
|
export function buildStoragePath(fileId: string, ext: string, opts: { uploadsRoot?: string; now?: Date } = {}): GeneratedFile {
|
|
103
151
|
if (!FILE_ID_REGEX.test(fileId)) throw new Error(`file_id "${fileId}" is invalid`);
|
|
104
|
-
if (
|
|
152
|
+
if (!isValidExtToken(ext)) throw new Error(`ext "${ext}" is invalid`);
|
|
105
153
|
const dateBucket = getDateBucket(opts.now);
|
|
106
154
|
const root = opts.uploadsRoot ?? getUploadsRoot();
|
|
107
155
|
const relativePath = join(dateBucket, fileId + ext);
|
|
@@ -109,6 +157,32 @@ export function buildStoragePath(fileId: string, ext: string, opts: { uploadsRoo
|
|
|
109
157
|
return { fileId, ext, dateBucket, relativePath, absolutePath };
|
|
110
158
|
}
|
|
111
159
|
|
|
160
|
+
/**
|
|
161
|
+
* Build the storage path for an EXISTING blob, using the caller-supplied
|
|
162
|
+
* `dateBucket` (typically read from the index entry). Does NOT compute
|
|
163
|
+
* a date from the runtime clock — that is the write-side concern.
|
|
164
|
+
*
|
|
165
|
+
* This split exists because sharing one date-computing function between
|
|
166
|
+
* write and read semantics caused #509: yesterday's file downloaded
|
|
167
|
+
* today would look under today's bucket → blob_missing → 404, even
|
|
168
|
+
* though the blob was still sitting in yesterday's directory.
|
|
169
|
+
*
|
|
170
|
+
* The file_id, ext and dateBucket are validated against strict regexes
|
|
171
|
+
* before any I/O; a poisoned index bucket (e.g. `../etc`) is rejected
|
|
172
|
+
* here just as file_id path-escape attempts are.
|
|
173
|
+
*/
|
|
174
|
+
export function pathForExistingBlob(dateBucket: string, fileId: string, ext: string, opts: { uploadsRoot?: string } = {}): GeneratedFile {
|
|
175
|
+
if (!FILE_ID_REGEX.test(fileId)) throw new Error(`file_id "${fileId}" is invalid`);
|
|
176
|
+
if (!isValidExtToken(ext)) throw new Error(`ext "${ext}" is invalid`);
|
|
177
|
+
if (typeof dateBucket !== "string" || !DATE_BUCKET_REGEX.test(dateBucket)) {
|
|
178
|
+
throw new Error(`date_bucket "${dateBucket}" is invalid`);
|
|
179
|
+
}
|
|
180
|
+
const root = opts.uploadsRoot ?? getUploadsRoot();
|
|
181
|
+
const relativePath = join(dateBucket, fileId + ext);
|
|
182
|
+
const absolutePath = join(root, relativePath);
|
|
183
|
+
return { fileId, ext, dateBucket, relativePath, absolutePath };
|
|
184
|
+
}
|
|
185
|
+
|
|
112
186
|
export type UploadIndexEntry = {
|
|
113
187
|
file_id: string;
|
|
114
188
|
date_bucket: string; // YYYY-MM-DD
|
|
@@ -117,9 +191,24 @@ export type UploadIndexEntry = {
|
|
|
117
191
|
mime: string; // best-effort mime from the multipart Content-Type
|
|
118
192
|
size: number; // byte length of the binary
|
|
119
193
|
owner?: string; // upload token id / username, for traceability
|
|
194
|
+
// Written by the upload handler as `authCtx?.userId ?? null`, so `null`
|
|
195
|
+
// is a real on-disk value — the type must say so rather than pretend
|
|
196
|
+
// the field is `string | undefined`.
|
|
197
|
+
owner_id?: string | null;
|
|
198
|
+
// #503 — network the upload is attributed to. The key is OMITTED (not
|
|
199
|
+
// written as null) when there is no attribution, so "absent" and
|
|
200
|
+
// "unattributed" are the same on-disk shape and legacy entries written
|
|
201
|
+
// before #503 are indistinguishable from new unattributed ones.
|
|
202
|
+
network_id?: string;
|
|
203
|
+
// 私信文件:上传时声明 `?purpose=dm`(App 的私信输入框这么传)。第一次用途就是私信 ——
|
|
204
|
+
// 只有上传者、收到/发出过带它的私信的人和管理员能下载(server.ts authorizeFileDownload)。
|
|
205
|
+
// 不是私信的文件不写这个键;以后被转进私信也不会补写,原来谁能看还是谁能看。
|
|
206
|
+
scope?: typeof DM_FILE_SCOPE;
|
|
120
207
|
uploaded_at: string; // ISO 8601
|
|
121
208
|
};
|
|
122
209
|
|
|
210
|
+
export const DM_FILE_SCOPE = "dm";
|
|
211
|
+
|
|
123
212
|
/** Path to the index entry file for a given file_id. Lives in
|
|
124
213
|
* `<uploadsRoot>/.index/<file_id>.json` so /api/files/:file_id can do
|
|
125
214
|
* an O(1) lookup without scanning every date bucket. */
|
|
@@ -135,10 +224,18 @@ export function indexEntryPath(fileId: string, opts: { uploadsRoot?: string } =
|
|
|
135
224
|
export function validateIndexEntry(entry: unknown): entry is UploadIndexEntry {
|
|
136
225
|
if (!entry || typeof entry !== "object") return false;
|
|
137
226
|
const e: any = entry;
|
|
227
|
+
// #503 — if the network_id key is present it must be a non-empty string.
|
|
228
|
+
// An absent key is valid (legacy entries + unattributed uploads); that
|
|
229
|
+
// keeps this in sync with the writer, which omits the key entirely
|
|
230
|
+
// rather than writing null. owner_id is deliberately NOT constrained
|
|
231
|
+
// here — existing entries legitimately carry owner_id=null.
|
|
232
|
+
if ("network_id" in e && !(typeof e.network_id === "string" && e.network_id.length > 0)) return false;
|
|
233
|
+
// 未知的 scope 值不当成「没有 scope」放行(那等于把私信文件退回全网可见):整条判坏,下载 404。
|
|
234
|
+
if ("scope" in e && e.scope !== DM_FILE_SCOPE) return false;
|
|
138
235
|
return (
|
|
139
236
|
typeof e.file_id === "string" && FILE_ID_REGEX.test(e.file_id) &&
|
|
140
237
|
typeof e.date_bucket === "string" && /^\d{4}-\d{2}-\d{2}$/.test(e.date_bucket) &&
|
|
141
|
-
|
|
238
|
+
isValidExtToken(e.ext) &&
|
|
142
239
|
typeof e.size === "number" && e.size >= 0 && e.size <= MAX_UPLOAD_BYTES
|
|
143
240
|
);
|
|
144
241
|
}
|
|
@@ -241,6 +338,42 @@ export type TaskAttachment = {
|
|
|
241
338
|
size?: number;
|
|
242
339
|
};
|
|
243
340
|
|
|
341
|
+
/**
|
|
342
|
+
* #222 cross-host attachment safety — strip `path` from meta.attachments
|
|
343
|
+
* entries that ALSO carry a `file_id`. Reason: the hub's /api/upload
|
|
344
|
+
* returns `{file_id, path}` where `path` is a hub-machine-local
|
|
345
|
+
* absolute path. Senders sometimes echo `path` back into meta.attachments.
|
|
346
|
+
* When the receiving agent runs on a different host (Vincent 2026-06-30
|
|
347
|
+
* a partner-team host case), that path string is meaningless. agent-node's
|
|
348
|
+
* fetch-attachment.ts will fetch via `file_id` regardless, but leaving
|
|
349
|
+
* the stale `path` in the JSON misleads any tooling that reads it.
|
|
350
|
+
*
|
|
351
|
+
* CRITICAL — conditional, not unconditional (通信龙 PR #222 pre-review
|
|
352
|
+
* nit): feishu-bridge currently writes `/work/feishu-attachments/<conn>/
|
|
353
|
+
* <chat>/` directly and ships path-only attachments (NO file_id). If we
|
|
354
|
+
* strip path unconditionally those break too. Only strip when file_id
|
|
355
|
+
* is present (the "safe to drop" signal). Single-host feishu fallback
|
|
356
|
+
* preserved.
|
|
357
|
+
*
|
|
358
|
+
* Shared by tools.ts (MCP send_task) and index.ts (REST /api/task) so
|
|
359
|
+
* both transports apply the same sanitization to meta.
|
|
360
|
+
*/
|
|
361
|
+
export function stripHostLocalPathsForCrossHostSafe(meta: any): any {
|
|
362
|
+
if (!meta || typeof meta !== "object") return meta;
|
|
363
|
+
if (!Array.isArray((meta as any).attachments)) return meta;
|
|
364
|
+
let mutated = false;
|
|
365
|
+
const sanitized = (meta as any).attachments.map((a: any) => {
|
|
366
|
+
if (a && typeof a === "object" && typeof a.file_id === "string" && a.file_id && typeof a.path === "string") {
|
|
367
|
+
mutated = true;
|
|
368
|
+
const { path: _stripped, ...rest } = a;
|
|
369
|
+
return rest;
|
|
370
|
+
}
|
|
371
|
+
return a;
|
|
372
|
+
});
|
|
373
|
+
if (!mutated) return meta;
|
|
374
|
+
return { ...meta, attachments: sanitized };
|
|
375
|
+
}
|
|
376
|
+
|
|
244
377
|
/** Light validator usable from the REST handler. Returns null on success or an error message string. */
|
|
245
378
|
export function validateAttachments(input: unknown): { ok: true; attachments: TaskAttachment[] } | { ok: false; error: string } {
|
|
246
379
|
if (input === undefined || input === null) return { ok: true, attachments: [] };
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { expect, test } from "bun:test";
|
|
2
|
+
import { register, login, createNetworkTokenForNode, addNetworkMember } from "./auth.js";
|
|
3
|
+
import { db } from "./db.js";
|
|
4
|
+
|
|
5
|
+
// One sequential HTTP scenario: fail a prerequisite before running the next layer.
|
|
6
|
+
// Docker supplies an isolated DB; never import this against a production DB.
|
|
7
|
+
test("human avatar: auth → save/read/login → member visibility → isolation/rejection → clear", async () => {
|
|
8
|
+
const a = register("avatar_alice", "AvatarPassw0rd!");
|
|
9
|
+
const b = register("avatar_bob", "AvatarPassw0rd!");
|
|
10
|
+
const stranger = register("avatar_stranger", "AvatarPassw0rd!");
|
|
11
|
+
expect(a.ok && b.ok && stranger.ok).toBe(true);
|
|
12
|
+
expect(addNetworkMember(a.network_id!, b.user!.user_id, "member").ok).toBe(true);
|
|
13
|
+
const node = createNetworkTokenForNode(a.user!.user_id, a.network_id!, "avatar_alice", "avatar_node");
|
|
14
|
+
expect(node.ok).toBe(true);
|
|
15
|
+
const { bootServer } = await import("./server.js");
|
|
16
|
+
const hub = bootServer({ port: 0, hostname: "127.0.0.1" });
|
|
17
|
+
const base = `http://127.0.0.1:${hub.port}`;
|
|
18
|
+
const call = async (token: string, method: string, path: string, body?: unknown) => {
|
|
19
|
+
const res = await fetch(base + path, { method,
|
|
20
|
+
headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
|
|
21
|
+
body: body === undefined ? undefined : JSON.stringify(body) });
|
|
22
|
+
return { status: res.status, body: await res.json() as any };
|
|
23
|
+
};
|
|
24
|
+
const put = (token: string, body: unknown) => call(token, "PUT", "/api/auth/me/avatar", body);
|
|
25
|
+
const me = (token: string) => call(token, "GET", "/api/auth/me");
|
|
26
|
+
try {
|
|
27
|
+
expect((await me(a.token!)).status).toBe(200);
|
|
28
|
+
expect((await me(a.token!)).body.user.avatar_url).toBeNull();
|
|
29
|
+
expect((await put("invalid", { avatar_url: null })).status).toBe(401);
|
|
30
|
+
expect((await put(node.token!, { avatar_url: null })).status).toBe(403);
|
|
31
|
+
|
|
32
|
+
const avatar = "/avatars/avatar-03.webp";
|
|
33
|
+
const saved = await put(a.token!, { avatar_url: avatar });
|
|
34
|
+
expect(saved.status).toBe(200);
|
|
35
|
+
expect(saved.body).toEqual({ ok: true, user_id: a.user!.user_id, avatar_url: avatar });
|
|
36
|
+
expect((await me(a.token!)).body.user.avatar_url).toBe(avatar);
|
|
37
|
+
const secondDevice = login("avatar_alice", "AvatarPassw0rd!");
|
|
38
|
+
expect(secondDevice.ok).toBe(true);
|
|
39
|
+
expect(secondDevice.user!.avatar_url).toBe(avatar);
|
|
40
|
+
expect((await me(secondDevice.token!)).body.user.avatar_url).toBe(avatar);
|
|
41
|
+
// An ordinary profile edit must preserve and return the saved avatar.
|
|
42
|
+
const profile = await call(a.token!, "PUT", "/api/auth/me", { display_name: "Alice" });
|
|
43
|
+
expect(profile.status).toBe(200);
|
|
44
|
+
expect(profile.body.user.avatar_url).toBe(avatar);
|
|
45
|
+
const people = await call(b.token!, "GET", `/api/networks/${a.network_id}/humans`);
|
|
46
|
+
expect(people.status).toBe(200);
|
|
47
|
+
expect(people.body.humans.find((u: any) => u.user_id === a.user!.user_id).avatar_url).toBe(avatar);
|
|
48
|
+
expect((await call(stranger.token!, "GET", `/api/networks/${a.network_id}/humans`)).status).toBe(403);
|
|
49
|
+
expect((await me(b.token!)).body.user.avatar_url).toBeNull();
|
|
50
|
+
|
|
51
|
+
for (const body of [null, [], {}, { avatar_url: avatar, user_id: b.user!.user_id },
|
|
52
|
+
...[123, {}, "javascript:alert(1)", "file:///tmp/photo.png", "data:image/png;base64,AAAA",
|
|
53
|
+
"//evil.example/a.png", "/avatars/../x.png", "https://user:secret@example.com/x.png", "x".repeat(3000)]
|
|
54
|
+
.map((avatar_url) => ({ avatar_url }))]) {
|
|
55
|
+
expect((await put(a.token!, body)).status).toBe(400);
|
|
56
|
+
expect((await me(a.token!)).body.user.avatar_url).toBe(avatar);
|
|
57
|
+
}
|
|
58
|
+
const malformed = await fetch(base + "/api/auth/me/avatar", { method: "PUT",
|
|
59
|
+
headers: { Authorization: `Bearer ${a.token}`, "Content-Type": "application/json" }, body: "{" });
|
|
60
|
+
expect(malformed.status).toBe(400);
|
|
61
|
+
expect((await put(node.token!, { avatar_url: "/avatars/avatar-09.webp" })).status).toBe(403);
|
|
62
|
+
expect((await me(a.token!)).body.user.avatar_url).toBe(avatar);
|
|
63
|
+
expect((await me(b.token!)).body.user.avatar_url).toBeNull();
|
|
64
|
+
expect(db.get<any>("SELECT avatar_url FROM nodes WHERE node_id = ?1", "avatar_node")?.avatar_url ?? null).toBeNull();
|
|
65
|
+
|
|
66
|
+
const remote = "https://example.invalid/photo.png";
|
|
67
|
+
expect((await put(a.token!, { avatar_url: remote })).status).toBe(200);
|
|
68
|
+
expect((await me(a.token!)).body.user.avatar_url).toBe(remote);
|
|
69
|
+
expect((await put(a.token!, { avatar_url: null })).status).toBe(200);
|
|
70
|
+
expect((await me(secondDevice.token!)).body.user.avatar_url).toBeNull();
|
|
71
|
+
expect((await put(a.token!, { avatar_url: avatar })).status).toBe(200);
|
|
72
|
+
expect((await put(a.token!, { avatar_url: " " })).body.avatar_url).toBeNull();
|
|
73
|
+
} finally { hub.stop(true); }
|
|
74
|
+
}, 30_000);
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
// #725-adjacent? No: Hub 专用账号头像上传(通信Mac马 交付单)。
|
|
2
|
+
//
|
|
3
|
+
// 头像不是普通附件:它必须 PNG、边长 ≤512、≤8 MiB,且只能由本人用自己的
|
|
4
|
+
// **用户令牌**写入;读取按「人类资料可见性」(本人或共享网络的合法成员)判定,
|
|
5
|
+
// 不借用 /api/files 的附件 ACL(那是按网络/会话/DM 作用域判的,语义不同)。
|
|
6
|
+
//
|
|
7
|
+
// 这个模块只做纯校验,便于单测与复用;HTTP 与落库在 server.ts。
|
|
8
|
+
import { inflateSync } from "node:zlib";
|
|
9
|
+
|
|
10
|
+
// 校验强度:结构(签名/chunk/CRC)+ 真实解码(IDAT 解压且扫描行长度与 IHDR 相符)。
|
|
11
|
+
|
|
12
|
+
export const MAX_AVATAR_BYTES = 8 * 1024 * 1024;
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* #2054 —— 单个 Hub 的头像总存储上界。公开注册可以持续创建账号,per-user 单条
|
|
16
|
+
* 上限(每人 1 条 × 8 MiB)挡不住轮换账号把主库撑大,所以再加一道总量边界。
|
|
17
|
+
* 超限时上传返回 503 `avatar_storage_full`;不回收/删除任何既有用户的头像。
|
|
18
|
+
*/
|
|
19
|
+
export const MAX_AVATAR_STORAGE_BYTES = 1024 * 1024 * 1024;
|
|
20
|
+
/** 客户端会把图重编码到最长边 512;服务端独立复核这条上限。 */
|
|
21
|
+
export const MAX_AVATAR_EDGE = 512;
|
|
22
|
+
/** version 只允许 URL 安全字符,长度有界(避免拼路径时引入 `.`、`/`)。 */
|
|
23
|
+
export const AVATAR_VERSION_RE = /^[A-Za-z0-9_-]{1,128}$/;
|
|
24
|
+
export const AVATAR_FIELD = "file";
|
|
25
|
+
|
|
26
|
+
const PNG_SIGNATURE = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
|
|
27
|
+
|
|
28
|
+
export type AvatarImageCheck =
|
|
29
|
+
| { ok: true; width: number; height: number }
|
|
30
|
+
| { ok: false; reason: "empty" | "too_large" | "not_png" | "truncated" | "bad_dimensions" | "too_big" | "bad_crc" | "bad_image" | "interlaced_unsupported" };
|
|
31
|
+
|
|
32
|
+
const CHANNELS: Record<number, number> = { 0: 1, 2: 3, 3: 1, 4: 2, 6: 4 };
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
/** 标准 CRC-32(PNG 每个 chunk 的尾部)。表只建一次。 */
|
|
36
|
+
const CRC_TABLE = (() => {
|
|
37
|
+
const table = new Uint32Array(256);
|
|
38
|
+
for (let n = 0; n < 256; n++) {
|
|
39
|
+
let c = n;
|
|
40
|
+
for (let k = 0; k < 8; k++) c = c & 1 ? 0xedb88320 ^ (c >>> 1) : c >>> 1;
|
|
41
|
+
table[n] = c >>> 0;
|
|
42
|
+
}
|
|
43
|
+
return table;
|
|
44
|
+
})();
|
|
45
|
+
|
|
46
|
+
function crc32(bytes: Uint8Array): number {
|
|
47
|
+
let c = 0xffffffff;
|
|
48
|
+
for (let i = 0; i < bytes.length; i++) c = CRC_TABLE[(c ^ bytes[i]) & 0xff] ^ (c >>> 8);
|
|
49
|
+
return (c ^ 0xffffffff) >>> 0;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function be32(bytes: Uint8Array, offset: number): number {
|
|
53
|
+
return ((bytes[offset] << 24) | (bytes[offset + 1] << 16) | (bytes[offset + 2] << 8) | bytes[offset + 3]) >>> 0;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* PNG 结构校验:签名 + 逐个 chunk 的 CRC + 必须有 IDAT 且以 IEND 结尾。
|
|
58
|
+
*
|
|
59
|
+
* 只信任「结构完整」而不是「声明了什么」:截断的 33/40 字节、零填充的伪图
|
|
60
|
+
* (IHDR 对但 CRC 与 IDAT 缺失)都会被拒;合法用户因此不能把已有头像
|
|
61
|
+
* 覆盖成一张显示不出来的图。
|
|
62
|
+
*/
|
|
63
|
+
export function inspectAvatarImage(input: Uint8Array): AvatarImageCheck {
|
|
64
|
+
if (input.byteLength === 0) return { ok: false, reason: "empty" };
|
|
65
|
+
if (input.byteLength > MAX_AVATAR_BYTES) return { ok: false, reason: "too_large" };
|
|
66
|
+
for (let i = 0; i < PNG_SIGNATURE.length && i < input.byteLength; i++) {
|
|
67
|
+
if (input[i] !== PNG_SIGNATURE[i]) return { ok: false, reason: "not_png" };
|
|
68
|
+
}
|
|
69
|
+
if (input.byteLength < 45) return { ok: false, reason: "truncated" }; // 签名 + IHDR(25) + 最小 IEND(12)
|
|
70
|
+
|
|
71
|
+
let pos = 8;
|
|
72
|
+
let width = 0;
|
|
73
|
+
let height = 0;
|
|
74
|
+
let sawIHDR = false;
|
|
75
|
+
let idatChunks = 0;
|
|
76
|
+
let sawIEND = false;
|
|
77
|
+
let sawPLTE = false;
|
|
78
|
+
let bitDepth = 0;
|
|
79
|
+
let colorType = 0;
|
|
80
|
+
const idat: Uint8Array[] = [];
|
|
81
|
+
|
|
82
|
+
while (pos + 12 <= input.byteLength) {
|
|
83
|
+
const length = be32(input, pos);
|
|
84
|
+
const type = String.fromCharCode(input[pos + 4], input[pos + 5], input[pos + 6], input[pos + 7]);
|
|
85
|
+
const dataStart = pos + 8;
|
|
86
|
+
const dataEnd = dataStart + length;
|
|
87
|
+
const crcEnd = dataEnd + 4;
|
|
88
|
+
if (crcEnd > input.byteLength) return { ok: false, reason: "truncated" };
|
|
89
|
+
if (!sawIHDR && type !== "IHDR") return { ok: false, reason: "not_png" };
|
|
90
|
+
if ((crc32(input.subarray(pos + 4, dataEnd)) >>> 0) !== be32(input, dataEnd)) {
|
|
91
|
+
return { ok: false, reason: "bad_crc" };
|
|
92
|
+
}
|
|
93
|
+
if (type === "IHDR") {
|
|
94
|
+
if (sawIHDR || length !== 13) return { ok: false, reason: "not_png" };
|
|
95
|
+
width = be32(input, dataStart);
|
|
96
|
+
height = be32(input, dataStart + 4);
|
|
97
|
+
bitDepth = input[dataStart + 8];
|
|
98
|
+
colorType = input[dataStart + 9];
|
|
99
|
+
const compression = input[dataStart + 10];
|
|
100
|
+
const filter = input[dataStart + 11];
|
|
101
|
+
const interlace = input[dataStart + 12];
|
|
102
|
+
// 只接受规范的 IHDR 取值组合;非法组合的图多数解码器也会拒绝。
|
|
103
|
+
const legalDepth: Record<number, number[]> = { 0: [1, 2, 4, 8, 16], 2: [8, 16], 3: [1, 2, 4, 8], 4: [8, 16], 6: [8, 16] };
|
|
104
|
+
if (!legalDepth[colorType]?.includes(bitDepth)) return { ok: false, reason: "not_png" };
|
|
105
|
+
if (compression !== 0 || filter !== 0) return { ok: false, reason: "not_png" };
|
|
106
|
+
// 本实现只校验逐行(interlace=0)扫描布局:Adam7(=1) 的布局不同,其余取值(2..255)
|
|
107
|
+
// 在 PNG 规范里根本不合法。一律明确拒收,而不是错算长度后放行。
|
|
108
|
+
if (interlace !== 0) return { ok: false, reason: "interlaced_unsupported" };
|
|
109
|
+
if (width === 0 || height === 0) return { ok: false, reason: "bad_dimensions" };
|
|
110
|
+
if (width > MAX_AVATAR_EDGE || height > MAX_AVATAR_EDGE) return { ok: false, reason: "too_big" };
|
|
111
|
+
sawIHDR = true;
|
|
112
|
+
} else if (type === "PLTE") {
|
|
113
|
+
if (length === 0 || length % 3 !== 0) return { ok: false, reason: "not_png" };
|
|
114
|
+
sawPLTE = true;
|
|
115
|
+
} else if (type === "IDAT") {
|
|
116
|
+
idatChunks++;
|
|
117
|
+
idat.push(input.subarray(dataStart, dataEnd));
|
|
118
|
+
} else if (type === "IEND") {
|
|
119
|
+
if (length !== 0) return { ok: false, reason: "not_png" };
|
|
120
|
+
if (crcEnd !== input.byteLength) return { ok: false, reason: "not_png" };
|
|
121
|
+
sawIEND = true;
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
pos = crcEnd;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
if (!sawIHDR || !sawIEND) return { ok: false, reason: "truncated" };
|
|
128
|
+
if (idatChunks === 0) return { ok: false, reason: "not_png" };
|
|
129
|
+
// 调色板图必须带 PLTE,否则解码器无从取色。
|
|
130
|
+
if (colorType === 3 && !sawPLTE) return { ok: false, reason: "not_png" };
|
|
131
|
+
// CRC 只证明「容器没坏」,不证明 IDAT 里是图像数据:真解一次 zlib,并核对
|
|
132
|
+
// 解压后长度正好等于 IHDR 声明的扫描行总长(每行 1 字节 filter + 像素字节)。
|
|
133
|
+
const bytesPerRow = Math.ceil((width * (CHANNELS[colorType] ?? 0) * bitDepth) / 8);
|
|
134
|
+
const expected = height * (1 + bytesPerRow);
|
|
135
|
+
let raw: Uint8Array;
|
|
136
|
+
try {
|
|
137
|
+
const merged = Buffer.concat(idat.map(part => Buffer.from(part)));
|
|
138
|
+
raw = new Uint8Array(inflateSync(merged, { maxOutputLength: expected + 1024 }));
|
|
139
|
+
} catch {
|
|
140
|
+
return { ok: false, reason: "bad_image" };
|
|
141
|
+
}
|
|
142
|
+
if (raw.byteLength !== expected) return { ok: false, reason: "bad_image" };
|
|
143
|
+
for (let row = 0; row < height; row++) {
|
|
144
|
+
if (raw[row * (1 + bytesPerRow)] > 4) return { ok: false, reason: "bad_image" }; // 过滤器 0..4
|
|
145
|
+
}
|
|
146
|
+
return { ok: true, width, height };
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
export function isValidAvatarVersion(value: unknown): value is string {
|
|
150
|
+
return typeof value === "string" && AVATAR_VERSION_RE.test(value);
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
export function avatarUrl(userId: string, version: string): string {
|
|
154
|
+
return `/api/users/${encodeURIComponent(userId)}/avatar/${version}.png`;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
/** 只接受 multipart 里的单张图;多余字段一律拒绝,避免「顺手塞个 filename 覆盖路径」。 */
|
|
158
|
+
export function isMultipart(contentType: string | null): boolean {
|
|
159
|
+
return !!contentType && /^multipart\/form-data\b/i.test(contentType);
|
|
160
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { expect, test } from "bun:test";
|
|
2
|
+
import { Database } from "bun:sqlite";
|
|
3
|
+
|
|
4
|
+
test("existing users survive additive avatar migration and next process preserves it", async () => {
|
|
5
|
+
const path = process.env.COMMHUB_DB!;
|
|
6
|
+
expect(typeof path).toBe("string");
|
|
7
|
+
const old = new Database(path);
|
|
8
|
+
old.exec(`CREATE TABLE users (
|
|
9
|
+
user_id TEXT PRIMARY KEY, username TEXT UNIQUE NOT NULL, password_hash TEXT NOT NULL,
|
|
10
|
+
email TEXT, display_name TEXT, role TEXT DEFAULT 'user',
|
|
11
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
12
|
+
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
|
13
|
+
); INSERT INTO users (user_id, username, password_hash) VALUES ('old_user', 'old_user', 'test-only-hash');`);
|
|
14
|
+
old.close();
|
|
15
|
+
const { db } = await import("./db.js");
|
|
16
|
+
expect(db.get<any>("SELECT avatar_url, password_hash FROM users WHERE user_id = ?1", "old_user"))
|
|
17
|
+
.toEqual({ avatar_url: null, password_hash: "test-only-hash" });
|
|
18
|
+
db.run("UPDATE users SET avatar_url = ?1 WHERE user_id = ?2", ["/avatars/avatar-03.webp", "old_user"]);
|
|
19
|
+
const child = Bun.spawn([process.execPath, "-e", `
|
|
20
|
+
const { db } = await import('./src/db.ts');
|
|
21
|
+
const row = db.get('SELECT avatar_url, password_hash FROM users WHERE user_id = ?1', 'old_user');
|
|
22
|
+
if (row.avatar_url !== '/avatars/avatar-03.webp' || row.password_hash !== 'test-only-hash') process.exit(1);
|
|
23
|
+
`], { cwd: new URL("..", import.meta.url).pathname, env: process.env, stdout: "pipe", stderr: "pipe" });
|
|
24
|
+
expect(await child.exited).toBe(0);
|
|
25
|
+
});
|