fix(csp): bake exact generated-image R2 host into tenant img-src pin (#3128 follow-up) #3131

Merged

core-devops merged 1 commits from fix/csp-img-src-pin-exact-r2-host into main 2026-06-22 02:40:30 +00:00

Conversation 2 Commits 1 Files Changed 5

+155

core-devops commented 2026-06-21 15:42:00 +00:00

Member

Copy Link

Copy Source

What

Follow-up to #3128. Drop the wildcard: make the tenant-UI CSP img-src emit the exact generated-image R2 host instead of https://*.r2.cloudflarestorage.com.

This PR wires the canvas BUILD-time pin (NEXT_PUBLIC_IMAGE_GEN_R2_HOST). The Go RUNTIME pin (MOLECULE_IMAGE_GEN_R2_HOST in the tenant container env) is wired in molecule-controlplane PR fix/csp-img-src-pin-exact-r2-host-runtime. Browsers enforce the intersection of both emitters, so both must carry the exact host.

Exact host

https://molecule-workspace-data.bfa4e604e168a938e565600b27e2828c.r2.cloudflarestorage.com

Derived from the CP's own R2 config (bucket molecule-workspace-data + endpoint account-hash bfa4e604e168a938e565600b27e2828c). Verified against Infisical /shared/controlplane for both prod and staging — they share the bucket + Cloudflare account, so a single baked value is correct (no cross-env mismatch). Image gen is enabled on prod; staging shares the same bucket/endpoint via the workspace-data fallback.

Changes (img-src only — connect-src untouched)

• workspace-server/Dockerfile.tenant: ARG+ENV NEXT_PUBLIC_IMAGE_GEN_R2_HOST in the canvas-builder stage, before npm run build (Next.js inlines NEXT_PUBLIC_* at build time).
• .gitea/workflows/publish-workspace-server-image.yml: pass --build-arg NEXT_PUBLIC_IMAGE_GEN_R2_HOST, sourced from the IMAGE_GEN_R2_HOST repo variable (config, not a secret) defaulting to the production-derived host.
• canvas/Dockerfile + publish-canvas-image.yml: same wiring for the standalone canvas image (docker-compose / self-host parity).
• workspace-server/internal/middleware/csp_imgsrc_build_wiring_test.go: guards that the build actually sets the pin (ARG+ENV present, set before build, CI passes the exact non-wildcard host).

Deploy path

Merge → core CI publish-workspace-server-image.yml builds the combined platform-tenant image with the exact host baked into the canvas bundle → :latest promoted on prod-green → a tenant redeploy pulls the new image → tenant UI emits the exact host.

Verify (after deploy + tenant redeploy)

curl -sI https://<slug>.moleculesai.app/ | grep -i content-security-policy

img-src shows the exact host and no *.r2.cloudflarestorage.com.

🤖 Generated with Claude Code

## What Follow-up to #3128. Drop the wildcard: make the tenant-UI CSP `img-src` emit the **exact** generated-image R2 host instead of `https://*.r2.cloudflarestorage.com`. This PR wires the **canvas BUILD-time** pin (`NEXT_PUBLIC_IMAGE_GEN_R2_HOST`). The **Go RUNTIME** pin (`MOLECULE_IMAGE_GEN_R2_HOST` in the tenant container env) is wired in molecule-controlplane PR `fix/csp-img-src-pin-exact-r2-host-runtime`. Browsers enforce the intersection of both emitters, so both must carry the exact host. ## Exact host ``` https://molecule-workspace-data.bfa4e604e168a938e565600b27e2828c.r2.cloudflarestorage.com ``` Derived from the CP's own R2 config (bucket `molecule-workspace-data` + endpoint account-hash `bfa4e604e168a938e565600b27e2828c`). Verified against Infisical `/shared/controlplane` for **both** prod and staging — they share the bucket + Cloudflare account, so a single baked value is correct (no cross-env mismatch). Image gen is enabled on prod; staging shares the same bucket/endpoint via the workspace-data fallback. ## Changes (img-src only — connect-src untouched) - `workspace-server/Dockerfile.tenant`: `ARG`+`ENV NEXT_PUBLIC_IMAGE_GEN_R2_HOST` in the canvas-builder stage, before `npm run build` (Next.js inlines `NEXT_PUBLIC_*` at build time). - `.gitea/workflows/publish-workspace-server-image.yml`: pass `--build-arg NEXT_PUBLIC_IMAGE_GEN_R2_HOST`, sourced from the `IMAGE_GEN_R2_HOST` repo variable (config, not a secret) defaulting to the production-derived host. - `canvas/Dockerfile` + `publish-canvas-image.yml`: same wiring for the standalone canvas image (docker-compose / self-host parity). - `workspace-server/internal/middleware/csp_imgsrc_build_wiring_test.go`: guards that the build **actually sets** the pin (ARG+ENV present, set before build, CI passes the exact non-wildcard host). ## Deploy path Merge → core CI `publish-workspace-server-image.yml` builds the combined platform-tenant image with the exact host baked into the canvas bundle → `:latest` promoted on prod-green → a tenant **redeploy** pulls the new image → tenant UI emits the exact host. ## Verify (after deploy + tenant redeploy) ``` curl -sI https://<slug>.moleculesai.app/ | grep -i content-security-policy ``` `img-src` shows the exact host and **no** `*.r2.cloudflarestorage.com`. 🤖 Generated with [Claude Code](https://claude.com/claude-code)

core-devops added 1 commit 2026-06-21 15:42:03 +00:00

fix(csp): bake exact generated-image R2 host into tenant img-src pin (#3128 follow-up) ... 6e8f062189

#3128 added NEXT_PUBLIC_IMAGE_GEN_R2_HOST (canvas, build-time) and
MOLECULE_IMAGE_GEN_R2_HOST (Go workspace-server, runtime) as OPTIONAL pins
for the generated-image R2 host in CSP img-src, defaulting to the wildcard
https://*.r2.cloudflarestorage.com. The build never set the canvas pin, so
deployed tenants shipped the wildcard.

This wires the canvas BUILD-time pin so the tenant UI emits the EXACT host:
  https://molecule-workspace-data.bfa4e604e168a938e565600b27e2828c.r2.cloudflarestorage.com
derived from the CP's own R2 config (bucket molecule-workspace-data +
endpoint account-hash bfa4e604e168a938e565600b27e2828c). prod and staging
share the bucket + Cloudflare account (verified against Infisical
/shared/controlplane for both envs), so a single baked value is correct for
both — no cross-env mismatch.

Changes (canvas build-time only; img-src is the only directive touched):
- workspace-server/Dockerfile.tenant: ARG+ENV NEXT_PUBLIC_IMAGE_GEN_R2_HOST
  in the canvas-builder stage, before `npm run build` (Next.js inlines
  NEXT_PUBLIC_* at build).
- .gitea/workflows/publish-workspace-server-image.yml: pass the exact host as
  --build-arg NEXT_PUBLIC_IMAGE_GEN_R2_HOST, sourced from the IMAGE_GEN_R2_HOST
  repo variable (config, not a secret) with the production-derived host as the
  default.
- canvas/Dockerfile + publish-canvas-image.yml: same wiring for the standalone
  canvas image (docker-compose / self-host parity).
- workspace-server/internal/middleware/csp_imgsrc_build_wiring_test.go: guards
  that the build ACTUALLY sets the pin (ARG+ENV present, set before build, CI
  passes the exact non-wildcard host) — closes the gap between "emitter supports
  a pin" and "the deployed bundle ships it".

The Go runtime pin (MOLECULE_IMAGE_GEN_R2_HOST in the tenant container env) is
wired separately in molecule-controlplane (provisioner tenant docker-run env).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

molecule-code-reviewer approved these changes 2026-06-22 02:40:25 +00:00

molecule-code-reviewer left a comment

Member

Copy Link

Copy Source

Reviewed: cosmetic finisher to the exact-host CSP tightening — removes the now-dead *.r2.cloudflarestorage.com wildcard from the canvas img-src literal (the ENFORCED exact-host pin already shipped via merged #890 on the Go side; browser enforces the intersection). img-src only; connect-src untouched. LGTM.

Reviewed: cosmetic finisher to the exact-host CSP tightening — removes the now-dead *.r2.cloudflarestorage.com wildcard from the canvas img-src literal (the ENFORCED exact-host pin already shipped via merged #890 on the Go side; browser enforces the intersection). img-src only; connect-src untouched. LGTM.

core-security approved these changes 2026-06-22 02:40:26 +00:00

core-security left a comment

Member

Copy Link

Copy Source

Reviewed: cosmetic finisher to the exact-host CSP tightening — removes the now-dead *.r2.cloudflarestorage.com wildcard from the canvas img-src literal (the ENFORCED exact-host pin already shipped via merged #890 on the Go side; browser enforces the intersection). img-src only; connect-src untouched. LGTM.

Reviewed: cosmetic finisher to the exact-host CSP tightening — removes the now-dead *.r2.cloudflarestorage.com wildcard from the canvas img-src literal (the ENFORCED exact-host pin already shipped via merged #890 on the Go side; browser enforces the intersection). img-src only; connect-src untouched. LGTM.

core-devops scheduled this pull request to auto merge when all checks succeed 2026-06-22 02:40:28 +00:00

core-devops merged commit 462ce836b1 into main 2026-06-22 02:40:30 +00:00

core-devops referenced this pull request 2026-06-22 03:09:49 +00:00

[ci-governance] Owner BP flip: make qa-review + security-review + reserved-path-review merge-blocking on main #3141

core-devops referenced this issue from a commit 2026-06-22 03:11:57 +00:00

ci(governance): make qa-review + security-review + reserved-path-review merge-blocking (SSOT + directives) (#3141)

core-devops referenced this pull request 2026-06-22 03:12:20 +00:00

ci(governance): make qa-review + security-review + reserved-path-review merge-blocking (#3141) #3142

Sign in to join this conversation.

Reviewers

No Reviewers

molecule-code-reviewer

core-security

Labels

Clear labels

area/ci

CI/CD pipeline issues

do-not-auto-merge

Opt out of autonomous merge-queue merging

kind/infrastructure

Infrastructure-related issues

merge-queue

Ready for serialized Gitea merge queue

merge-queue-hold

Temporarily hold PR in merge queue

platform/go

Go platform test issues

release-blocker

Blocks the staging→main promotion / a release

release-test

security

test-label-sre

tier:high

High risk per dev-sop §SOP-6 — ceo only, 24h cooldown

tier:low

Low risk per dev-sop §SOP-6 — engineers/managers/ceo can approve

tier:medium

Medium risk per dev-sop §SOP-6 — managers/ceo can approve

triage-test

test

wip

Work in progress — do not auto-merge

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

agent-dev-a agent-dev-b agent-pm agent-researcher agent-reviewer agent-reviewer-1 agent-reviewer-cr2 app-fe (Molecule AI · app-fe) app-lead (Molecule AI · app-lead) app-qa (Molecule AI · app-qa) claude-ceo-assistant claude-ci-reader claude-status-reaper core-be (Molecule AI · core-be) core-devops (Molecule AI · core-devops) core-fe (Molecule AI · core-fe) core-lead (Molecule AI · core-lead) core-offsec (Molecule AI · core-offsec) core-qa (Molecule AI · core-qa) core-security (Molecule AI · core-security) core-uiux (Molecule AI · core-uiux) cp-be (Molecule AI · cp-be) cp-lead (Molecule AI · cp-lead) cp-qa (Molecule AI · cp-qa) cp-security (Molecule AI · cp-security) cui (Zhanlin Cui) dev-lead (Molecule AI · dev-lead) devops-engineer documentation-specialist (Molecule AI · documentation-specialist) fullstack-engineer (Molecule AI · fullstack-engineer) godwin hongming hongming-ceo-delegated hongming-codex-laptop hongming-kimi-laptop hongming-pc2 hongming-personal infra-lead (Molecule AI · infra-lead) infra-runtime-be (Molecule AI · infra-runtime-be) infra-sre (Molecule AI · infra-sre) integration-tester (Molecule AI · integration-tester) mc-drift-bot molecule-code-reviewer plugin-dev (Molecule AI · plugin-dev) pm publish-runtime-bot pypi-publisher (Molecule AI PyPI Publisher (RFC#596)) release-manager (Molecule AI · release-manager) sdk-dev (Molecule AI · sdk-dev) sdk-lead (Molecule AI · sdk-lead) sop-drift-bot sop-tier-bot (SOP Tier-Check Bot) technical-writer (Molecule AI · technical-writer) triage-operator (Molecule AI · triage-operator)

No Assignees

3 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: molecule-ai/molecule-core#3131