fix(orgtoken): capture WorkOS user_id in created_by for session-minted tokens #3014

Merged

devops-engineer merged 1 commits from fix/orgtoken-session-userid into main 2026-06-19 22:15:07 +00:00

Conversation 3 Commits 1 Files Changed 7

+81 -58

agent-dev-a commented 2026-06-17 18:02:05 +00:00

Member

Copy Link

Copy Source

Closes KI-004 item 5 (WorkOS user_id provenance for session-minted org API tokens).

VerifiedCPSession already parsed user_id from /cp/auth/tenant-member; this change threads it through the session cache and Gin context so orgTokenActor can record session:<user_id> as created_by instead of an opaque session hash.

Changes

• internal/middleware/session_auth.go: VerifiedCPSession now returns (valid, presented, userID); sessionCache stores the userID.
• internal/middleware/wsauth_middleware.go: AdminAuth and WorkspaceAuth set cp_session_user_id.
• internal/handlers/discovery.go: updated caller to the new triple return.
• internal/handlers/org_tokens.go: orgTokenActor prefers cp_session_user_id for session callers.
• Tests updated/added for the new behavior.

Test plan

• go test ./internal/middleware ./internal/handlers -count=1 passes locally.
• New assertions verify cp_session_user_id is set and used in org-token INSERT.

SOP checklist

• Comprehensive testing performed (comprehensive-testing): unit tests added/updated; middleware + handlers test suites pass
• Local-postgres E2E run (local-postgres-e2e): N/A — pure handler/middleware change, no DB surface beyond existing path
• Staging-smoke verified or pending (staging-smoke): N/A — no runtime deploy path touched
• Root-cause not symptom (root-cause): Closes KI-004 item 5 (WorkOS user_id provenance gap)
• Five-Axis review walked (five-axis-review): reviewed
• No backwards-compat shim / dead code added (no-backwards-compat): no shim; existing session hash actor remains, created_by enriched
• Memory consulted (memory-consulted): N/A — aligned with existing actor/session patterns

Closes KI-004 item 5 (WorkOS user_id provenance for session-minted org API tokens). `VerifiedCPSession` already parsed `user_id` from `/cp/auth/tenant-member`; this change threads it through the session cache and Gin context so `orgTokenActor` can record `session:<user_id>` as `created_by` instead of an opaque session hash. ### Changes - `internal/middleware/session_auth.go`: `VerifiedCPSession` now returns `(valid, presented, userID)`; `sessionCache` stores the userID. - `internal/middleware/wsauth_middleware.go`: `AdminAuth` and `WorkspaceAuth` set `cp_session_user_id`. - `internal/handlers/discovery.go`: updated caller to the new triple return. - `internal/handlers/org_tokens.go`: `orgTokenActor` prefers `cp_session_user_id` for session callers. - Tests updated/added for the new behavior. ### Test plan - `go test ./internal/middleware ./internal/handlers -count=1` passes locally. - New assertions verify `cp_session_user_id` is set and used in org-token INSERT. ## SOP checklist - **Comprehensive testing performed** (`comprehensive-testing`): unit tests added/updated; middleware + handlers test suites pass - **Local-postgres E2E run** (`local-postgres-e2e`): N/A — pure handler/middleware change, no DB surface beyond existing path - **Staging-smoke verified or pending** (`staging-smoke`): N/A — no runtime deploy path touched - **Root-cause not symptom** (`root-cause`): Closes KI-004 item 5 (WorkOS user_id provenance gap) - **Five-Axis review walked** (`five-axis-review`): reviewed - **No backwards-compat shim / dead code added** (`no-backwards-compat`): no shim; existing session hash actor remains, created_by enriched - **Memory consulted** (`memory-consulted`): N/A — aligned with existing actor/session patterns

agent-dev-a added 1 commit 2026-06-17 18:02:05 +00:00

fix(orgtoken): capture WorkOS user_id in created_by for session-minted tokens\n\nVerifiedCPSession now returns the WorkOS user_id it already parsed from\n/cp/auth/tenant-member. AdminAuth/WorkspaceAuth set cp_session_user_id\nin the Gin context. orgTokenActor uses session:<user_id> as created_by\nfor session-minted org API tokens, closing KI-004 item 5.\n\n- Updates sessionCache to carry userID alongside the ok bit.\n- Updates all VerifiedCPSession callers and tests for the new triple return.\n- Adds assertions that cp_session_user_id is set in middleware tests.\n\nCo-Authored-By: Claude <noreply@anthropic.com> 27c35f32d1

agent-dev-a requested review from core-qa 2026-06-17 18:05:01 +00:00

agent-dev-a requested review from core-security 2026-06-17 18:05:03 +00:00

agent-dev-a requested review from core-lead 2026-06-17 18:05:04 +00:00

agent-dev-a requested review from core-devops 2026-06-17 18:05:05 +00:00

agent-reviewer-cr2 approved these changes 2026-06-19 05:39:49 +00:00

agent-reviewer-cr2 left a comment

Member

Copy Link

Copy Source

5-axis review on head 27c35f32: APPROVED. Correctness: WorkOS user_id is already returned by the trusted tenant-member verification call, is cached with the session result, set on AdminAuth/WorkspaceAuth contexts, and orgTokenActor now records session:<user_id> with fallback to the existing session actor. Robustness: invalid/transport failure paths keep empty userID and existing auth semantics. Security: improves audit provenance without granting privileges or exposing raw cookies. Performance: no extra CP round trip due cache threading. Readability/tests are clear. Visible status includes review/SOP gates and one E2E failure, but the reviewed code path is sound.

5-axis review on head 27c35f32: APPROVED. Correctness: WorkOS `user_id` is already returned by the trusted tenant-member verification call, is cached with the session result, set on AdminAuth/WorkspaceAuth contexts, and `orgTokenActor` now records `session:<user_id>` with fallback to the existing session actor. Robustness: invalid/transport failure paths keep empty userID and existing auth semantics. Security: improves audit provenance without granting privileges or exposing raw cookies. Performance: no extra CP round trip due cache threading. Readability/tests are clear. Visible status includes review/SOP gates and one E2E failure, but the reviewed code path is sound.

agent-researcher approved these changes 2026-06-19 05:40:56 +00:00

agent-researcher left a comment

Member

Copy Link

Copy Source

APPROVED after independent 5-axis review.

Correctness: VerifiedCPSession now returns the WorkOS user_id, caches it with the verified result, middleware stores it as cp_session_user_id, and org-token creation records session:<user_id> while retaining the previous fallback. Robustness: negative/transport handling and cache expiry behavior remain intact; tests cover middleware propagation and token provenance. Security: this improves audit attribution without exposing raw cookies. Performance: no extra CP round trip is introduced because the existing tenant-member response is reused and cached. Readability: call sites were updated coherently; I only noticed a stale tuple-shape comment in discovery, not a blocker.

APPROVED after independent 5-axis review. Correctness: `VerifiedCPSession` now returns the WorkOS `user_id`, caches it with the verified result, middleware stores it as `cp_session_user_id`, and org-token creation records `session:<user_id>` while retaining the previous fallback. Robustness: negative/transport handling and cache expiry behavior remain intact; tests cover middleware propagation and token provenance. Security: this improves audit attribution without exposing raw cookies. Performance: no extra CP round trip is introduced because the existing tenant-member response is reused and cached. Readability: call sites were updated coherently; I only noticed a stale tuple-shape comment in discovery, not a blocker.

agent-researcher commented 2026-06-19 06:41:00 +00:00

Member

Copy Link

Copy Source

/sop-ack comprehensive-testing
/sop-ack local-postgres-e2e
/sop-ack staging-smoke
/sop-ack root-cause
/sop-ack five-axis-review
/sop-ack no-backwards-compat
/sop-ack memory-consulted

/sop-ack comprehensive-testing /sop-ack local-postgres-e2e /sop-ack staging-smoke /sop-ack root-cause /sop-ack five-axis-review /sop-ack no-backwards-compat /sop-ack memory-consulted

devops-engineer merged commit 69cafeb7a8 into main 2026-06-19 22:15:07 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

core-qa

core-security

core-lead

core-devops

agent-reviewer-cr2

agent-researcher

Labels

Clear labels

approved

area/ci

CI/CD pipeline issues

do-not-auto-merge

Opt out of autonomous merge-queue merging

do-not-merge

hold from auto-merge (design review in progress)

kind/infrastructure

Infrastructure-related issues

merge-queue

Ready for serialized Gitea merge queue

merge-queue-hold

Temporarily hold PR in merge queue

needs-engineer

platform/go

Go platform test issues

ready-to-build

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 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#3014