fix(multitenancy): pin the live-query websocket stream to the tenant team - #114
Merged
Merged
Conversation
…team The sockjs results handler rebuilt its context from Background, dropping the tenant pin set on the upgrade request — the campaign stream ran unfenced and live_query activities were stamped with a NULL team_id. Re-pin from the upgrade request (fail closed in shared mode) and fence campaign-by-id reads via the campaign's query team. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
oleg-flamingocx
approved these changes
Aug 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The live-query results websocket (sockjs) rebuilds its context from
context.Background(), discarding the upgrade-request context thatWithOpenframeTenantpinned. In shared mode the whole campaign stream ranunfenced, and
live_queryrows inactivity_pastgotteam_id = NULL, so theCDC pipeline couldn't attribute them to a tenant. Since all tenants share the
same Fleet
Adminuser, the upstreamcampaign.UserIDcheck doesn't isolatetenants — a foreign campaign id could be streamed cross-tenant.
endpoint_campaigns.go: re-apply the team pin fromsession.Request()'scontext; fail closed in shared mode if no pin is present
campaigns.go: fenceDistributedQueryCampaign/DistributedQueryCampaignTargetIDsby the campaign's query team (EXISTSagainst
queries.team_id) when pinnedFlag off / unpinned: statements and behavior are byte-identical to upstream.
Tests: websocket re-pin + unpinned pass-through (httptest sockjs handshake),
MySQL-backed cross-tenant fence test.
🤖 Generated with Claude Code