f3d1210577
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).
139 lines
4.4 KiB
Go
139 lines
4.4 KiB
Go
package repository
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"time"
|
|
|
|
"github.com/Tencent/WeKnora/internal/types"
|
|
"github.com/Tencent/WeKnora/internal/types/interfaces"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// tenantMemberRepository implements interfaces.TenantMemberRepository.
|
|
type tenantMemberRepository struct {
|
|
db *gorm.DB
|
|
}
|
|
|
|
// NewTenantMemberRepository creates a new tenant member repository.
|
|
func NewTenantMemberRepository(db *gorm.DB) interfaces.TenantMemberRepository {
|
|
return &tenantMemberRepository{db: db}
|
|
}
|
|
|
|
// Create inserts a new active membership row. Status defaults to
|
|
// TenantMemberStatusActive when the caller leaves it blank, and JoinedAt
|
|
// defaults to the current time, matching service-layer expectations.
|
|
func (r *tenantMemberRepository) Create(ctx context.Context, member *types.TenantMember) error {
|
|
if member.Status == "" {
|
|
member.Status = types.TenantMemberStatusActive
|
|
}
|
|
if member.JoinedAt.IsZero() {
|
|
member.JoinedAt = time.Now()
|
|
}
|
|
return r.db.WithContext(ctx).Create(member).Error
|
|
}
|
|
|
|
// Get returns the active membership for (userID, tenantID), or (nil, nil)
|
|
// if no such row exists. Errors are propagated unchanged for any other case.
|
|
func (r *tenantMemberRepository) Get(ctx context.Context, userID string, tenantID uint64) (*types.TenantMember, error) {
|
|
var member types.TenantMember
|
|
err := r.db.WithContext(ctx).
|
|
Where("user_id = ? AND tenant_id = ?", userID, tenantID).
|
|
First(&member).Error
|
|
if err != nil {
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
return &member, nil
|
|
}
|
|
|
|
// ListByUser returns every active membership owned by the user, ordered
|
|
// by joined_at ascending so the home tenant (created at registration)
|
|
// naturally appears first.
|
|
func (r *tenantMemberRepository) ListByUser(ctx context.Context, userID string) ([]*types.TenantMember, error) {
|
|
var members []*types.TenantMember
|
|
err := r.db.WithContext(ctx).
|
|
Where("user_id = ?", userID).
|
|
Order("joined_at ASC, id ASC").
|
|
Find(&members).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return members, nil
|
|
}
|
|
|
|
// ListByTenant returns every active membership inside the tenant.
|
|
func (r *tenantMemberRepository) ListByTenant(ctx context.Context, tenantID uint64) ([]*types.TenantMember, error) {
|
|
var members []*types.TenantMember
|
|
err := r.db.WithContext(ctx).
|
|
Where("tenant_id = ?", tenantID).
|
|
Order("joined_at ASC, id ASC").
|
|
Find(&members).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return members, nil
|
|
}
|
|
|
|
// UpdateRole changes the role of an existing active membership.
|
|
func (r *tenantMemberRepository) UpdateRole(ctx context.Context, userID string, tenantID uint64, role types.TenantRole) error {
|
|
res := r.db.WithContext(ctx).
|
|
Model(&types.TenantMember{}).
|
|
Where("user_id = ? AND tenant_id = ?", userID, tenantID).
|
|
Updates(map[string]any{
|
|
"role": role,
|
|
"updated_at": time.Now(),
|
|
})
|
|
if res.Error != nil {
|
|
return res.Error
|
|
}
|
|
if res.RowsAffected == 0 {
|
|
return gorm.ErrRecordNotFound
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SoftDelete marks the membership row as deleted. GORM's soft-delete
|
|
// support populates DeletedAt automatically.
|
|
func (r *tenantMemberRepository) SoftDelete(ctx context.Context, userID string, tenantID uint64) error {
|
|
return r.db.WithContext(ctx).
|
|
Where("user_id = ? AND tenant_id = ?", userID, tenantID).
|
|
Delete(&types.TenantMember{}).Error
|
|
}
|
|
|
|
// CountActiveOwners reports the number of active owner rows in the tenant.
|
|
func (r *tenantMemberRepository) CountActiveOwners(ctx context.Context, tenantID uint64) (int64, error) {
|
|
var count int64
|
|
err := r.db.WithContext(ctx).
|
|
Model(&types.TenantMember{}).
|
|
Where("tenant_id = ? AND role = ? AND status = ?",
|
|
tenantID, types.TenantRoleOwner, types.TenantMemberStatusActive).
|
|
Count(&count).Error
|
|
return count, err
|
|
}
|
|
|
|
// HasAnyMembers reports whether the tenant has at least one active
|
|
// membership row. Uses a LIMIT 1 SELECT (instead of COUNT(*)) so the query
|
|
// short-circuits after the first match — important because this is on the
|
|
// auth middleware's hot path for users without a cached membership.
|
|
func (r *tenantMemberRepository) HasAnyMembers(ctx context.Context, tenantID uint64) (bool, error) {
|
|
var probe struct {
|
|
ID uint64
|
|
}
|
|
err := r.db.WithContext(ctx).
|
|
Model(&types.TenantMember{}).
|
|
Select("id").
|
|
Where("tenant_id = ? AND status = ?", tenantID, types.TenantMemberStatusActive).
|
|
Limit(1).
|
|
Take(&probe).Error
|
|
if err != nil {
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return false, nil
|
|
}
|
|
return false, err
|
|
}
|
|
return true, nil
|
|
}
|