feat(auth): support tenantless provisioning and gated self-service workspace creation
Allow deployments to register users without auto-creating a personal tenant, expose creation policy via /auth/me, and guide tenantless accounts through a workspace onboarding flow.
This commit is contained in:
@@ -77,6 +77,45 @@ func isNoAuthAPI(path string, method string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// isTenantOptionalAPI lists authenticated identity-level operations that are
|
||||
// meaningful before a user belongs to any tenant. Every other authenticated
|
||||
// route remains tenant-scoped and returns TENANT_REQUIRED when the JWT and
|
||||
// request headers do not resolve a tenant.
|
||||
func isTenantOptionalAPI(path, method string) bool {
|
||||
switch {
|
||||
case path == "/api/v1/auth/me" && (method == http.MethodGet || method == http.MethodPut):
|
||||
return true
|
||||
case path == "/api/v1/auth/logout" && method == http.MethodPost:
|
||||
return true
|
||||
case path == "/api/v1/auth/change-password" && method == http.MethodPost:
|
||||
return true
|
||||
case path == "/api/v1/auth/validate" && method == http.MethodGet:
|
||||
return true
|
||||
case path == "/api/v1/auth/switch-tenant" && method == http.MethodPost:
|
||||
return true
|
||||
case path == "/api/v1/tenants" && method == http.MethodPost:
|
||||
return true
|
||||
case strings.HasPrefix(path, "/api/v1/me/invitations"):
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func attachTenantlessUserContext(c *gin.Context, user *types.User) {
|
||||
principal := types.Principal{Type: types.PrincipalWebUser, ID: user.ID}
|
||||
c.Set(types.UserContextKey.String(), user)
|
||||
c.Set(types.UserIDContextKey.String(), user.ID)
|
||||
c.Set(types.SystemAdminContextKey.String(), user.IsSystemAdmin)
|
||||
c.Set(types.PrincipalContextKey.String(), principal)
|
||||
ctx := c.Request.Context()
|
||||
ctx = context.WithValue(ctx, types.UserContextKey, user)
|
||||
ctx = context.WithValue(ctx, types.UserIDContextKey, user.ID)
|
||||
ctx = context.WithValue(ctx, types.SystemAdminContextKey, user.IsSystemAdmin)
|
||||
ctx = types.WithPrincipal(ctx, principal)
|
||||
c.Request = c.Request.WithContext(ctx)
|
||||
}
|
||||
|
||||
// Auth 认证中间件
|
||||
func Auth(
|
||||
tenantService interfaces.TenantService,
|
||||
@@ -157,6 +196,25 @@ func Auth(
|
||||
}
|
||||
}
|
||||
|
||||
if targetTenantID == 0 {
|
||||
targetTenantID = resolveFirstMembershipTarget(c.Request.Context(), user, memberService, tenantService)
|
||||
crossTenantSwitch = targetTenantID != user.TenantID
|
||||
}
|
||||
|
||||
if targetTenantID == 0 {
|
||||
if isTenantOptionalAPI(c.Request.URL.Path, c.Request.Method) {
|
||||
attachTenantlessUserContext(c, user)
|
||||
c.Next()
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusConflict, gin.H{
|
||||
"error": "Tenant required",
|
||||
"code": "TENANT_REQUIRED",
|
||||
})
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
|
||||
// 获取租户信息(使用目标租户ID)
|
||||
tenant, err := tenantService.GetTenantByID(c.Request.Context(), targetTenantID)
|
||||
if err != nil {
|
||||
@@ -229,6 +287,37 @@ func Auth(
|
||||
}
|
||||
}
|
||||
|
||||
// resolveFirstMembershipTarget lets a tenantless session immediately become
|
||||
// usable once an active membership exists (for example after accepting its
|
||||
// first invitation or being added directly by an administrator). The user
|
||||
// service persists the same earliest-membership choice on the next token
|
||||
// issuance; middleware keeps the current JWT usable until then.
|
||||
func resolveFirstMembershipTarget(
|
||||
ctx context.Context,
|
||||
user *types.User,
|
||||
memberService interfaces.TenantMemberService,
|
||||
tenantService interfaces.TenantService,
|
||||
) uint64 {
|
||||
if user == nil || memberService == nil || tenantService == nil {
|
||||
return 0
|
||||
}
|
||||
members, err := memberService.ListByUser(ctx, user.ID)
|
||||
if err != nil {
|
||||
logger.Warnf(ctx, "Failed to list memberships for tenantless user %s: %v", user.ID, err)
|
||||
return 0
|
||||
}
|
||||
for _, member := range members {
|
||||
if member == nil || member.TenantID == 0 || member.Status != types.TenantMemberStatusActive {
|
||||
continue
|
||||
}
|
||||
tenant, err := tenantService.GetTenantByID(ctx, member.TenantID)
|
||||
if err == nil && tenant != nil {
|
||||
return member.TenantID
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func authenticateAPIKeyRequest(
|
||||
c *gin.Context,
|
||||
tenantService interfaces.TenantService,
|
||||
|
||||
@@ -24,9 +24,9 @@ type fakeMemberService struct {
|
||||
TenantID uint64
|
||||
Role types.TenantRole
|
||||
}
|
||||
failGet error
|
||||
failHasAny error
|
||||
failAdd error
|
||||
failGet error
|
||||
failHasAny error
|
||||
failAdd error
|
||||
// 阻止 auto-promote 把 hasAny 翻面:默认 AddMember 成功也会写入 members map。
|
||||
}
|
||||
|
||||
@@ -102,7 +102,14 @@ func (f *fakeMemberService) GetMembership(
|
||||
}
|
||||
|
||||
func (f *fakeMemberService) ListByUser(ctx context.Context, userID string) ([]*types.TenantMember, error) {
|
||||
return nil, nil
|
||||
var out []*types.TenantMember
|
||||
for _, member := range f.members {
|
||||
if member.UserID == userID && member.Status == types.TenantMemberStatusActive {
|
||||
copy := *member
|
||||
out = append(out, ©)
|
||||
}
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
func (f *fakeMemberService) ListByTenant(ctx context.Context, tenantID uint64) ([]*types.TenantMember, error) {
|
||||
return nil, nil
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/types"
|
||||
)
|
||||
|
||||
func TestTenantOptionalAPISurface(t *testing.T) {
|
||||
tests := []struct {
|
||||
method string
|
||||
path string
|
||||
want bool
|
||||
}{
|
||||
{http.MethodGet, "/api/v1/auth/me", true},
|
||||
{http.MethodPut, "/api/v1/auth/me", true},
|
||||
{http.MethodPost, "/api/v1/tenants", true},
|
||||
{http.MethodGet, "/api/v1/me/invitations", true},
|
||||
{http.MethodPost, "/api/v1/me/invitations/12/accept", true},
|
||||
{http.MethodGet, "/api/v1/knowledge-bases", false},
|
||||
{http.MethodGet, "/api/v1/tenants", false},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := isTenantOptionalAPI(tt.path, tt.method); got != tt.want {
|
||||
t.Errorf("isTenantOptionalAPI(%s %s) = %v, want %v", tt.method, tt.path, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveFirstMembershipTarget(t *testing.T) {
|
||||
members := newFakeMemberService()
|
||||
members.seedActive("tenantless-user", 42, types.TenantRoleViewer)
|
||||
tenants := &fakeTenantService{tenant: &types.Tenant{ID: 42}}
|
||||
|
||||
got := resolveFirstMembershipTarget(
|
||||
context.Background(),
|
||||
&types.User{ID: "tenantless-user"},
|
||||
members,
|
||||
tenants,
|
||||
)
|
||||
if got != 42 {
|
||||
t.Fatalf("resolved tenant = %d, want 42", got)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user