feat(identity): 接入认证中心多租户登录

支持 Manifest V2 动态 tid 验证、Tenant Context 同步和租户内 JIT 投影,并保留 Manifest V1 与旧 Session 兼容。\n\n增加 tenantHint、租户切换、普通注册关闭及 application/principal/tenant 两级 SSF 撤销;迁移、定向安全测试和本地双租户跨仓 E2E 已通过。\n\nrelease_required=true;未执行 Release、Staging 或真实链路。
This commit is contained in:
2026-07-28 17:28:35 +08:00
parent 0b02e62c72
commit 5c679ff13f
45 changed files with 2986 additions and 139 deletions
@@ -9,6 +9,7 @@ import (
"net/http"
"net/http/httptest"
"testing"
"time"
"github.com/easyai/easyai-ai-gateway/apps/api/internal/auth"
"github.com/easyai/easyai-ai-gateway/apps/api/internal/identity"
@@ -16,10 +17,30 @@ import (
)
type fakeOIDCUserResolver struct {
result store.ResolveOrProvisionOIDCUserResult
result store.ResolveOrProvisionOIDCUserResult
err error
calls int
input store.ResolveOrProvisionOIDCUserInput
binding store.OIDCTenantBindingContext
bindingErr error
bindingCalls int
}
type fakeTenantContextReader struct {
tenant identity.TenantContext
err error
calls int
input store.ResolveOrProvisionOIDCUserInput
calls *int
etag *string
}
func (reader fakeTenantContextReader) Get(_ context.Context, _, etag string) (identity.TenantContext, bool, error) {
if reader.calls != nil {
(*reader.calls)++
}
if reader.etag != nil {
*reader.etag = etag
}
return reader.tenant, false, reader.err
}
func (f *fakeOIDCUserResolver) ResolveOrProvisionOIDCUser(_ context.Context, input store.ResolveOrProvisionOIDCUserInput) (store.ResolveOrProvisionOIDCUserResult, error) {
@@ -28,6 +49,14 @@ func (f *fakeOIDCUserResolver) ResolveOrProvisionOIDCUser(_ context.Context, inp
return f.result, f.err
}
func (f *fakeOIDCUserResolver) OIDCTenantBindingContext(context.Context, string, string, string) (store.OIDCTenantBindingContext, error) {
f.bindingCalls++
if f.binding.ID == "" && f.bindingErr == nil {
return store.OIDCTenantBindingContext{}, store.ErrOIDCTenantUnavailable
}
return f.binding, f.bindingErr
}
func TestResolveGatewayUserAddsLocalOIDCContext(t *testing.T) {
resolver := &fakeOIDCUserResolver{result: store.ResolveOrProvisionOIDCUserResult{User: &auth.User{
ID: "platform-user",
@@ -99,6 +128,203 @@ func TestResolveGatewayUserLeavesNonOIDCIdentityChainsUnchanged(t *testing.T) {
}
}
func TestResolveOIDCMultiTenantProjectionUsesRuntimeTenantContext(t *testing.T) {
tenantID := "d9dcb4e7-6938-4547-af68-10ea404aa4b0"
applicationID := "0a3565fa-c0b0-4862-be20-d3a7b37bb7c8"
resolver := &fakeOIDCUserResolver{result: store.ResolveOrProvisionOIDCUserResult{User: &auth.User{GatewayUserID: "local-user"}}}
server := &Server{oidcUserResolver: resolver}
runtime := &identityRequestRuntime{
Revision: identity.Revision{
Issuer: "https://auth.test.example", ApplicationID: applicationID,
TenantMode: "multi_tenant", JITEnabled: true,
},
TenantContext: fakeTenantContextReader{tenant: identity.TenantContext{
ApplicationID: applicationID, TenantID: tenantID, DisplayName: "租户 A", Slug: "tenant-a",
TenantStatus: "active", TenantApplicationStatus: "active", Version: "v7",
UpdatedAt: time.Date(2026, 7, 28, 9, 0, 0, 0, time.UTC), ETag: `"tenant-v7"`,
}},
}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
_, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "shared-subject", TenantID: tenantID, Username: "alice", Roles: []string{"basic"},
}, runtime)
if err != nil {
t.Fatalf("resolve multi-tenant projection: %v", err)
}
if resolver.input.TenantMode != "multi_tenant" || resolver.input.ApplicationID != applicationID ||
resolver.input.TenantName != "租户 A" || resolver.input.TenantSlug != "tenant-a" ||
resolver.input.TenantMetadataStatus != "synced" || resolver.input.TenantMetadataVersion != "v7" ||
resolver.input.TenantMetadataETag != `"tenant-v7"` {
t.Fatalf("unexpected tenant context projection input: %+v", resolver.input)
}
}
func TestResolveOIDCMultiTenantProjectionTreatsTemporaryContextFailureAsPending(t *testing.T) {
tenantID := "d9dcb4e7-6938-4547-af68-10ea404aa4b0"
resolver := &fakeOIDCUserResolver{result: store.ResolveOrProvisionOIDCUserResult{User: &auth.User{GatewayUserID: "local-user"}}}
server := &Server{oidcUserResolver: resolver}
runtime := &identityRequestRuntime{
Revision: identity.Revision{
Issuer: "https://auth.test.example", ApplicationID: "0a3565fa-c0b0-4862-be20-d3a7b37bb7c8",
TenantMode: "multi_tenant", JITEnabled: true,
},
TenantContext: fakeTenantContextReader{err: identity.ErrTenantContextUnavailable},
}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
if _, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "subject", TenantID: tenantID,
}, runtime); err != nil {
t.Fatalf("temporary tenant context failure should reach fail-closed store projection: %v", err)
}
if resolver.input.TenantMetadataStatus != "metadata_pending" ||
resolver.input.TenantName != "认证中心租户 d9dcb4e7" {
t.Fatalf("unexpected pending projection input: %+v", resolver.input)
}
}
func TestResolveOIDCMultiTenantProjectionUsesFreshLocalTenantCache(t *testing.T) {
tenantID := "d9dcb4e7-6938-4547-af68-10ea404aa4b0"
remoteCalls := 0
resolver := &fakeOIDCUserResolver{
result: store.ResolveOrProvisionOIDCUserResult{User: &auth.User{GatewayUserID: "local-user"}},
binding: store.OIDCTenantBindingContext{
ID: "binding-a", AccessStatus: "active", MetadataStatus: "synced", DisplayName: "缓存租户 A",
Slug: "tenant-a", Version: "v8", ETag: `"tenant-v8"`,
MetadataUpdatedAt: time.Date(2026, 7, 28, 10, 0, 0, 0, time.UTC),
NextSyncAt: time.Now().Add(time.Minute),
},
}
server := &Server{oidcUserResolver: resolver}
runtime := &identityRequestRuntime{
Revision: identity.Revision{
Issuer: "https://auth.test.example", ApplicationID: "0a3565fa-c0b0-4862-be20-d3a7b37bb7c8",
TenantMode: "multi_tenant", JITEnabled: true,
},
TenantContext: fakeTenantContextReader{
err: errors.New("fresh cache must avoid a remote request"), calls: &remoteCalls,
},
}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
if _, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "subject", TenantID: tenantID,
}, runtime); err != nil {
t.Fatal(err)
}
if remoteCalls != 0 || resolver.input.TenantName != "缓存租户 A" ||
resolver.input.TenantMetadataVersion != "v8" {
t.Fatalf("remote calls=%d input=%+v", remoteCalls, resolver.input)
}
}
func TestResolveOIDCMultiTenantProjectionFallsBackToSyncedCacheOnTemporaryFailure(t *testing.T) {
tenantID := "d9dcb4e7-6938-4547-af68-10ea404aa4b0"
resolver := &fakeOIDCUserResolver{
result: store.ResolveOrProvisionOIDCUserResult{User: &auth.User{GatewayUserID: "local-user"}},
binding: store.OIDCTenantBindingContext{
ID: "binding-a", AccessStatus: "active", MetadataStatus: "synced", DisplayName: "缓存租户 A",
Slug: "tenant-a", Version: "v7", ETag: `"tenant-v7"`, NextSyncAt: time.Now().Add(-time.Minute),
},
}
server := &Server{oidcUserResolver: resolver}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
if _, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "subject", TenantID: tenantID,
}, &identityRequestRuntime{
Revision: identity.Revision{
Issuer: "https://auth.test.example", ApplicationID: "0a3565fa-c0b0-4862-be20-d3a7b37bb7c8",
TenantMode: "multi_tenant", JITEnabled: true,
},
TenantContext: fakeTenantContextReader{err: identity.ErrTenantContextUnavailable},
}); err != nil {
t.Fatal(err)
}
if resolver.input.TenantName != "缓存租户 A" || resolver.input.TenantMetadataStatus != "synced" {
t.Fatalf("cached fallback input=%+v", resolver.input)
}
}
func TestResolveOIDCMultiTenantProjectionRevalidatesDisabledBindingBeforeReassignment(t *testing.T) {
tenantID := "d9dcb4e7-6938-4547-af68-10ea404aa4b0"
applicationID := "0a3565fa-c0b0-4862-be20-d3a7b37bb7c8"
remoteETag := "not-called"
resolver := &fakeOIDCUserResolver{
result: store.ResolveOrProvisionOIDCUserResult{User: &auth.User{GatewayUserID: "local-user"}},
binding: store.OIDCTenantBindingContext{
ID: "binding-a", AccessStatus: "disabled", MetadataStatus: "rejected",
ETag: `"revoked-v7"`,
},
}
server := &Server{oidcUserResolver: resolver}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
_, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "subject", TenantID: tenantID,
}, &identityRequestRuntime{
Revision: identity.Revision{
Issuer: "https://auth.test.example", ApplicationID: applicationID,
TenantMode: "multi_tenant", JITEnabled: true,
},
TenantContext: fakeTenantContextReader{tenant: identity.TenantContext{
ApplicationID: applicationID, TenantID: tenantID, DisplayName: "恢复后的租户 A", Slug: "tenant-a",
TenantStatus: "active", TenantApplicationStatus: "active", Version: "v8", UpdatedAt: time.Now(),
}, etag: &remoteETag},
})
if err != nil {
t.Fatalf("revalidate reassigned tenant: %v", err)
}
if remoteETag != "" || resolver.calls != 1 || resolver.input.TenantMetadataStatus != "synced" {
t.Fatalf("etag=%q calls=%d input=%+v", remoteETag, resolver.calls, resolver.input)
}
}
func TestResolveOIDCMultiTenantProjectionKeepsDisabledBindingClosedDuringContextFailure(t *testing.T) {
resolver := &fakeOIDCUserResolver{binding: store.OIDCTenantBindingContext{
ID: "binding-a", AccessStatus: "disabled", MetadataStatus: "rejected",
}}
server := &Server{oidcUserResolver: resolver}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
_, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "subject", TenantID: "d9dcb4e7-6938-4547-af68-10ea404aa4b0",
}, &identityRequestRuntime{
Revision: identity.Revision{
Issuer: "https://auth.test.example", ApplicationID: "0a3565fa-c0b0-4862-be20-d3a7b37bb7c8",
TenantMode: "multi_tenant", JITEnabled: true,
},
TenantContext: fakeTenantContextReader{err: identity.ErrTenantContextUnavailable},
})
if !errors.Is(err, store.ErrOIDCTenantUnavailable) || resolver.calls != 0 {
t.Fatalf("err=%v resolver calls=%d", err, resolver.calls)
}
}
func TestResolveOIDCMultiTenantProjectionRejectsMissingOrInactiveTenant(t *testing.T) {
tenantID := "d9dcb4e7-6938-4547-af68-10ea404aa4b0"
tests := []struct {
name string
reader fakeTenantContextReader
}{
{name: "not found", reader: fakeTenantContextReader{err: identity.ErrTenantContextNotFound}},
{name: "inactive", reader: fakeTenantContextReader{tenant: identity.TenantContext{
TenantStatus: "suspended", TenantApplicationStatus: "active",
}}},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
resolver := &fakeOIDCUserResolver{}
server := &Server{oidcUserResolver: resolver}
request := httptest.NewRequest(http.MethodGet, "/api/v1/me", nil)
_, err := server.resolveOIDCUserProjectionForRuntime(request.Context(), request, &auth.User{
ID: "subject", TenantID: tenantID,
}, &identityRequestRuntime{
Revision: identity.Revision{TenantMode: "multi_tenant"},
TenantContext: test.reader,
})
if !errors.Is(err, store.ErrOIDCTenantUnavailable) || resolver.calls != 0 {
t.Fatalf("err=%v resolver calls=%d", err, resolver.calls)
}
})
}
}
func TestResolveGatewayUserReturnsStructuredErrors(t *testing.T) {
tests := []struct {
name string