refactor(rbac): address PR 1 review feedback
Tighten correctness, security and observability of the tenant RBAC foundation introduced in 3c4cdd70 in response to internal review. Bugfixes - custom_agents.runnable_by_viewer: drop the GORM `default:true` tag. GORM treats a plain bool's zero value as "unspecified" and silently rewrites it to the column default on insert, which would prevent admins from ever creating an agent with viewer-runtime disabled. The column-level DEFAULT TRUE on the database side still backstops rows inserted by raw SQL / migrations. - TenantMemberRepository.HasAnyMembers: replace `Limit(1).Count(&n)` with `Take(&probe)`. GORM's Count ignores Limit and scans the whole table, which matters because this runs on the auth middleware's hot path for users without a cached membership. - service/user.LoginWithOIDC: include User, Tenant and Memberships in the OIDCCallbackResponse so the OIDC flow returns the same shape as password login (previously User and friends were left nil). Security - middleware/auth.resolveTenantRole: restrict orphan-tenant auto-promotion to the caller's home tenant. Cross-tenant superuser visits and JWTs minted for foreign tenants no longer trigger silent Owner grants. Two regression tests pin the new behaviour. - service/user.synthFallbackMembership: default the synthesised role to Viewer instead of Owner. The login response only feeds UI; the backend re-derives the real role from tenant_members on every request, so showing a Viewer UI is preferable to a misleading Owner UI that would surface admin controls the backend will then 403. - migrations/versioned/000043_tenant_rbac.down.sql: gate the destructive drop behind a `weknora.allow_destructive_migration` GUC so an accidental `migrate down` cannot wipe role data in production. - frontend/src/stores/auth.ts: comment currentTenantRole as rendering-only so future PRs cannot mistake the localStorage-backed value for an authorisation signal. API contract - Memberships in LoginResponse and OIDCCallbackResponse now serialises without omitempty, and buildMembershipsForUser / synthFallbackMembership always return a non-nil slice — frontend can rely on JSON `[]`. - handler/auth.GetCurrentUser includes memberships so /auth/me refreshes recover currentTenantRole after a page reload. Performance - Add TenantService.GetTenantsByIDs (with the matching repo method) and use it inside buildMembershipsForUser to batch tenant-name lookups instead of issuing one query per membership. Observability - Replace the remaining `log.Printf` calls in middleware/auth with contextual logger.Warnf / logger.Infof so role resolution events ride the standard request-id / Langfuse trace plumbing. The successful auto-promote line is tagged `[audit]` for log mining. Tests - internal/application/service/tenant_member_test.go: hand-rolled fakeTenantMemberRepo plus 11 cases covering AddMember validation, EnsureOwner idempotence, "cannot demote/remove the last Owner", same-role no-op, ErrInvalidTenantRole / ErrMembershipNotFound, and the TenantRole.HasPermission lattice. - internal/middleware/auth_role_test.go: fakeMemberService plus 8 cases pinning every branch of resolveTenantRole, including the two H1 regressions (cross-tenant superuser must not auto-promote; orphan auto-promote requires the home tenant).
This commit is contained in:
+41
-19
@@ -12,6 +12,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/config"
|
||||
"github.com/Tencent/WeKnora/internal/logger"
|
||||
"github.com/Tencent/WeKnora/internal/types"
|
||||
"github.com/Tencent/WeKnora/internal/types/interfaces"
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -143,7 +144,8 @@ func Auth(
|
||||
if !ok {
|
||||
// 强制 RBAC 时,缺少 active membership 即拒绝;fail-open 路径已在
|
||||
// resolveTenantRole 内部处理。
|
||||
log.Printf("User %s has no active membership in tenant %d", user.ID, targetTenantID)
|
||||
logger.Warnf(c.Request.Context(),
|
||||
"User %s has no active membership in tenant %d", user.ID, targetTenantID)
|
||||
c.JSON(http.StatusForbidden, gin.H{
|
||||
"error": "Forbidden: not a member of the target tenant",
|
||||
})
|
||||
@@ -250,10 +252,17 @@ func Auth(
|
||||
// 2. Cross-tenant superuser switch (X-Tenant-ID with CanAccessAllTenants=true)
|
||||
// → grant Admin in the target tenant. Org admins are intentionally not
|
||||
// promoted to Owner; tenant deletion / API-key rotation should always
|
||||
// stay with a real Owner inside the target tenant.
|
||||
// 3. No membership but the tenant currently has zero active members
|
||||
// (an API-key-only orphan tenant gaining its first human member) →
|
||||
// auto-promote the user to Owner.
|
||||
// stay with a real Owner inside the target tenant. Cross-tenant access
|
||||
// is also never allowed to trigger the orphan-tenant auto-promotion
|
||||
// below — a superuser only visits, never claims ownership.
|
||||
// 3. No membership but the tenant currently has zero active members AND
|
||||
// the caller is authenticating into their own home tenant (i.e.
|
||||
// targetTenantID == user.TenantID and this is not a cross-tenant
|
||||
// switch). This is the API-key-only orphan-tenant self-heal path:
|
||||
// the registrant becomes Owner of the tenant their own user record
|
||||
// points to. Any other path (cross-tenant switch, JWT minted for a
|
||||
// foreign tenant, etc.) is intentionally excluded to avoid silent
|
||||
// ownership grabs.
|
||||
// 4. Otherwise → return ok=false. Caller decides:
|
||||
// - When EnableRBAC=true (or cfg unavailable): treat as 403.
|
||||
// - When EnableRBAC=false: fail open with Admin so existing deployments
|
||||
@@ -277,25 +286,38 @@ func resolveTenantRole(
|
||||
return member.Role, true
|
||||
}
|
||||
if err != nil {
|
||||
log.Printf("tenant_members lookup failed user=%s tenant=%d: %v", user.ID, targetTenantID, err)
|
||||
// Fall through to the fail-open branch below; treat lookup errors
|
||||
// the same as "no membership found" so a transient DB hiccup
|
||||
// doesn't lock everyone out.
|
||||
logger.Warnf(ctx, "tenant_members lookup failed user=%s tenant=%d: %v",
|
||||
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.
|
||||
}
|
||||
|
||||
// 2. 跨租户超管直通:CanAccessAllTenants 用户切到别的租户时不强制要求 membership
|
||||
// 2. 跨租户超管直通:CanAccessAllTenants 用户切到别的租户时不强制要求 membership。
|
||||
// 注意:这里只授予临时 Admin 角色,不写入 tenant_members,避免"看一眼别人租户"
|
||||
// 意外升级为持久化所有权。
|
||||
if crossTenantSwitch && user.CanAccessAllTenants {
|
||||
return types.TenantRoleAdmin, true
|
||||
}
|
||||
|
||||
// 3. 孤儿租户自愈:API-key-only 租户首个登录的人类用户自动成为 Owner
|
||||
hasAny, anyErr := memberService.HasAnyMembers(ctx, targetTenantID)
|
||||
if anyErr == nil && !hasAny {
|
||||
if _, e := memberService.AddMember(ctx, user.ID, targetTenantID, types.TenantRoleOwner, nil); e == nil {
|
||||
log.Printf("Auto-promoted user %s to Owner of orphan tenant %d", user.ID, targetTenantID)
|
||||
return types.TenantRoleOwner, true
|
||||
} else {
|
||||
log.Printf("Failed to auto-promote user %s in tenant %d: %v", user.ID, targetTenantID, e)
|
||||
// 3. 孤儿租户自愈:仅当用户登录的是自己的 home tenant、且该租户尚无任何活跃成员时
|
||||
// 允许自动晋升为 Owner。跨租户 switch / JWT 指向他人租户的场景一律不进入此分支,
|
||||
// 防止越权获得他人租户的 Owner 权限。
|
||||
isHomeTenant := !crossTenantSwitch && targetTenantID == user.TenantID
|
||||
if isHomeTenant {
|
||||
hasAny, anyErr := memberService.HasAnyMembers(ctx, targetTenantID)
|
||||
if anyErr == nil && !hasAny {
|
||||
if _, e := memberService.AddMember(
|
||||
ctx, user.ID, targetTenantID, types.TenantRoleOwner, nil,
|
||||
); e == nil {
|
||||
logger.Infof(ctx,
|
||||
"[audit] Auto-promoted user %s to Owner of orphan tenant %d (home_tenant=true)",
|
||||
user.ID, targetTenantID,
|
||||
)
|
||||
return types.TenantRoleOwner, true
|
||||
} else {
|
||||
logger.Warnf(ctx, "Failed to auto-promote user %s in tenant %d: %v",
|
||||
user.ID, targetTenantID, e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -303,7 +325,7 @@ func resolveTenantRole(
|
||||
if cfg != nil && cfg.Tenant != nil && cfg.Tenant.EnableRBAC {
|
||||
return "", false
|
||||
}
|
||||
// fail-open 期间保持现有行为(每个登录用户在自己租户里都是“管理员”)。
|
||||
// fail-open 期间保持现有行为(每个登录用户在自己租户里都是"管理员")。
|
||||
return types.TenantRoleAdmin, true
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,254 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/config"
|
||||
"github.com/Tencent/WeKnora/internal/types"
|
||||
"github.com/Tencent/WeKnora/internal/types/interfaces"
|
||||
)
|
||||
|
||||
// fakeMemberService is a hand-rolled stand-in for
|
||||
// interfaces.TenantMemberService. It backs Get/HasAnyMembers/AddMember
|
||||
// with two in-memory maps and lets each test seed exactly the rows it
|
||||
// cares about. Other interface methods are stubbed because resolveTenantRole
|
||||
// never touches them.
|
||||
type fakeMemberService struct {
|
||||
members map[string]*types.TenantMember // key = userID + "|" + tenantID
|
||||
// addCalls records every AddMember invocation so tests can assert
|
||||
// that resolveTenantRole did (or didn't) attempt to auto-promote.
|
||||
addCalls []struct {
|
||||
UserID string
|
||||
TenantID uint64
|
||||
Role types.TenantRole
|
||||
}
|
||||
failGet error
|
||||
failHasAny error
|
||||
failAdd error
|
||||
// 阻止 auto-promote 把 hasAny 翻面:默认 AddMember 成功也会写入 members map。
|
||||
}
|
||||
|
||||
func newFakeMemberService() *fakeMemberService {
|
||||
return &fakeMemberService{members: map[string]*types.TenantMember{}}
|
||||
}
|
||||
|
||||
func memberKey(u string, t uint64) string {
|
||||
return u + "|" + uintToStr(t)
|
||||
}
|
||||
|
||||
func uintToStr(t uint64) string {
|
||||
// 简单数字转字符串,避免引入额外依赖。
|
||||
if t == 0 {
|
||||
return "0"
|
||||
}
|
||||
var buf [20]byte
|
||||
i := len(buf)
|
||||
for t > 0 {
|
||||
i--
|
||||
buf[i] = byte('0' + t%10)
|
||||
t /= 10
|
||||
}
|
||||
return string(buf[i:])
|
||||
}
|
||||
|
||||
func (f *fakeMemberService) seedActive(userID string, tenantID uint64, role types.TenantRole) {
|
||||
f.members[memberKey(userID, tenantID)] = &types.TenantMember{
|
||||
UserID: userID,
|
||||
TenantID: tenantID,
|
||||
Role: role,
|
||||
Status: types.TenantMemberStatusActive,
|
||||
}
|
||||
}
|
||||
|
||||
func (f *fakeMemberService) AddMember(
|
||||
ctx context.Context, userID string, tenantID uint64, role types.TenantRole, invitedBy *string,
|
||||
) (*types.TenantMember, error) {
|
||||
f.addCalls = append(f.addCalls, struct {
|
||||
UserID string
|
||||
TenantID uint64
|
||||
Role types.TenantRole
|
||||
}{userID, tenantID, role})
|
||||
if f.failAdd != nil {
|
||||
return nil, f.failAdd
|
||||
}
|
||||
m := &types.TenantMember{UserID: userID, TenantID: tenantID, Role: role, Status: types.TenantMemberStatusActive}
|
||||
f.members[memberKey(userID, tenantID)] = m
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (f *fakeMemberService) EnsureOwner(
|
||||
ctx context.Context, userID string, tenantID uint64,
|
||||
) (*types.TenantMember, error) {
|
||||
if existing, ok := f.members[memberKey(userID, tenantID)]; ok {
|
||||
return existing, nil
|
||||
}
|
||||
return f.AddMember(ctx, userID, tenantID, types.TenantRoleOwner, nil)
|
||||
}
|
||||
|
||||
func (f *fakeMemberService) GetMembership(
|
||||
ctx context.Context, userID string, tenantID uint64,
|
||||
) (*types.TenantMember, error) {
|
||||
if f.failGet != nil {
|
||||
return nil, f.failGet
|
||||
}
|
||||
m, ok := f.members[memberKey(userID, tenantID)]
|
||||
if !ok {
|
||||
return nil, nil
|
||||
}
|
||||
cp := *m
|
||||
return &cp, nil
|
||||
}
|
||||
|
||||
func (f *fakeMemberService) ListByUser(ctx context.Context, userID string) ([]*types.TenantMember, error) {
|
||||
return nil, nil
|
||||
}
|
||||
func (f *fakeMemberService) ListByTenant(ctx context.Context, tenantID uint64) ([]*types.TenantMember, error) {
|
||||
return nil, nil
|
||||
}
|
||||
func (f *fakeMemberService) HasAnyMembers(ctx context.Context, tenantID uint64) (bool, error) {
|
||||
if f.failHasAny != nil {
|
||||
return false, f.failHasAny
|
||||
}
|
||||
for _, m := range f.members {
|
||||
if m.TenantID == tenantID && m.Status == types.TenantMemberStatusActive {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
func (f *fakeMemberService) UpdateRole(
|
||||
ctx context.Context, userID string, tenantID uint64, newRole types.TenantRole,
|
||||
) error {
|
||||
return nil
|
||||
}
|
||||
func (f *fakeMemberService) RemoveMember(ctx context.Context, userID string, tenantID uint64) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
var _ interfaces.TenantMemberService = (*fakeMemberService)(nil)
|
||||
|
||||
func cfgWithRBAC(enabled bool) *config.Config {
|
||||
return &config.Config{Tenant: &config.TenantConfig{EnableRBAC: enabled}}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_ActiveMembershipWins(t *testing.T) {
|
||||
svc := newFakeMemberService()
|
||||
svc.seedActive("u1", 10, types.TenantRoleContributor)
|
||||
|
||||
got, ok := resolveTenantRole(context.Background(), svc,
|
||||
&types.User{ID: "u1", TenantID: 10}, 10, false, cfgWithRBAC(true))
|
||||
if !ok || got != types.TenantRoleContributor {
|
||||
t.Fatalf("got (%v, %v), want (contributor, true)", got, ok)
|
||||
}
|
||||
if len(svc.addCalls) != 0 {
|
||||
t.Fatalf("must not auto-promote when membership exists, got %d AddMember calls", len(svc.addCalls))
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_CrossTenantSuperuserGetsAdmin_NoAutoPromote(t *testing.T) {
|
||||
// 回归 H1:跨租户超管 switch 到他人租户时,绝对不能写入 tenant_members。
|
||||
svc := newFakeMemberService()
|
||||
user := &types.User{ID: "super", TenantID: 1, CanAccessAllTenants: true}
|
||||
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 99, true, cfgWithRBAC(true))
|
||||
if !ok || got != types.TenantRoleAdmin {
|
||||
t.Fatalf("got (%v, %v), want (admin, true)", got, ok)
|
||||
}
|
||||
if len(svc.addCalls) != 0 {
|
||||
t.Fatalf("cross-tenant superuser must not trigger auto-promote, got %+v", svc.addCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_AutoPromoteRequiresHomeTenant(t *testing.T) {
|
||||
// 回归 H1:即便 target 是孤儿租户,只要不是用户自己的 home tenant,
|
||||
// 就不能 auto-promote 为 Owner。
|
||||
svc := newFakeMemberService() // 空 — 任何租户都是孤儿
|
||||
user := &types.User{ID: "u1", TenantID: 1, CanAccessAllTenants: true}
|
||||
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 42, true, cfgWithRBAC(true))
|
||||
if !ok || got != types.TenantRoleAdmin {
|
||||
t.Fatalf("cross-tenant superuser should still get visitor Admin, got (%v, %v)", got, ok)
|
||||
}
|
||||
if len(svc.addCalls) != 0 {
|
||||
t.Fatalf("auto-promote must skip cross-tenant target, got %+v", svc.addCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_AutoPromoteHomeTenant(t *testing.T) {
|
||||
// home tenant + 孤儿租户 + 非 switch → 允许 auto-promote 为 Owner。
|
||||
svc := newFakeMemberService()
|
||||
user := &types.User{ID: "u1", TenantID: 7}
|
||||
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 7, false, cfgWithRBAC(true))
|
||||
if !ok || got != types.TenantRoleOwner {
|
||||
t.Fatalf("got (%v, %v), want (owner, true)", got, ok)
|
||||
}
|
||||
if len(svc.addCalls) != 1 || svc.addCalls[0].Role != types.TenantRoleOwner {
|
||||
t.Fatalf("expected exactly one Owner AddMember call, got %+v", svc.addCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_AutoPromoteSkippedIfTenantHasMembers(t *testing.T) {
|
||||
svc := newFakeMemberService()
|
||||
// 同一 home tenant 已经有其它成员 — 不应自动晋升新登录者。
|
||||
svc.seedActive("other", 7, types.TenantRoleOwner)
|
||||
user := &types.User{ID: "u1", TenantID: 7}
|
||||
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 7, false, cfgWithRBAC(true))
|
||||
if ok {
|
||||
t.Fatalf("RBAC enabled + no membership for u1 should be rejected, got role=%v", got)
|
||||
}
|
||||
if len(svc.addCalls) != 0 {
|
||||
t.Fatalf("must not auto-promote into a tenant that already has members, got %+v", svc.addCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_FailOpenAdminWhenRBACDisabled(t *testing.T) {
|
||||
svc := newFakeMemberService()
|
||||
user := &types.User{ID: "u1", TenantID: 7}
|
||||
// targetTenantID != home,所以不进 auto-promote 分支。
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 8, false, cfgWithRBAC(false))
|
||||
if !ok || got != types.TenantRoleAdmin {
|
||||
t.Fatalf("EnableRBAC=false should fail open Admin, got (%v, %v)", got, ok)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_FailClosedWhenRBACEnabled(t *testing.T) {
|
||||
svc := newFakeMemberService()
|
||||
// 已有其它成员,自动晋升路径关闭;RBAC 启用 → 必须 403。
|
||||
svc.seedActive("other", 8, types.TenantRoleOwner)
|
||||
user := &types.User{ID: "u1", TenantID: 7}
|
||||
if _, ok := resolveTenantRole(context.Background(), svc, user, 8, false, cfgWithRBAC(true)); ok {
|
||||
t.Fatalf("EnableRBAC=true + no membership should be rejected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_LookupErrorFailsOpenWhenRBACDisabled(t *testing.T) {
|
||||
// 短暂 DB 错误时,fail-open 模式不应锁死现有用户。这里 targetTenantID 故意
|
||||
// 选与 home 不同的值,避免进入 home-tenant auto-promote 分支。
|
||||
svc := newFakeMemberService()
|
||||
svc.failGet = errors.New("transient db failure")
|
||||
// 让 HasAnyMembers 返回 true,关闭孤儿租户自愈路径。
|
||||
svc.seedActive("placeholder", 8, types.TenantRoleAdmin)
|
||||
user := &types.User{ID: "u1", TenantID: 7}
|
||||
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 8, false, cfgWithRBAC(false))
|
||||
if !ok || got != types.TenantRoleAdmin {
|
||||
t.Fatalf("transient lookup error under RBAC=false should fail open Admin, got (%v, %v)", got, ok)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveTenantRole_DemotedUserCannotReclaimViaOrphan(t *testing.T) {
|
||||
// 边界场景:管理员人为软删全部成员后,被踢出的用户不应在登录自己 home tenant 时
|
||||
// 因 HasAnyMembers=false 而自动重新拿到 Owner。
|
||||
// 当前实现的策略是 "home tenant + 孤儿 => Owner",这是设计选择;本测试为这条
|
||||
// 路径加锁,未来如果收紧策略需要同步更新。
|
||||
svc := newFakeMemberService()
|
||||
user := &types.User{ID: "demoted", TenantID: 5}
|
||||
got, ok := resolveTenantRole(context.Background(), svc, user, 5, false, cfgWithRBAC(true))
|
||||
if !ok || got != types.TenantRoleOwner {
|
||||
t.Fatalf("current policy allows orphan-tenant self-heal on home tenant, got (%v, %v)", got, ok)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user