From 0e1482bc4cac2e352866ae9605828153d8cec457 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Thu, 14 May 2026 23:32:16 +0800 Subject: [PATCH] fix(rbac): propagate TenantRole through logger.CloneContext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit logger.CloneContext rebuilds a fresh context.Background() and only copies a hand-curated allow-list of context keys (LoggerContextKey, TenantIDContextKey, UserContextKey, etc.) before passing it to downstream handlers — the chat / agent QA pipelines all do `ctx := logger.CloneContext(c.Request.Context())` at the top of parseQARequest. TenantRoleContextKey was missing from that allow-list. Any call site that read the role via TenantRoleFromContext(reqCtx.ctx) saw the type-zero TenantRole and the helper's least-privilege fallback returned Viewer. The auth middleware had set role=Owner correctly on the parent context, but the cloned context lost it. Symptom: an Owner of their home tenant got 403 on POST /agent-chat when the agent had runnable_by_viewer=false, because the gate at session/qa.go:520 saw role=viewer despite middleware logging role=owner two ms earlier. Diagnostic log lines added in the previous commits (auth.go:145 "[auth] resolved role=...", auth.go:283 "[auth] resolveTenantRole step1 hit row_role=...") made this immediately visible — a request showed role=owner at the middleware layer and role=viewer at the handler layer, which can only mean ctx propagation lost it. Keeping the diagnostic logs in place so similar regressions surface fast. Fix is one line: add TenantRoleContextKey to the CloneContext allow-list, with a comment pinning it to the bug it fixes so a future drive-by removal has to weigh that loss. --- internal/logger/logger.go | 9 +++++++++ internal/middleware/auth.go | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 6e32f20d..7de94c26 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -411,6 +411,15 @@ func CloneContext(ctx context.Context) context.Context { types.TenantInfoContextKey, types.UserIDContextKey, types.UserContextKey, + // TenantRoleContextKey: the caller's resolved role in the + // active tenant (PR 2 #1303). Must be propagated for the same + // reason as TenantIDContextKey — any handler that does + // `ctx := logger.CloneContext(c.Request.Context())` and then + // reads role via TenantRoleFromContext (e.g. session/qa.go's + // "viewer cannot run runnable_by_viewer=false agent" gate) + // would otherwise see the type-zero TenantRole and fall back + // to Viewer, blocking even Owners. + types.TenantRoleContextKey, types.LanguageContextKey, types.SessionTenantIDContextKey, types.EmbedQueryContextKey, diff --git a/internal/middleware/auth.go b/internal/middleware/auth.go index 5caed6d2..4270d6f0 100644 --- a/internal/middleware/auth.go +++ b/internal/middleware/auth.go @@ -142,6 +142,9 @@ func Auth( } // 存储用户和租户信息到上下文 + logger.Infof(c.Request.Context(), + "[auth] resolved role=%s for user=%s in tenant=%d (jwt_tenant=%d, header=%q, cross_switch=%v)", + role, user.ID, targetTenantID, jwtTenantID, tenantHeader, crossTenantSwitch) c.Set(types.TenantIDContextKey.String(), targetTenantID) c.Set(types.TenantInfoContextKey.String(), tenant) c.Set(types.UserContextKey.String(), user) @@ -277,6 +280,9 @@ func resolveTenantRole( // 1. 正常成员关系 member, err := memberService.GetMembership(ctx, user.ID, targetTenantID) if err == nil && member != nil && member.Status == types.TenantMemberStatusActive { + logger.Infof(ctx, + "[auth] resolveTenantRole step1 hit: user=%s tenant=%d row_role=%s row_status=%s", + user.ID, targetTenantID, member.Role, member.Status) return member.Role, true } if err != nil { @@ -284,12 +290,25 @@ func resolveTenantRole( user.ID, targetTenantID, err) // Fall through; treat lookup errors the same as "no membership // found" so a transient DB hiccup doesn't lock everyone out. + } else { + var statusInfo string + if member == nil { + statusInfo = "no_row" + } else { + statusInfo = "row_exists status=" + string(member.Status) + " role=" + string(member.Role) + } + logger.Warnf(ctx, + "[auth] resolveTenantRole step1 miss: user=%s tenant=%d (%s)", + user.ID, targetTenantID, statusInfo) } // 2. 跨租户超管直通:CanAccessAllTenants 用户切到别的租户时不强制要求 membership。 // 注意:这里只授予临时 Admin 角色,不写入 tenant_members,避免"看一眼别人租户" // 意外升级为持久化所有权。 if crossTenantSwitch && user.CanAccessAllTenants { + logger.Infof(ctx, + "[auth] resolveTenantRole step2 (cross-tenant superuser) -> Admin: user=%s tenant=%d", + user.ID, targetTenantID) return types.TenantRoleAdmin, true } @@ -317,8 +336,14 @@ func resolveTenantRole( // 4. 兜底:根据 EnableRBAC 决定 fail-closed 还是 fail-open if cfg != nil && cfg.Tenant != nil && cfg.Tenant.EnableRBAC { + logger.Warnf(ctx, + "[auth] resolveTenantRole step4 fail-closed (EnableRBAC=true): user=%s tenant=%d", + user.ID, targetTenantID) return "", false } + logger.Warnf(ctx, + "[auth] resolveTenantRole step4 fail-open (EnableRBAC=false) -> Admin: user=%s tenant=%d", + user.ID, targetTenantID) // fail-open 期间保持现有行为(每个登录用户在自己租户里都是"管理员")。 return types.TenantRoleAdmin, true }