RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
test: prepare tenant permission fixtures (#21493)
buua4369ca22393ae5d
diff --git a/internal/agent/component/agent_mcp_test.go b/internal/agent/component/agent_mcp_test.goindex 2b03d3408b..da9c7504c6 100644--- a/internal/agent/component/agent_mcp_test.go+++ b/internal/agent/component/agent_mcp_test.go@@ -11,6 +11,8 @@ import ("ragflow/internal/entity""ragflow/internal/entity/models"mcpclient "ragflow/internal/mcp/client"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/utility""strings""sync/atomic"@@ -89,7 +91,7 @@ func TestAgentMCPModelDispatch(t *testing.T) {state.Sys["tenant_id"] = "tenant"state.Sys["user_id"] = "tenant"state.Sys["canvas_id"] = "canvas"- ctx := withStateForTest(t.Context(), state)+ ctx := permission.WithSubject(withStateForTest(t.Context(), state), permission.Subject{UserID: "tenant", TenantID: "tenant"})p := mergeAgentParam(AgentParam{}, map[string]any{"mcp": []any{map[string]any{"mcp_id": "mcp", "tools": map[string]any{"route": map[string]any{"name": "route", "inputSchema": map[string]any{"type": "object", "properties": map[string]any{"origin": map[string]any{"type": "string"}}, "required": []string{"origin"}}}}}}})tools, err := buildAgentTools(ctx, p)if err != nil {@@ -166,6 +168,7 @@ func TestAgentMCPModelDispatch(t *testing.T) {}state.Sys["user_id"] = "outsider"state.Sys["tenant_id"] = "other-tenant"+ ctx = permission.WithSubject(withStateForTest(t.Context(), state), permission.Subject{UserID: "outsider", TenantID: "other-tenant"})if _, err := buildAgentTools(ctx, p); err == nil {t.Fatal("MCP dependency access without canvas permission was allowed")}@@ -187,7 +190,7 @@ func TestAgentMCPToolNamesDoNotCollide(t *testing.T) {state.Sys["tenant_id"] = "tenant"state.Sys["user_id"] = "tenant"state.Sys["canvas_id"] = "canvas"- ctx := withStateForTest(t.Context(), state)+ ctx := permission.WithSubject(withStateForTest(t.Context(), state), permission.Subject{UserID: "tenant", TenantID: "tenant"})p := AgentParam{Tools: nil, MCP: []any{map[string]any{"mcp_id": "first", "tools": map[string]any{"search": map[string]any{"name": "web_search"}}},map[string]any{"mcp_id": "second", "tools": map[string]any{"search": map[string]any{"name": "web_search"}}},@@ -225,4 +228,7 @@ func addAgentMCPPermissionFixtures(t *testing.T, db *gorm.DB) {}).Error; err != nil {t.Fatalf("create canvas permission fixture: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant", "tenant"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }}diff --git a/internal/agent/component/production_chain_fixes_test.go b/internal/agent/component/production_chain_fixes_test.goindex 595e0d5e6e..7752c3001c 100644--- a/internal/agent/component/production_chain_fixes_test.go+++ b/internal/agent/component/production_chain_fixes_test.go@@ -41,6 +41,8 @@ import (agenttool "ragflow/internal/agent/tool""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport")type codeExecSandboxRecorder struct {@@ -247,6 +249,9 @@ func TestRetrieval_LegacyQueryStringNormalized(t *testing.T) {}).Error; err != nil {t.Fatalf("failed to seed user_tenant: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }if err = db.Create(&entity.Knowledgebase{ID: "kb-da1",@@ -270,7 +275,9 @@ func TestRetrieval_LegacyQueryStringNormalized(t *testing.T) {})state := runtime.NewCanvasState("run-1", "task-1")state.Sys["user_id"] = "user-1"- normalizeLegacyRetrievalInputs(runtime.WithState(t.Context(), state), db, merged)+ state.Sys["tenant_id"] = "tenant-1"+ ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})+ normalizeLegacyRetrievalInputs(ctx, db, merged)if got, _ := merged["query"].(string); got != "diamond necklace" {t.Fatalf("query = %q, want diamond necklace", got)@@ -309,6 +316,9 @@ func TestRetrieval_StructuredUserFillInputNormalized(t *testing.T) {}).Error; err != nil {t.Fatalf("failed to seed user_tenant: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }if err = db.Create(&entity.Knowledgebase{ID: "kb-da1",Name: "da1",@@ -336,7 +346,9 @@ func TestRetrieval_StructuredUserFillInputNormalized(t *testing.T) {})state := runtime.NewCanvasState("run-1", "task-1")state.Sys["user_id"] = "user-1"- normalizeLegacyRetrievalInputs(runtime.WithState(t.Context(), state), db, merged)+ state.Sys["tenant_id"] = "tenant-1"+ ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})+ normalizeLegacyRetrievalInputs(ctx, db, merged)if got, _ := merged["query"].(string); got != "合同" {t.Fatalf("query = %q, want 合同", got)@@ -377,8 +389,12 @@ func TestRetrieval_ResolveDatasetIDByTenantName(t *testing.T) {}state := runtime.NewCanvasState("run-1", "task-1")+ state.Sys["user_id"] = "tenant-1"state.Sys["tenant_id"] = "tenant-1"- ctx := runtime.WithState(t.Context(), state)+ ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "tenant-1", TenantID: "tenant-1"})+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "tenant-1"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }if got := resolveRetrievalDatasetID(ctx, db, "da1"); got != "kb-da1" {t.Fatalf("resolveRetrievalDatasetID = %q, want kb-da1", got)@@ -425,10 +441,13 @@ func TestRetrieval_ResolveDatasetIDByUserPermission(t *testing.T) {if err := db.Create(&memberships).Error; err != nil {t.Fatalf("failed to seed memberships: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "owner", "member"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }state := runtime.NewCanvasState("run-1", "task-1")state.Sys["user_id"] = "member"- ctx := runtime.WithState(t.Context(), state)+ ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "member", TenantID: "tenant-1"})if got := resolveRetrievalDatasetID(ctx, db, "named-dataset"); got != tc.wantID {t.Fatalf("resolveRetrievalDatasetID = %q, want %q", got, tc.wantID)}diff --git a/internal/agent/component/retrieval_permission_test.go b/internal/agent/component/retrieval_permission_test.goindex 76593d6db4..d7bb7891b3 100644--- a/internal/agent/component/retrieval_permission_test.go+++ b/internal/agent/component/retrieval_permission_test.go@@ -8,6 +8,7 @@ import ("ragflow/internal/agent/runtime""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""github.com/glebarez/sqlite""gorm.io/gorm"@@ -29,7 +30,7 @@ func TestCheckCanvasRetrievalDependencies(t *testing.T) {Permission: string(entity.TenantPermissionTeam), Status: &valid,}privateDataset := entity.Knowledgebase{- ID: "private-dataset", TenantID: "other-owner", CreatedBy: "other-owner",+ ID: "private-dataset", TenantID: "canvas-owner", CreatedBy: "other-owner",Permission: string(entity.TenantPermissionMe), Status: &valid,}sharedMemory := entity.Memory{@@ -37,7 +38,7 @@ func TestCheckCanvasRetrievalDependencies(t *testing.T) {Permissions: string(entity.TenantPermissionTeam),}callerOnlyMemory := entity.Memory{- ID: "caller-only-memory", Name: "Caller only", TenantID: "caller",+ ID: "caller-only-memory", Name: "Caller only", TenantID: "canvas-owner",Permissions: string(entity.TenantPermissionMe),}ownerOnlyMemory := entity.Memory{@@ -59,11 +60,15 @@ func TestCheckCanvasRetrievalDependencies(t *testing.T) {t.Fatalf("create membership: %v", err)}}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "canvas-owner", "canvas-owner", "caller", "other-owner"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }state := runtime.NewCanvasState("run-1", "session-1")state.Sys["canvas_id"] = canvas.IDstate.Sys["user_id"] = "caller"- ctx := runtime.WithState(t.Context(), state)+ state.Sys["tenant_id"] = "canvas-owner"+ ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "caller", TenantID: "canvas-owner"})if err := checkCanvasRetrievalDependencies(ctx, db, map[string]any{"dataset_ids": []string{dataset.ID}}); err != nil {t.Fatalf("check accessible dataset dependency: %v", err)diff --git a/internal/agent/tool/retrieval_nlp_test.go b/internal/agent/tool/retrieval_nlp_test.goindex 605f6f81a9..40e14953dd 100644--- a/internal/agent/tool/retrieval_nlp_test.go+++ b/internal/agent/tool/retrieval_nlp_test.go@@ -36,6 +36,7 @@ import ("ragflow/internal/entity"modelModule "ragflow/internal/entity/models""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service/nlp""github.com/glebarez/sqlite"@@ -438,6 +439,9 @@ func TestNLPRetrievalAdapter_SearchRequiresDatasetUsePermission(t *testing.T) {if err := db.Create(&memberships).Error; err != nil {t.Fatalf("create memberships: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "owner", "member"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }adapter := &NLPRetrievalAdapter{svc: &nlp.RetrievalService{},@@ -445,7 +449,8 @@ func TestNLPRetrievalAdapter_SearchRequiresDatasetUsePermission(t *testing.T) {}state := runtime.NewCanvasState("run-1", "session-1")state.Sys["user_id"] = "member"- ctx := runtime.WithState(t.Context(), state)+ state.Sys["tenant_id"] = "tenant-1"+ ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "member", TenantID: "tenant-1"})_, err = adapter.Search(ctx, db, RetrievalRequest{Query: "hello", DatasetIDs: []string{dataset.ID}, UserID: "owner",})diff --git a/internal/handler/agent_logs_test.go b/internal/handler/agent_logs_test.goindex 660907e9be..ba5aa184c9 100644--- a/internal/handler/agent_logs_test.go+++ b/internal/handler/agent_logs_test.go@@ -35,6 +35,8 @@ import ("ragflow/internal/entity"pipelinepkg "ragflow/internal/ingestion/pipeline""ragflow/internal/ingestion/task"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -118,6 +120,10 @@ func TestGetAgentLogs_E2EViaMiniredis(t *testing.T) {orig := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = orig })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {+ t.Fatalf("prepare agent log permission fixture: %v", err)+ }+ ctx = permission.WithSubject(ctx, permission.Subject{UserID: "u1", TenantID: "u1"})db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")})@@ -148,6 +154,7 @@ func TestGetAgentLogs_E2EViaMiniredis(t *testing.T) {w := httptest.NewRecorder()c, _ := gin.CreateTestContext(w)c.Request = httptest.NewRequest("GET", "/api/v1/agents/c1/logs/"+messageID, nil)+ c.Request = c.Request.WithContext(ctx)c.Set("user", &entity.User{ID: "u1"})c.Set("user_id", "u1")c.Params = gin.Params{@@ -231,6 +238,10 @@ func TestGetAgentLogs_EndSignalCompletion(t *testing.T) {orig := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = orig })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {+ t.Fatalf("prepare agent log permission fixture: %v", err)+ }+ ctx = permission.WithSubject(ctx, permission.Subject{UserID: "u1", TenantID: "u1"})db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")})@@ -272,6 +283,7 @@ func TestGetAgentLogs_EndSignalCompletion(t *testing.T) {w := httptest.NewRecorder()c, _ := gin.CreateTestContext(w)c.Request = httptest.NewRequest("GET", "/api/v1/agents/c1/logs/"+messageID, nil)+ c.Request = c.Request.WithContext(ctx)c.Set("user", &entity.User{ID: "u1"})c.Set("user_id", "u1")c.Params = gin.Params{@@ -597,6 +609,10 @@ func TestRunCanvasPipelineDebug_WriteThenReadViaMiniredis(t *testing.T) {orig := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = orig })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {+ t.Fatalf("prepare agent log permission fixture: %v", err)+ }+ ctx = permission.WithSubject(ctx, permission.Subject{UserID: "u1", TenantID: "u1"})db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")})mr, err := miniredis.Run()@@ -641,6 +657,7 @@ func TestRunCanvasPipelineDebug_WriteThenReadViaMiniredis(t *testing.T) {w := httptest.NewRecorder()c, _ := gin.CreateTestContext(w)c.Request = httptest.NewRequest("GET", "/api/v1/agents/c1/logs/"+messageID, nil)+ c.Request = c.Request.WithContext(ctx)c.Set("user", &entity.User{ID: "u1"})c.Set("user_id", "u1")c.Params = gin.Params{diff --git a/internal/handler/agent_test.go b/internal/handler/agent_test.goindex 5233c25917..1b25003ed6 100644--- a/internal/handler/agent_test.go+++ b/internal/handler/agent_test.go@@ -36,6 +36,7 @@ import ("ragflow/internal/dao""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service""ragflow/internal/tokenizer")@@ -74,11 +75,17 @@ func setupGinContextWithUserAndDB(t *testing.T, method, path string) (*gin.Contec.Request = httptest.NewRequest(method, path, nil)c.Set("user", &entity.User{ID: "user-1"})c.Set("user_id", "user-1")+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{+ UserID: "user-1", TenantID: "user-1",+ }))db := setupHandlerAgentsTestDB(t)orig := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = orig })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "user-1", "user-1"); err != nil {+ t.Fatalf("prepare agent permission fixture: %v", err)+ }return c, w, db}@@ -158,12 +165,17 @@ func TestListAgentVersionsHandler_NoPermission(t *testing.T) {w := httptest.NewRecorder()c, _ := gin.CreateTestContext(w)c.Request = httptest.NewRequest("GET", "/api/v1/agents/canvas-b/versions", nil)+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "user-a", "user-a"); err != nil {+ t.Fatalf("prepare agent permission fixture: %v", err)+ }+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-a", TenantID: "user-a"}))c.Set("user", &entity.User{ID: "user-a"})c.Set("user_id", "user-a")c.Params = gin.Params{{Key: "canvas_id", Value: "canvas-b"}}// Canvas owned by user-b- db.Create(&entity.UserCanvas{ID: "canvas-b", UserID: "user-b", Title: sptr("Not Yours")})+ tenantID := "user-a"+ db.Create(&entity.UserCanvas{ID: "canvas-b", UserID: "user-b", TenantID: &tenantID, Title: sptr("Not Yours")})ctx := t.Context()h := NewAgentHandler(ctx, service.NewAgentService(), nil)@@ -192,6 +204,10 @@ func TestListAgentVersionsHandler_CanvasNotFound(t *testing.T) {w := httptest.NewRecorder()c, _ := gin.CreateTestContext(w)c.Request = httptest.NewRequest("GET", "/api/v1/agents/non-existent/versions", nil)+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "user-1", "user-1"); err != nil {+ t.Fatalf("prepare agent permission fixture: %v", err)+ }+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))c.Set("user", &entity.User{ID: "user-1"})c.Set("user_id", "user-1")c.Params = gin.Params{{Key: "canvas_id", Value: "non-existent"}}@@ -344,9 +360,6 @@ func seedAgentCreationContext(t *testing.T, c *gin.Context, db *gorm.DB) {t.Fatalf("migrate tenant table: %v", err)}active := string(entity.StatusValid)- if err := db.Create(&entity.User{ID: "user-1", Email: "[email protected]", Nickname: "user-1"}).Error; err != nil {- t.Fatalf("create authenticated user: %v", err)- }if err := db.Create(&entity.Tenant{ID: "tenant-1", Status: &active}).Error; err != nil {t.Fatalf("create active tenant: %v", err)}@@ -355,13 +368,13 @@ func seedAgentCreationContext(t *testing.T, c *gin.Context, db *gorm.DB) {}).Error; err != nil {t.Fatalf("create active tenant membership: %v", err)}- for _, statement := range []string{- `CREATE TABLE permission (+ for table, statement := range map[string]string{+ "permission": `CREATE TABLE permission (id TEXT PRIMARY KEY, member_id TEXT, group_id TEXT, tenant_id TEXT NOT NULL,resource_type TEXT NOT NULL, resource_id TEXT, permission INTEGER NOT NULL DEFAULT 0,status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME)`,- `CREATE TABLE permission_change_log (+ "permission_change_log": `CREATE TABLE permission_change_log (id TEXT PRIMARY KEY, tenant_id TEXT NOT NULL, operator_id TEXT NOT NULL,target_type TEXT NOT NULL, target_id TEXT NOT NULL, resource_type TEXT NOT NULL,resource_id TEXT NOT NULL, old_permission INTEGER NOT NULL DEFAULT 0,@@ -371,6 +384,9 @@ func seedAgentCreationContext(t *testing.T, c *gin.Context, db *gorm.DB) {status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME)`,} {+ if db.Migrator().HasTable(table) {+ continue+ }if err := db.Exec(statement).Error; err != nil {t.Fatalf("create Agent permission test table: %v", err)}diff --git a/internal/handler/agent_version_test.go b/internal/handler/agent_version_test.goindex e7d80b4e1f..0f7d058790 100644--- a/internal/handler/agent_version_test.go+++ b/internal/handler/agent_version_test.go@@ -47,9 +47,6 @@ func TestAgentVersionActions(t *testing.T) {}c, w, db := setupGinContextWithUserAndDB(t, action.method, path)c.Params = gin.Params{{Key: "canvas_id", Value: "canvas-1"}, {Key: "version_id", Value: "version-1"}}- if err := db.Create(&entity.User{ID: "user-1", Nickname: "owner", Email: "[email protected]"}).Error; err != nil {- t.Fatal(err)- }current := entity.UserCanvas{ID: "canvas-1", UserID: "user-1", Title: sptr("Current Agent"),Description: sptr("Current description"), Tags: "keep", Release: true,diff --git a/internal/handler/agent_webhook_trace_test.go b/internal/handler/agent_webhook_trace_test.goindex 5517bed7db..b0d6fefdd3 100644--- a/internal/handler/agent_webhook_trace_test.go+++ b/internal/handler/agent_webhook_trace_test.go@@ -33,6 +33,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -58,6 +60,9 @@ func newWebhookTraceTestHandler(t *testing.T) (*AgentHandler, *goredis.Client) {originalDB := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = originalDB })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {+ t.Fatalf("prepare webhook trace permission fixture: %v", err)+ }if err := db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")}).Error; err != nil {t.Fatalf("create agent: %v", err)}@@ -92,6 +97,16 @@ func requestWebhookTrace(t *testing.T, h *AgentHandler, canvasID, userID string,w := httptest.NewRecorder()c, _ := gin.CreateTestContext(w)c.Request = httptest.NewRequest("GET", path, nil)+ var user entity.User+ if err := dao.DB.Where("id = ?", userID).FirstOrCreate(&user, entity.User{ID: userID}).Error; err != nil {+ t.Fatalf("ensure webhook trace caller: %v", err)+ }+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, "u1", userID, "u1"); err != nil {+ t.Fatalf("prepare webhook trace caller permission: %v", err)+ }+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{+ UserID: userID, TenantID: "u1",+ }))c.Set("user", &entity.User{ID: userID})c.Set("user_id", userID)c.Params = gin.Params{{Key: "canvas_id", Value: canvasID}}diff --git a/internal/handler/chat_audio_test.go b/internal/handler/chat_audio_test.goindex 238889d572..6e2bff60ab 100644--- a/internal/handler/chat_audio_test.go+++ b/internal/handler/chat_audio_test.go@@ -14,6 +14,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -36,6 +38,7 @@ func TestChatAudioSpeechFailureOmitsProviderError(t *testing.T) {t.Fatalf("failed to open sqlite: %v", err)}if err = db.AutoMigrate(+ &entity.User{},&entity.Tenant{},&entity.UserTenant{},&entity.TenantModel{},@@ -69,6 +72,9 @@ func TestChatAudioSpeechFailureOmitsProviderError(t *testing.T) {}).Error; err != nil {t.Fatalf("failed to create tenant owner membership: %v", err)}+ if err = testsupport.PrepareEnterprisePermissionFixture(db, "user-1", "user-1"); err != nil {+ t.Fatalf("prepare chat audio permission fixture: %v", err)+ }if err = db.Create(&entity.TenantModel{ID: ttsModelID,ModelName: "FunAudioLLM/CosyVoice2-0.5B",@@ -103,6 +109,7 @@ func TestChatAudioSpeechFailureOmitsProviderError(t *testing.T) {h.SetMindMapDependencies(nil, nil, service.NewModelFactory(), nil)c, w := setupGinContextWithUser(http.MethodPost, "/api/v1/chat/audio/speech", `{"text":"hello"}`)+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))h.ChatAudioSpeech(c)body := w.Body.String()diff --git a/internal/handler/chat_test.go b/internal/handler/chat_test.goindex f62776c05d..3b7b2b67cd 100644--- a/internal/handler/chat_test.go+++ b/internal/handler/chat_test.go@@ -12,6 +12,7 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -47,6 +48,9 @@ func setupChatHandlerTestDB(t *testing.T) *gorm.DB {}).Error; err != nil {t.Fatalf("failed to create owner membership: %v", err)}+ if err = testsupport.PrepareEnterprisePermissionFixture(db, "user-1", "user-1"); err != nil {+ t.Fatalf("prepare chat permission fixture: %v", err)+ }return db}@@ -175,9 +179,13 @@ func TestPatchChatHandlerSuccess(t *testing.T) {func TestUpdateChatHandlerRejectsNonOwner(t *testing.T) {db := setupChatHandlerTestDB(t)createChatHandlerTestChat(t, db, "chat-1", "tenant-2")+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-2", "tenant-2", "user-1"); err != nil {+ t.Fatalf("prepare non-owner chat permission fixture: %v", err)+ }h := NewChatHandler(service.NewChatService(), service.NewUserService())c, w := setupGinContextWithUser("PUT", "/api/v1/chats/chat-1", `{"name":"updated"}`)+ setGinContextSubject(c, "user-1", "tenant-2")c.Params = []gin.Param{{Key: "chat_id", Value: "chat-1"}}h.UpdateChat(c)diff --git a/internal/handler/compilation_status_test.go b/internal/handler/compilation_status_test.goindex 486390c7f1..a5fb797350 100644--- a/internal/handler/compilation_status_test.go+++ b/internal/handler/compilation_status_test.go@@ -29,6 +29,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport"dataset "ragflow/internal/service/dataset")@@ -48,6 +50,7 @@ func setupCompilationStatusHandlerDB(t *testing.T) *gorm.DB {&entity.KnowledgeCompileBacklog{},&entity.KnowledgeCompileInflight{},&entity.UserTenant{},+ &entity.User{},); err != nil {t.Fatalf("failed to migrate test schema: %v", err)}@@ -83,6 +86,9 @@ func insertCompilationStatusHandlerKB(t *testing.T, kbID, ownerID string) {}).Error; err != nil {t.Fatalf("insert tenant owner: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, ownerID, ownerID); err != nil {+ t.Fatalf("prepare compilation permission fixture: %v", err)+ }}func newCompilationStatusHandlerRouter() *gin.Engine {@@ -91,6 +97,7 @@ func newCompilationStatusHandlerRouter() *gin.Engine {r := gin.New()r.GET("/api/v1/datasets/:dataset_id/compilation/status", func(c *gin.Context) {c.Set("user", &entity.User{ID: "user-1"})+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))h.GetCompilationStatus(c)})return r@@ -207,11 +214,12 @@ func TestCompilationStatusHandler_FullOutput(t *testing.T) {// dataset is rejected with the standardized forbidden response.func TestCompilationStatusHandler_Unauthorized(t *testing.T) {db := setupCompilationStatusHandlerDB(t)- // KB is owned by user-1; the router sets user to user-1, so this test must- // exercise the case where the KB belongs to a different owner. We insert the- // KB under a different owner tenant than the request user by re-pointing the- // KB owner to "other-owner".+ // Keep the dataset in another tenant so this test exercises a real+ // cross-tenant denial.insertCompilationStatusHandlerKB(t, "kb-status-forbidden", "other-owner")+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "other-owner", "other-owner"); err != nil {+ t.Fatalf("prepare dataset tenant permission fixture: %v", err)+ }if err := db.Create(&entity.KnowledgeCompileDataset{DatasetID: "kb-status-forbidden",TenantID: "other-owner",diff --git a/internal/handler/dataset_artifact_topn_test.go b/internal/handler/dataset_artifact_topn_test.goindex 52e3b979d7..da8152cb36 100644--- a/internal/handler/dataset_artifact_topn_test.go+++ b/internal/handler/dataset_artifact_topn_test.go@@ -30,6 +30,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport"dataset "ragflow/internal/service/dataset")@@ -86,6 +88,9 @@ func insertArtifactGraphKB(t *testing.T, db *gorm.DB, kbID, ownerID string) {}).Error; err != nil {t.Fatalf("insert knowledgebase: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, ownerID, ownerID); err != nil {+ t.Fatalf("prepare artifact graph permission fixture: %v", err)+ }}// artifactGraphResponse mirrors the JSON envelope produced by@@ -106,7 +111,7 @@ func callGetArtifactGraph(t *testing.T, datasetID, query string) (int, artifactGw := httptest.NewRecorder()req := httptest.NewRequest(http.MethodGet, "/api/v1/datasets/"+datasetID+"/artifacts/graph"+query, nil)c, _ := gin.CreateTestContext(w)- c.Request = req+ c.Request = req.WithContext(permission.WithSubject(req.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))c.Set("user", &entity.User{ID: "user-1"})c.Params = gin.Params{{Key: "dataset_id", Value: datasetID}}h := &DatasetArtifactHandler{diff --git a/internal/handler/dataset_list_test.go b/internal/handler/dataset_list_test.goindex c5c413eada..eda0a1fa6f 100644--- a/internal/handler/dataset_list_test.go+++ b/internal/handler/dataset_list_test.go@@ -15,6 +15,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport"dataset "ragflow/internal/service/dataset")@@ -72,6 +74,9 @@ func insertListDatasetsTestKB(t *testing.T, id, tenantID, name string) {if err := dao.DB.Create(kb).Error; err != nil {t.Fatalf("insert test kb: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, tenantID); err != nil {+ t.Fatalf("prepare dataset list permission fixture: %v", err)+ }}func newListDatasetsTestRouter() *gin.Engine {@@ -80,6 +85,7 @@ func newListDatasetsTestRouter() *gin.Engine {r := gin.New()r.GET("/api/v1/datasets", func(c *gin.Context) {c.Set("user", &entity.User{ID: "user-1"})+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))h.ListDatasets(c)})return rdiff --git a/internal/handler/document_test.go b/internal/handler/document_test.goindex 033396d5e2..013fbc73c0 100644--- a/internal/handler/document_test.go+++ b/internal/handler/document_test.go@@ -37,6 +37,7 @@ import ("ragflow/internal/dao""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service"dataset "ragflow/internal/service/dataset""ragflow/internal/service/document"@@ -102,6 +103,7 @@ func TestDocumentMetadataBatchRejectsNonStringIDs(t *testing.T) {t.Run(tt.method, func(t *testing.T) {c, w := setupGinContextWithUser(tt.method, tt.path, `{"selector":{"document_ids":[123]}}`)c.Params = gin.Params{{Key: "dataset_id", Value: "kb-owner"}}+ setGinContextSubject(c, "user-1", "tenant-owner")tt.handler(c)if w.Code != http.StatusOK {t.Fatalf("status = %d, want 200: %s", w.Code, w.Body.String())@@ -370,11 +372,30 @@ func setupGinContextWithUser(method, path, body string) (*gin.Context, *httptestreq.Header.Set("Content-Type", "application/json")c, _ := gin.CreateTestContext(w)c.Request = req+ setGinContextSubject(c, "user-1", "user-1")c.Set("user", &entity.User{ID: "user-1"})c.Set("user_id", "user-1")return c, w}+func setupGinContextWithUserInTenant(method, path, body, userID, tenantID string) (*gin.Context, *httptest.ResponseRecorder) {+ c, w := setupGinContextWithUser(method, path, body)+ setGinContextSubject(c, userID, tenantID)+ return c, w+}++func setupHandlerAccessContext(method, path, body string) (*gin.Context, *httptest.ResponseRecorder) {+ c, w := setupGinContextWithUser(method, path, body)+ setGinContextSubject(c, "user-1", "tenant-1")+ return c, w+}++func setGinContextSubject(c *gin.Context, userID, tenantID string) {+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{+ UserID: userID, TenantID: tenantID,+ }))+}+func setupDocumentPermissionDB(t *testing.T, accessible bool) {t.Helper()@@ -385,6 +406,7 @@ func setupDocumentPermissionDB(t *testing.T, accessible bool) {t.Fatalf("failed to open sqlite: %v", err)}if err := db.AutoMigrate(+ &entity.User{},&entity.Knowledgebase{},&entity.UserTenant{},&entity.Document{},@@ -428,6 +450,15 @@ func setupDocumentPermissionDB(t *testing.T, accessible bool) {t.Fatalf("insert user_tenant: %v", err)}}+ members := []string{"owner-user"}+ if accessible {+ members = append(members, "user-1")+ } else if err := db.Create(&entity.User{ID: "user-1", Nickname: "user-1", Email: "[email protected]"}).Error; err != nil {+ t.Fatalf("insert non-member user: %v", err)+ }+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-owner", members...); err != nil {+ t.Fatalf("prepare document permission fixture: %v", err)+ }orig := dao.DBdao.DB = db@@ -504,6 +535,7 @@ func TestDeleteDocumentHandler_NotAccessible(t *testing.T) {c, w := setupGinContextWithUser("DELETE", "/api/v1/documents/doc-1", "")c.Params = gin.Params{{Key: "id", Value: "doc-1"}}+ setGinContextSubject(c, "user-1", "tenant-owner")h.DeleteDocument(c)if w.Code != http.StatusOK {@@ -537,6 +569,7 @@ func TestDeleteDocumentHandler_Accessible(t *testing.T) {c, w := setupGinContextWithUser("DELETE", "/api/v1/documents/doc-1", "")c.Params = gin.Params{{Key: "id", Value: "doc-1"}}+ setGinContextSubject(c, "user-1", "tenant-owner")h.DeleteDocument(c)if w.Code != http.StatusOK {@@ -570,6 +603,7 @@ func TestUpdateDocumentHandler_NotAccessible(t *testing.T) {c, w := setupGinContextWithUser("PUT", "/api/v1/documents/doc-1", `{"name":"blocked"}`)c.Params = gin.Params{{Key: "id", Value: "doc-1"}}+ setGinContextSubject(c, "user-1", "tenant-owner")h.UpdateDocument(c)if w.Code != http.StatusOK {@@ -603,6 +637,7 @@ func TestUpdateDocumentHandler_Accessible(t *testing.T) {c, w := setupGinContextWithUser("PUT", "/api/v1/documents/doc-1", `{"name":"allowed"}`)c.Params = gin.Params{{Key: "id", Value: "doc-1"}}+ setGinContextSubject(c, "user-1", "tenant-owner")h.UpdateDocument(c)if w.Code != http.StatusOK {@@ -638,6 +673,7 @@ func TestUpdateDocumentHandler_ValidationError(t *testing.T) {c, w := setupGinContextWithUser("PUT", "/api/v1/documents/doc-1", `{"progress":0.5}`)c.Params = gin.Params{{Key: "id", Value: "doc-1"}}+ setGinContextSubject(c, "user-1", "tenant-owner")h.UpdateDocument(c)if w.Code != http.StatusOK {@@ -670,6 +706,7 @@ func TestUpdateDocumentHandler_ServerError(t *testing.T) {c, w := setupGinContextWithUser("PUT", "/api/v1/documents/doc-1", `{"name":"new.pdf"}`)c.Params = gin.Params{{Key: "id", Value: "doc-1"}}+ setGinContextSubject(c, "user-1", "tenant-owner")h.UpdateDocument(c)if w.Code != http.StatusInternalServerError {@@ -760,6 +797,7 @@ func setupUploadContext(t *testing.T, path string, fields map[string]string, filreq.Header.Set("Content-Type", writer.FormDataContentType())c, _ := gin.CreateTestContext(w)c.Request = req+ setGinContextSubject(c, "user-1", "tenant-1")c.Set("user", &entity.User{ID: "user-1"})c.Set("user_id", "user-1")c.Params = gin.Params{{Key: "dataset_id", Value: uploadTestDatasetID}}@@ -815,6 +853,9 @@ func TestUploadDocumentsHandler_LocalUsesFullKBAndIgnoresBadParserConfig(t *testorig := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = orig })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1", "owner-1"); err != nil {+ t.Fatalf("prepare upload permission fixture: %v", err)+ }fake := &fakeDocumentService{uploadLocalData: []map[string]interface{}{@@ -855,6 +896,9 @@ func TestUploadDocumentsHandler_LocalReturnsPartialSuccess(t *testing.T) {orig := dao.DBdao.DB = dbt.Cleanup(func() { dao.DB = orig })+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1", "owner-1"); err != nil {+ t.Fatalf("prepare upload permission fixture: %v", err)+ }fake := &fakeDocumentService{uploadLocalData: []map[string]interface{}{@@ -1269,6 +1313,9 @@ func setupHandlerAccessDB(t *testing.T) *gorm.DB {ID: "doc-1", KbID: "ds-1", ParserID: "naive", ParserConfig: entity.JSONMap{},CreatedBy: "user-1", Type: "pdf", Suffix: "pdf", Status: sptr(string(entity.StatusValid)),})+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1", "owner-1"); err != nil {+ t.Fatalf("prepare document handler permission fixture: %v", err)+ }return db}@@ -1297,7 +1344,7 @@ func TestListDocumentsHandler_FilterRequestUsesQueryFilters(t *testing.T) {datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents?type=filter&keywords=report&suffix=pdf&run=COMPLETED&types=doc&desc=false", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents?type=filter&keywords=report&suffix=pdf&run=COMPLETED&types=doc&desc=false", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1349,7 +1396,7 @@ func TestListDocumentsRejectsInvalidRunFilter(t *testing.T) {}for _, invalid := range []string{"1", "DONE", "CANCEL", "FAIL", "SCHEDULE"} {- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents?run="+invalid, "user-1")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents?run="+invalid, "user-1")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1396,7 +1443,7 @@ func TestListDocumentsHandlerReturnsScheduledIngestionStatus(t *testing.T) {documentService: fake,datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1444,7 +1491,7 @@ func TestListDocumentsHandlerReturnsUnstartWhenNoIngestionTask(t *testing.T) {documentService: fake,datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1496,7 +1543,7 @@ func TestListDocumentsHandlerReturnsHasActiveTasks(t *testing.T) {documentService: fake,datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1543,7 +1590,7 @@ func TestListDocumentsHandlerReturnsHasActiveTasksFalse(t *testing.T) {documentService: fake,datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1590,7 +1637,7 @@ func TestListDocumentsHandlerKeepsPollingWhenActiveTaskCheckFails(t *testing.T)documentService: fake,datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1632,7 +1679,7 @@ func TestListDocumentsHandler_MetadataFilterNarrowsDocumentIDs(t *testing.T) {datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/documents?metadata[author][]=Alice", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/documents?metadata[author][]=Alice", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.ListDocuments(c)@@ -1664,7 +1711,7 @@ func TestStopParseDocumentsHandler_Success(t *testing.T) {datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("POST", "/api/v1/datasets/ds-1/documents/stop", `{"document_ids": ["doc-1"]}`)+ c, w := setupHandlerAccessContext("POST", "/api/v1/datasets/ds-1/documents/stop", `{"document_ids": ["doc-1"]}`)c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.StopParseDocuments(c)@@ -1700,7 +1747,7 @@ func TestStopParseDocumentsHandler_ServiceError(t *testing.T) {datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("POST", "/api/v1/datasets/ds-1/documents/stop", `{"document_ids": ["doc-1"]}`)+ c, w := setupHandlerAccessContext("POST", "/api/v1/datasets/ds-1/documents/stop", `{"document_ids": ["doc-1"]}`)c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.StopParseDocuments(c)@@ -1843,7 +1890,7 @@ func TestMetadataSummaryByDataset_Success(t *testing.T) {datasetService: dataset.NewDatasetService(),}- c, w := setupGinContextWithUser("GET", "/api/v1/datasets/ds-1/metadata/summary?doc_ids=doc-1,doc-2", "")+ c, w := setupHandlerAccessContext("GET", "/api/v1/datasets/ds-1/metadata/summary?doc_ids=doc-1,doc-2", "")c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}h.MetadataSummaryByDataset(c)@@ -2168,6 +2215,7 @@ func downloadContextAs(userID, datasetID, docID string) (*gin.Context, *httptestc.Request = httptest.NewRequest("GET", "/api/v1/datasets/"+datasetID+"/documents/"+docID, nil)c.Set("user", &entity.User{ID: userID})c.Set("user_id", userID)+ setGinContextSubject(c, userID, "tenant-1")c.Params = gin.Params{{Key: "dataset_id", Value: datasetID}, {Key: "document_id", Value: docID}}return c, w}diff --git a/internal/handler/file_commit_test.go b/internal/handler/file_commit_test.goindex ff893fd5fd..2d268ed989 100644--- a/internal/handler/file_commit_test.go+++ b/internal/handler/file_commit_test.go@@ -27,6 +27,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""github.com/gin-gonic/gin""github.com/glebarez/sqlite"@@ -160,7 +162,7 @@ func setupFileCommitTestWithHandler(userID string) (*gin.Engine, *mockFileCommitif err != nil {panic(err)}- if err := db.AutoMigrate(&entity.File{}, &entity.File2Document{}, &entity.Document{}, &entity.UserTenant{}); err != nil {+ if err := db.AutoMigrate(&entity.File{}, &entity.File2Document{}, &entity.Document{}, &entity.User{}, &entity.UserTenant{}); err != nil {panic(err)}dao.DB = db@@ -173,12 +175,15 @@ func setupFileCommitTestWithHandler(userID string) (*gin.Engine, *mockFileCommitpanic(err)}}- seed(&entity.File{ID: "folder-1", TenantID: userID, Name: "workspace", Type: "folder"})- seed(&entity.File{ID: "f1", TenantID: userID, Name: "test.txt", Type: "file"})+ seed(&entity.File{ID: "folder-1", TenantID: userID, CreatedBy: userID, Name: "workspace", Type: "folder"})+ seed(&entity.File{ID: "f1", TenantID: userID, CreatedBy: userID, Name: "test.txt", Type: "file"})// The mirrored /datasets/{dataset_id}/commits test route maps dataset_id// straight onto folder_id, so seed kb-1 as a folder the user owns to pass// the folder authorization main added.- seed(&entity.File{ID: "kb-1", TenantID: userID, Name: "kb-1", Type: "folder"})+ seed(&entity.File{ID: "kb-1", TenantID: userID, CreatedBy: userID, Name: "kb-1", Type: "folder"})+ if err := testsupport.PrepareEnterprisePermissionFixture(db, userID, userID); err != nil {+ panic(err)+ }gin.SetMode(gin.TestMode)r := fileCommitRouter(h, userID)@@ -189,6 +194,7 @@ func fileCommitRouter(h *FileCommitHandler, userID string) *gin.Engine {r := gin.New()r.Use(func(c *gin.Context) {c.Set("user", &entity.User{ID: userID})+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: userID, TenantID: userID}))})r.POST("/api/v1/folders/:folder_id/commits", h.CreateCommit)r.GET("/api/v1/folders/:folder_id/commits", h.ListCommits)diff --git a/internal/handler/ingestion_messages_test.go b/internal/handler/ingestion_messages_test.goindex 623e2d98ed..68b81444d8 100644--- a/internal/handler/ingestion_messages_test.go+++ b/internal/handler/ingestion_messages_test.go@@ -14,6 +14,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport"dataset "ragflow/internal/service/dataset")@@ -150,6 +152,7 @@ func newIngestionMessagesHandlerRouter() *gin.Engine {r := gin.New()r.GET("/api/v1/datasets/:dataset_id/ingestions/:log_id/messages", func(c *gin.Context) {c.Set("user", &entity.User{ID: "user-1"})+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))h.ListIngestionMessages(c)})return r@@ -161,6 +164,7 @@ func newIngestionLogsHandlerRouter() *gin.Engine {r := gin.New()r.GET("/api/v1/datasets/:dataset_id/ingestions", func(c *gin.Context) {c.Set("user", &entity.User{ID: "user-1"})+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))h.ListIngestionLogs(c)})return r@@ -206,4 +210,7 @@ func insertIngestionMessagesHandlerKB(t *testing.T, db *gorm.DB, id, userID stri}).Error; err != nil {t.Fatalf("insert knowledgebase: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, userID, userID); err != nil {+ t.Fatalf("prepare ingestion permission fixture: %v", err)+ }}diff --git a/internal/handler/providers_test.go b/internal/handler/providers_test.goindex 9f5b9e70cf..7d2a587bea 100644--- a/internal/handler/providers_test.go+++ b/internal/handler/providers_test.go@@ -16,6 +16,8 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -100,6 +102,9 @@ func newProviderHandlerRequest(t *testing.T, body map[string]interface{}, paramsctx.Request = reqctx.Params = paramsctx.Set("user_id", "user-1")+ ctx.Request = ctx.Request.WithContext(permission.WithSubject(ctx.Request.Context(), permission.Subject{+ UserID: "user-1", TenantID: "tenant-1",+ }))return ctx, recorder}@@ -306,6 +311,9 @@ func TestProviderHandlerAlterModelUpdatesStatus(t *testing.T) {db := setupProviderHandlerTestDB(t)useProviderHandlerTestDB(t, db)seedProviderHandlerModel(t, db)+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1"); err != nil {+ t.Fatalf("prepare provider permission fixture: %v", err)+ }ctx, recorder := newProviderHandlerRequest(t,diff --git a/internal/handler/searchbot.go b/internal/handler/searchbot.goindex 7d361d0443..1b6a9025fe 100644--- a/internal/handler/searchbot.go+++ b/internal/handler/searchbot.go@@ -434,6 +434,7 @@ func (h *SearchBotHandler) SearchBotDetail(c *gin.Context) {return}setAuthIdentity(c, identity)+ ctx = c.Request.Context()c.Set("auth_via_beta_token", true)if h.searchSvc == nil {jsonInternalError(c, fmt.Errorf("search service not configured"))diff --git a/internal/handler/searchbot_detail_test.go b/internal/handler/searchbot_detail_test.goindex a6ec2cd930..db450d1a8b 100644--- a/internal/handler/searchbot_detail_test.go+++ b/internal/handler/searchbot_detail_test.go@@ -26,6 +26,7 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission/testsupport""ragflow/internal/service""github.com/gin-gonic/gin"@@ -117,6 +118,9 @@ func TestSearchbotDetailSuccess(t *testing.T) {}).Error; err != nil {t.Fatalf("failed to create search: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, "tenant-1", "tenant-1"); err != nil {+ t.Fatalf("prepare search permission fixture: %v", err)+ }r := newSearchbotDetailRouter()w := httptest.NewRecorder()@@ -253,6 +257,11 @@ func TestSearchbotDetailRejectsUnauthorizedSearchAccess(t *testing.T) {}).Error; err != nil {t.Fatalf("failed to create search: %v", err)}+ for tenantID, memberID := range map[string]string{"tenant-1": "tenant-1", "user-2": "user-2"} {+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, memberID); err != nil {+ t.Fatalf("prepare search permission fixture for tenant %s: %v", tenantID, err)+ }+ }r := newSearchbotDetailRouter()w := httptest.NewRecorder()diff --git a/internal/permission/testsupport/fixture_ee.go b/internal/permission/testsupport/fixture_ee.gonew file mode 100644index 0000000000..db41cd5e5a--- /dev/null+++ b/internal/permission/testsupport/fixture_ee.go@@ -0,0 +1,24 @@+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.++package testsupport++import "gorm.io/gorm"++// PrepareEnterprisePermissionFixture is a no-op in the community edition.+// Enterprise tests replace this hook with fixture setup for permission roles+// and tenant membership.+func PrepareEnterprisePermissionFixture(_ *gorm.DB, _ string, _ ...string) error {+ return nil+}diff --git a/internal/service/agent_run_e2e_test.go b/internal/service/agent_run_e2e_test.goindex c7d4fa7f22..49720712c4 100644--- a/internal/service/agent_run_e2e_test.go+++ b/internal/service/agent_run_e2e_test.go@@ -66,9 +66,11 @@ import (// version (it falls through to GetLatest).func makeCanvasWithDSL(t *testing.T, canvasID, userID, tenantID, versionID string, dsl map[string]any) {t.Helper()- dao.DB.Create(&entity.User{ID: userID, Nickname: "owner", Email: userID + "@test.com"})- dao.DB.Create(&entity.Tenant{ID: tenantID, Name: sptr(tenantID)})- dao.DB.Create(&entity.UserTenant{ID: tenantID + "-" + userID, UserID: userID, TenantID: tenantID, Role: "owner", Status: sptr("1")})+ dao.DB.Where("id = ?", userID).FirstOrCreate(&entity.User{ID: userID, Nickname: "owner", Email: userID + "@test.com"})+ dao.DB.Where("id = ?", tenantID).FirstOrCreate(&entity.Tenant{ID: tenantID, Name: sptr(tenantID)})+ dao.DB.Where("user_id = ? AND tenant_id = ?", userID, tenantID).FirstOrCreate(&entity.UserTenant{+ ID: tenantID + "-" + userID, UserID: userID, TenantID: tenantID, Role: "owner", Status: sptr("1"),+ })dao.DB.Create(&entity.UserCanvas{ID: canvasID,UserID: userID,diff --git a/internal/service/agent_test.go b/internal/service/agent_test.goindex 99cafcbfcd..55d7febd19 100644--- a/internal/service/agent_test.go+++ b/internal/service/agent_test.go@@ -2136,9 +2136,12 @@ func TestUpdateAgentDSLCreatesAndReplacesDraftVersion(t *testing.T) {setupAgentSessionServiceTest(t)ctx := serviceTestContext(t, "user-1", "user-1")- if err := dao.DB.WithContext(ctx).Create(&entity.User{ID: "user-1", Nickname: "owner", Email: "[email protected]"}).Error; err != nil {+ if err := dao.DB.WithContext(ctx).Where("id = ?", "user-1").FirstOrCreate(&entity.User{ID: "user-1", Nickname: "owner", Email: "[email protected]"}).Error; err != nil {t.Fatalf("failed to seed user: %v", err)}+ if err := dao.DB.WithContext(ctx).Model(&entity.User{}).Where("id = ?", "user-1").Update("nickname", "owner").Error; err != nil {+ t.Fatalf("failed to set user nickname: %v", err)+ }if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{ID: "canvas-version-draft",UserID: "user-1",@@ -2548,9 +2551,12 @@ func TestPublishAgentUpdatesCanvasAndReleasedVersion(t *testing.T) {setupAgentSessionServiceTest(t)ctx := serviceTestContext(t, "user-1", "user-1")- if err := dao.DB.WithContext(ctx).Create(&entity.User{ID: "user-1", Nickname: "owner", Email: "[email protected]"}).Error; err != nil {+ if err := dao.DB.WithContext(ctx).Where("id = ?", "user-1").FirstOrCreate(&entity.User{ID: "user-1", Nickname: "owner", Email: "[email protected]"}).Error; err != nil {t.Fatalf("failed to seed user: %v", err)}+ if err := dao.DB.WithContext(ctx).Model(&entity.User{}).Where("id = ?", "user-1").Update("nickname", "owner").Error; err != nil {+ t.Fatalf("failed to set user nickname: %v", err)+ }initialDSL := entity.JSONMap{"components": map[string]any{},}diff --git a/internal/service/agent_webhook_credential_test.go b/internal/service/agent_webhook_credential_test.goindex 3426fd1108..4ce433c729 100644--- a/internal/service/agent_webhook_credential_test.go+++ b/internal/service/agent_webhook_credential_test.go@@ -9,6 +9,7 @@ import ("ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport")func TestAgentWebhookCredentialUsesBoundPrincipalAndCanBeRotated(t *testing.T) {@@ -34,9 +35,13 @@ func TestAgentWebhookCredentialUsesBoundPrincipalAndCanBeRotated(t *testing.T) {if err := db.Create(canvas).Error; err != nil {t.Fatalf("seed canvas: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, tenantID, "caller-1", "owner-1"); err != nil {+ t.Fatalf("prepare webhook permission fixture: %v", err)+ }svc := NewAgentWebhookCredentialService(db)- firstToken, err := svc.Issue(t.Context(), permission.Subject{UserID: "caller-1"}, canvas)+ ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "caller-1", TenantID: tenantID})+ firstToken, err := svc.Issue(ctx, permission.Subject{UserID: "caller-1", TenantID: tenantID}, canvas)if err != nil {t.Fatalf("issue credential: %v", err)}@@ -51,7 +56,7 @@ func TestAgentWebhookCredentialUsesBoundPrincipalAndCanBeRotated(t *testing.T) {t.Fatalf("stored hash = %q, raw token must not be stored", stored.TokenHash)}- resolved, err := svc.Resolve(t.Context(), canvas.ID, firstToken)+ resolved, err := svc.Resolve(ctx, canvas.ID, firstToken)if err != nil {t.Fatalf("resolve credential: %v", err)}@@ -59,48 +64,52 @@ func TestAgentWebhookCredentialUsesBoundPrincipalAndCanBeRotated(t *testing.T) {t.Fatalf("resolved principal = (%q, %q), want (caller-1, %q)", resolved.UserID, resolved.TenantID, tenantID)}- secondToken, err := svc.Issue(t.Context(), permission.Subject{UserID: "caller-1"}, canvas)+ secondToken, err := svc.Issue(ctx, permission.Subject{UserID: "caller-1", TenantID: tenantID}, canvas)if err != nil {t.Fatalf("rotate credential: %v", err)}if secondToken == firstToken {t.Fatal("rotating a credential returned the same token")}- if _, err := svc.Resolve(t.Context(), canvas.ID, firstToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {+ if _, err := svc.Resolve(ctx, canvas.ID, firstToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {t.Fatalf("old token resolution error = %v, want invalid credential", err)}- if _, err := svc.Resolve(t.Context(), canvas.ID, secondToken); err != nil {+ if _, err := svc.Resolve(ctx, canvas.ID, secondToken); err != nil {t.Fatalf("resolve rotated token: %v", err)}- if _, err := svc.Resolve(t.Context(), "different-canvas", secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {+ if _, err := svc.Resolve(ctx, "different-canvas", secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {t.Fatalf("credential used for another canvas error = %v, want invalid credential", err)}- if err := db.Model(&entity.UserCanvas{}).Where("id = ?", canvas.ID).- Update("permission", string(entity.TenantPermissionMe)).Error; err != nil {- t.Fatalf("make canvas private: %v", err)+ var revokeErr error+ if db.Migrator().HasTable("permission") {+ revokeErr = db.Table("permission").+ Where("tenant_id = ? AND resource_type = ? AND resource_id = ? AND member_id = ?", tenantID, "canvas", canvas.ID, "membership-1").+ Update("status", entity.StatusInvalid).Error+ } else {+ revokeErr = db.Model(&entity.UserCanvas{}).Where("id = ?", canvas.ID).+ Update("permission", string(entity.TenantPermissionMe)).Error}- if _, err := svc.Resolve(t.Context(), canvas.ID, secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {- t.Fatalf("revoked run permission error = %v, want invalid credential", err)+ if revokeErr != nil {+ t.Fatalf("revoke caller canvas permission: %v", revokeErr)}- if err := db.Model(&entity.UserCanvas{}).Where("id = ?", canvas.ID).- Update("permission", string(entity.TenantPermissionTeam)).Error; err != nil {- t.Fatalf("restore tenant sharing: %v", err)+ if _, err := svc.Resolve(ctx, canvas.ID, secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {+ t.Fatalf("revoked run permission error = %v, want invalid credential", err)}removed := entity.TenantMembershipStatusRemovedif err := db.Model(&entity.UserTenant{}).Where("user_id = ? AND tenant_id = ?", "caller-1", tenantID).Update("status", removed).Error; err != nil {t.Fatalf("remove caller membership: %v", err)}- if _, err := svc.Resolve(t.Context(), canvas.ID, secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {+ if _, err := svc.Resolve(ctx, canvas.ID, secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {t.Fatalf("removed member token resolution error = %v, want invalid credential", err)}- if err := svc.Revoke(t.Context(), canvas.ID, "caller-1"); err != nil {+ if err := svc.Revoke(ctx, canvas.ID, "caller-1"); err != nil {t.Fatalf("revoke credential: %v", err)}- if err := svc.Revoke(t.Context(), canvas.ID, "caller-1"); err != nil {+ if err := svc.Revoke(ctx, canvas.ID, "caller-1"); err != nil {t.Fatalf("repeat revoke: %v", err)}- if _, err := svc.Resolve(t.Context(), canvas.ID, secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {+ if _, err := svc.Resolve(ctx, canvas.ID, secondToken); !errors.Is(err, ErrInvalidAgentWebhookCredential) {t.Fatalf("revoked token resolution error = %v, want invalid credential", err)}}diff --git a/internal/service/chat_channel_test.go b/internal/service/chat_channel_test.goindex 80c5069524..e8a51fe184 100644--- a/internal/service/chat_channel_test.go+++ b/internal/service/chat_channel_test.go@@ -273,8 +273,8 @@ func TestChatChannelServiceDeleteChatChannel(t *testing.T) {ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-2", TenantID: "tenant-2"})deleted, code, err := svc.DeleteChatChannel(ctx, "user-2", "cc-1")- if code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {- t.Fatalf("expected hidden permission denial, got code=%v err=%v", code, err)+ if code != common.CodeNotFound || err == nil {+ t.Fatalf("expected hidden resource-not-found response, got code=%v err=%v", code, err)}if err == nil {t.Fatal("expected authorization error")diff --git a/internal/service/chunk/chunk_permissions_test.go b/internal/service/chunk/chunk_permissions_test.goindex da42a48e4b..637f9a7fa4 100644--- a/internal/service/chunk/chunk_permissions_test.go+++ b/internal/service/chunk/chunk_permissions_test.go@@ -8,6 +8,7 @@ import ("ragflow/internal/entity""ragflow/internal/permission"permissionresponse "ragflow/internal/permission/response"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -19,8 +20,9 @@ func TestRetrievalTestChecksDatasetUsePermission(t *testing.T) {Update("permission", string(entity.TenantPermissionMe)).Error; err != nil {t.Fatalf("set dataset private: %v", err)}+ ctx := chunkTestContext(t, "outsider", "owner", "owner")- _, err := (&ChunkService{kbDAO: dao.NewKnowledgebaseDAO()}).RetrievalTest(t.Context(), &service.RetrievalTestRequest{+ _, err := (&ChunkService{kbDAO: dao.NewKnowledgebaseDAO()}).RetrievalTest(ctx, &service.RetrievalTestRequest{Question: "query",Datasets: []string{"kb-1"},}, "outsider")@@ -52,7 +54,10 @@ func TestChunkManagementDatasetPermissions(t *testing.T) {t.Fatalf("set KB permission: %v", err)}- ctx := t.Context()+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "owner", "owner", "member"); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }+ ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: tt.userID, TenantID: "owner"})for _, op := range []struct {name stringrun func(*ChunkService) errordiff --git a/internal/service/chunk/chunk_test.go b/internal/service/chunk/chunk_test.goindex 525ddbed32..cbe742fbda 100644--- a/internal/service/chunk/chunk_test.go+++ b/internal/service/chunk/chunk_test.go@@ -17,6 +17,7 @@ import ("ragflow/internal/entity""ragflow/internal/entity/models""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service""ragflow/internal/service/document""ragflow/internal/storage"@@ -179,7 +180,7 @@ func TestParsePrevalidatesDocumentsBeforeMutating(t *testing.T) {documentDAO: dao.NewDocumentDAO(),}- ctx := t.Context()+ ctx := chunkTestContext(t, userID, userID)_, code, err := svc.Parse(ctx, userID, datasetID, &service.ParseFileRequest{DocumentIDs: []string{"doc-1", "missing-doc", "doc-2"},})@@ -292,7 +293,7 @@ func TestParseRejectsRunningDocument(t *testing.T) {insertChunkTestIngestionTask(t, "task-1", userID, "doc-1", datasetID, common.RUNNING)svc := newParseTestService(t)- ctx := t.Context()+ ctx := chunkTestContext(t, userID, userID)_, code, err := svc.Parse(ctx, userID, datasetID, &service.ParseFileRequest{DocumentIDs: []string{"doc-1"}})if err == nil {t.Fatal("expected parse to fail")@@ -324,7 +325,7 @@ func TestListSortsChunksByDocumentPosition(t *testing.T) {documentDAO: dao.NewDocumentDAO(),}- ctx := t.Context()+ ctx := chunkTestContext(t, userID, tenantID)page := 1size := 30resp, err := svc.List(ctx, &service.ListChunksRequest{@@ -402,7 +403,7 @@ func TestListReportsChunkAvailability(t *testing.T) {page := 1size := 30- resp, err := svc.List(t.Context(), &service.ListChunksRequest{+ resp, err := svc.List(chunkTestContext(t, userID, tenantID), &service.ListChunksRequest{DatasetID: datasetID,DocID: documentID,Page: &page,@@ -454,7 +455,7 @@ func TestListScopesSearchToDocumentDataset(t *testing.T) {documentDAO: dao.NewDocumentDAO(),}- ctx := t.Context()+ ctx := chunkTestContext(t, userID, tenantID)page := 1size := 30if _, err := svc.List(ctx, &service.ListChunksRequest{@@ -505,7 +506,7 @@ func TestGetScopesChunkLookupToDocumentDataset(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- resp, err := svc.Get(t.Context(), &service.GetChunkRequest{+ resp, err := svc.Get(chunkTestContext(t, userID, tenantID), &service.GetChunkRequest{DatasetID: datasetID,DocumentID: documentID,ChunkID: "chunk-1",@@ -567,7 +568,7 @@ func TestGetRejectsChunkOfAnotherDocument(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- _, err := svc.Get(t.Context(), &service.GetChunkRequest{+ _, err := svc.Get(chunkTestContext(t, userID, tenantID), &service.GetChunkRequest{DatasetID: datasetID,DocumentID: documentID,ChunkID: "chunk-1",@@ -602,7 +603,7 @@ func TestGetRequiresDocumentInRouteDataset(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- _, err := svc.Get(t.Context(), &service.GetChunkRequest{+ _, err := svc.Get(chunkTestContext(t, userID, tenantID), &service.GetChunkRequest{DatasetID: datasetID,DocumentID: "doc-missing",ChunkID: "chunk-1",@@ -611,7 +612,7 @@ func TestGetRequiresDocumentInRouteDataset(t *testing.T) {t.Fatalf("Get() error = %v, want document not found", err)}- _, err = svc.Get(t.Context(), &service.GetChunkRequest{+ _, err = svc.Get(chunkTestContext(t, userID, tenantID), &service.GetChunkRequest{DatasetID: datasetID,DocumentID: "doc-2",ChunkID: "chunk-1",@@ -682,7 +683,7 @@ func TestListBuildsMatchTextExprForKeywords(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),documentDAO: dao.NewDocumentDAO(),}- ctx := t.Context()+ ctx := chunkTestContext(t, userID, tenantID)page := 2size := 5@@ -768,7 +769,7 @@ func TestUpdateChunkRejectsChunkFromAnotherDocument(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -803,7 +804,7 @@ func TestUpdateChunkUpdatesSameDocumentWithDocumentCondition(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -857,7 +858,7 @@ func TestUpdateChunkStoresTagKwdOnlyWhenSent(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -915,7 +916,7 @@ func TestUpdateChunkStoresImageAndFlagsImageChunk(t *testing.T) {}imageBase64 := base64.StdEncoding.EncodeToString([]byte("image-bytes"))- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -981,7 +982,7 @@ func TestUpdateChunkRemoveModeClearsImageAfterIndexUpdate(t *testing.T) {}removeMode := imageUpdateModeRemove- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -1036,7 +1037,7 @@ func TestUpdateChunkMarksWikiDirtyWhenImageRemovalFails(t *testing.T) {removeMode := imageUpdateModeRemovecontent := "updated content"- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -1091,7 +1092,7 @@ func TestUpdateChunkRejectsInvalidImageInput(t *testing.T) {},}- err := svc.UpdateChunk(t.Context(), &service.UpdateChunkRequest{+ err := svc.UpdateChunk(chunkTestContext(t, "user-1", "tenant-1"), &service.UpdateChunkRequest{DatasetID: "kb-1",DocumentID: "doc-a",ChunkID: "chunk-1",@@ -1794,7 +1795,7 @@ func TestRemoveChunksDecrementsStatsAfterDelete(t *testing.T) {docEngine: engine,kbDAO: dao.NewKnowledgebaseDAO(),}- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "tenant-1")deletedCount, err := svc.RemoveChunks(ctx, &service.RemoveChunksRequest{DatasetID: "kb-1",DocID: "doc-1",@@ -1859,7 +1860,7 @@ func TestRemoveChunksSkipsStatsWhenNothingDeleted(t *testing.T) {return nil},}- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "tenant-1")deletedCount, err := svc.RemoveChunks(ctx, &service.RemoveChunksRequest{DatasetID: "kb-1",DocID: "doc-1",@@ -1893,7 +1894,7 @@ func TestRemoveChunksReturnsStatsError(t *testing.T) {return errors.New("stats update failed")},}- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "tenant-1")deletedCount, err := svc.RemoveChunks(ctx, &service.RemoveChunksRequest{DatasetID: "kb-1",DocID: "doc-1",@@ -1992,6 +1993,15 @@ func pushChunkTestDB(t *testing.T, testDB *gorm.DB) {})}+func chunkTestContext(t *testing.T, userID, tenantID string, memberIDs ...string) context.Context {+ t.Helper()+ members := append([]string{userID}, memberIDs...)+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, members...); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }+ return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})+}+func newParseTestService(t *testing.T) *ChunkService {t.Helper()@@ -2526,7 +2536,7 @@ func TestSwitchChunksUpdatesDocEngineWithAvailableInt(t *testing.T) {kbDAO: dao.NewKnowledgebaseDAO(),}- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "tenant-1")if err = svc.SwitchChunks(ctx, "user-1", "kb-1", "doc-1", 0, []string{"chunk-1", "chunk-2"}); err != nil {t.Fatalf("SwitchChunks() error = %v", err)}@@ -2715,7 +2725,7 @@ func TestChunkServiceParse_ReturnsPartialSuccessForDuplicateDocumentIDs(t *testireturn nil}- ctx := t.Context()+ ctx := chunkTestContext(t, userID, userID)result, code, err := svc.Parse(ctx, userID, datasetID, &service.ParseFileRequest{DocumentIDs: []string{"doc-1", "doc-1"},})@@ -2748,7 +2758,7 @@ func TestStopParsing_CallsCancelIngestionTask(t *testing.T) {calledDocID = doc.IDreturn nil}- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "user-1")_, _, err := svc.StopParsing(ctx, "user-1", "kb-1", service.StopParsingRequest{DocumentIDs: []string{"doc-1"}})if err != nil {t.Fatalf("StopParsing: %v", err)@@ -2768,7 +2778,7 @@ func TestStopParsing_RejectsDocumentWithoutIngestionTask(t *testing.T) {svc := newParseTestService(t)var called boolsvc.cancelIngestionTaskFunc = func(ctx context.Context, doc *entity.Document) error { called = true; return nil }- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "user-1")_, code, err := svc.StopParsing(ctx, "user-1", "kb-1", service.StopParsingRequest{DocumentIDs: []string{"doc-1"}})if err == nil {t.Fatal("expected error for document without ingestion task")@@ -2803,7 +2813,7 @@ func TestStopParsing_DoesNotDeleteChunksOrResetCountersAfterCancel(t *testing.T)}engine := &parseTestDocEngine{chunkStoreExists: true}svc.docEngine = engine- ctx := t.Context()+ ctx := chunkTestContext(t, "user-1", "user-1")_, _, err := svc.StopParsing(ctx, "user-1", "kb-1", service.StopParsingRequest{DocumentIDs: []string{"doc-1"}})if err != nil {t.Fatalf("StopParsing: %v", err)diff --git a/internal/service/document/document_applykb_chain_test.go b/internal/service/document/document_applykb_chain_test.goindex 9ba903fa23..a3d8d3200c 100644--- a/internal/service/document/document_applykb_chain_test.go+++ b/internal/service/document/document_applykb_chain_test.go@@ -131,7 +131,7 @@ func TestIngest_ApplyKB_RealDatasetAPIChain(t *testing.T) {t.Fatalf("seed document: %v", err)}- ctx := t.Context()+ ctx := documentTestContext(t.Context())enabled := trueif _, code, err := newDatasetService().UpdateMetadataConfig(ctx, "kb-1", "user-1", &service.MetadataConfigRequest{Enabled: &enabled,@@ -246,7 +246,7 @@ func TestIngest_ApplyKB_DisabledDatasetAPIChain(t *testing.T) {t.Fatalf("seed document: %v", err)}- ctx := t.Context()+ ctx := documentTestContext(t.Context())disabled := falseif _, code, err := newDatasetService().UpdateMetadataConfig(ctx, "kb-1", "user-1", &service.MetadataConfigRequest{Enabled: &disabled,@@ -313,7 +313,7 @@ func TestIngest_ApplyKB_RealCreatedDatasetChain(t *testing.T) {t.Fatalf("set membership embd id: %v", err)}- ctx := t.Context()+ ctx := documentTestContext(t.Context())parserID := "general"parseType := 1team := "team"diff --git a/internal/service/document/document_dataset_update_test.go b/internal/service/document/document_dataset_update_test.goindex 0f6be9a995..d32ed82220 100644--- a/internal/service/document/document_dataset_update_test.go+++ b/internal/service/document/document_dataset_update_test.go@@ -9,6 +9,7 @@ import ("ragflow/internal/common""ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission/testsupport""ragflow/internal/service")@@ -490,6 +491,9 @@ func TestBatchUpdateDocumentStatusReturnsPermissionErrorWhenAllDenied(t *testing}).Error; err != nil {t.Fatalf("create tenant member: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1", "member"); err != nil {+ t.Fatalf("prepare document status permission fixture: %v", err)+ }svc := testDocumentService(t)ctx := documentTestActorContext(t.Context(), "member", "tenant-1")@@ -520,6 +524,9 @@ func TestBatchUpdateDocumentStatusRetainsPartialFailure(t *testing.T) {}).Error; err != nil {t.Fatalf("create tenant member: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-1", "member"); err != nil {+ t.Fatalf("prepare document status permission fixture: %v", err)+ }svc := testDocumentService(t)ctx := documentTestActorContext(t.Context(), "member", "tenant-1")diff --git a/internal/service/document/document_parser_selection_test.go b/internal/service/document/document_parser_selection_test.goindex ac8ca8d103..0c6454a499 100644--- a/internal/service/document/document_parser_selection_test.go+++ b/internal/service/document/document_parser_selection_test.go@@ -8,6 +8,7 @@ import ("ragflow/internal/dao""ragflow/internal/entity"+ "ragflow/internal/permission/testsupport""ragflow/internal/service""ragflow/internal/storage"syncerconnector "ragflow/internal/syncer/connector"@@ -159,6 +160,9 @@ func seedDocumentParserTenant(t *testing.T, tenantID, ownerID string) {}).Error; err != nil {t.Fatalf("insert tenant owner membership: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, ownerID); err != nil {+ t.Fatalf("prepare parser tenant permission fixture: %v", err)+ }}// TestResolveDocumentParser_Priority pins the resolution order: the dataset's@@ -735,7 +739,7 @@ func TestInsertSyncDocument_FallsBackWhenSelectionLacksFamily(t *testing.T) {SourceDocument: syncerconnector.SourceDocument{Blob: []byte("plain text")},}svc := testDocumentService(t)- res, err := svc.insertSyncDocument(t.Context(), input, "laws.txt", "", "txt", "", "tenant-1")+ res, err := svc.insertSyncDocument(documentTestContext(t.Context()), input, "laws.txt", "", "txt", "", "tenant-1")if err != nil {t.Fatalf("insertSyncDocument: %v", err)}diff --git a/internal/service/document/document_test.go b/internal/service/document/document_test.goindex 9cac648586..033ea930bf 100644--- a/internal/service/document/document_test.go+++ b/internal/service/document/document_test.go@@ -40,6 +40,7 @@ import ("ragflow/internal/engine/types""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""ragflow/internal/service""ragflow/internal/service/file""ragflow/internal/storage"@@ -54,11 +55,11 @@ type recordingTaskPublisher struct {}func documentTestContext(ctx context.Context) context.Context {- return permission.WithSubject(ctx, permission.Subject{TenantID: "tenant-1"})+ return permission.WithSubject(ctx, permission.Subject{UserID: "user-1", TenantID: "tenant-1"})}func documentTestContextFor(ctx context.Context, tenantID string) context.Context {- return permission.WithSubject(ctx, permission.Subject{TenantID: tenantID})+ return permission.WithSubject(ctx, permission.Subject{UserID: tenantID, TenantID: tenantID})}func documentTestActorContext(ctx context.Context, userID, tenantID string) context.Context {@@ -666,6 +667,9 @@ func ensureTestTenantOwner(t *testing.T, userID, tenantID string) {var owner entity.UserTenanterr := dao.DB.Where("tenant_id = ? AND role = ? AND status = ?", tenantID, "owner", string(entity.StatusValid)).First(&owner).Errorif err == nil {+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, userID); err != nil {+ t.Fatalf("prepare document owner permission fixture: %v", err)+ }return}if !dao.IsNotFoundErr(err) {@@ -683,6 +687,9 @@ func ensureTestTenantOwner(t *testing.T, userID, tenantID string) {if err := dao.DB.Create(&owner).Error; err != nil {t.Fatalf("insert test tenant owner: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, userID); err != nil {+ t.Fatalf("prepare document owner permission fixture: %v", err)+ }}func insertTestCanvas(t *testing.T, canvasID, ownerID string) {@@ -1066,12 +1073,13 @@ func TestSyncDocumentUpsertRemovesStagedBlobWhenInsertFails(t *testing.T) {}func TestSyncDocumentUpsertWithNilDatasetParserConfig(t *testing.T) {- ctx := t.Context()db := setupServiceTestDB(t)pushServiceDB(t, db)+ insertUserTenantForAccessCheck(t, "user-1", "tenant-1")+ ctx := documentTestContext(t.Context())kb := entity.Knowledgebase{- ID: "kb-sync-nil-config", TenantID: "tenant-1", Name: "Sync KB", ParserID: "naive",+ ID: "kb-sync-nil-config", TenantID: "tenant-1", Name: "Sync KB", ParserID: "naive", CreatedBy: "user-1",}if err := db.Create(&kb).Error; err != nil {t.Fatalf("create dataset: %v", err)@@ -1347,6 +1355,7 @@ func insertUserTenantForAccessCheck(t *testing.T, userID, tenantID string) {UserID: userID,TenantID: tenantID,Role: "owner",+ Status: sptr(entity.TenantMembershipStatusJoined),LLMID: "llm-default",EmbdID: "embd-default",ASRID: "asr-default",@@ -1360,6 +1369,9 @@ func insertUserTenantForAccessCheck(t *testing.T, userID, tenantID string) {Updates(map[string]interface{}{"llm_id": "llm-default", "embd_id": "embd-default", "asr_id": "asr-default"}).Error; err != nil {t.Fatalf("set test owner model defaults: %v", err)}+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, userID); err != nil {+ t.Fatalf("prepare document permission fixture: %v", err)+ }}func TestDeleteDocuments_DeleteAll(t *testing.T) {@@ -1678,7 +1690,7 @@ func TestIngest_ApplyKBPersistsDatasetParserConfig(t *testing.T) {publisher := &recordingTaskPublisher{}svc := testDocumentService(t)svc.ingestionTaskSvc.SetTaskPublisher(publisher)- ctx := t.Context()+ ctx := documentTestContext(t.Context())code, err := svc.Ingest(ctx, "user-1", &IngestDocumentRequest{DocIDs: []string{"doc-1"},@@ -1873,7 +1885,7 @@ func TestIngest_ApplyKBDisabledLeavesParserConfigUnchanged(t *testing.T) {publisher := &recordingTaskPublisher{}svc := testDocumentService(t)svc.ingestionTaskSvc.SetTaskPublisher(publisher)- ctx := t.Context()+ ctx := documentTestContext(t.Context())code, err := svc.Ingest(ctx, "user-1", &IngestDocumentRequest{DocIDs: []string{"doc-1"},@@ -2741,12 +2753,14 @@ func TestGetDocumentPreview_AccessControl(t *testing.T) {// A member of the dataset's tenant reads it too.seedDocumentPreviewMemberAccess(t, db)- if _, err = svc.GetDocumentPreview(ctx, "user-2", "doc-prev"); err != nil {+ memberCtx := documentTestActorContext(t.Context(), "user-2", "tenant-1")+ if _, err = svc.GetDocumentPreview(memberCtx, "user-2", "doc-prev"); err != nil {t.Fatalf("team member preview: %v", err)}// An unrelated user gets the same answer as for a missing document.- _, err = svc.GetDocumentPreview(ctx, "user-3", "doc-prev")+ strangerCtx := documentTestActorContext(t.Context(), "user-3", "tenant-1")+ _, err = svc.GetDocumentPreview(strangerCtx, "user-3", "doc-prev")if !errors.Is(err, ErrPreviewDocumentNotFound) {t.Fatalf("stranger preview: expected ErrPreviewDocumentNotFound, got %v", err)}@@ -2863,11 +2877,15 @@ func TestDownloadDocument_DatabaseErrorIsNotNotFound(t *testing.T) {func TestUpdateDatasetDocumentRejectsNonOwner(t *testing.T) {db := setupServiceTestDB(t)pushServiceDB(t, db)+ ensureTestTenantOwner(t, "user-1", "tenant-1")+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "user-2"); err != nil {+ t.Fatalf("prepare non-owner permission fixture: %v", err)+ }insertTestKB(t, "kb-1", "tenant-1", 1, 0, 0)insertTestDoc(t, "doc-1", "kb-1", 0, 0)svc := testDocumentService(t)- ctx := documentTestContext(t.Context())+ ctx := documentTestActorContext(t.Context(), "user-2", "tenant-1")_, code, err := svc.UpdateDatasetDocument(ctx, "user-2", "kb-1", "doc-1", &UpdateDatasetDocumentRequest{}, map[string]bool{})if err == nil {t.Fatal("expected ownership error")@@ -4710,14 +4728,14 @@ func TestGetDocumentImageForDocumentAllowsIndexedSharedBucketImage(t *testing.T)}func TestGetDocumentThumbnailAuthorizesBeforeStorage(t *testing.T) {- ctx := documentTestContextFor(t.Context(), "owner-1")+ ctx := documentTestActorContext(t.Context(), "user-1", "owner-1")db := setupServiceTestDB(t)pushServiceDB(t, db)insertTestKB(t, "kb-thumb", "owner-1", 0, 0, 0)thumbnail := "thumbnail.png"if err := db.Create(&entity.Document{ID: "doc-thumb", KbID: "kb-thumb", Thumbnail: &thumbnail,- ParserID: "naive", ParserConfig: entity.JSONMap{}, SourceType: "local", Type: "pdf", CreatedBy: "owner-1",+ ParserID: "naive", ParserConfig: entity.JSONMap{}, SourceType: "local", Type: "pdf", CreatedBy: "user-1",}).Error; err != nil {t.Fatal(err)}diff --git a/internal/service/document/sync_document.go b/internal/service/document/sync_document.goindex d382e51b84..5a532aa53c 100644--- a/internal/service/document/sync_document.go+++ b/internal/service/document/sync_document.go@@ -136,6 +136,9 @@ func (s *DocumentService) insertSyncDocument(ctx context.Context, input service.// create the 'doc'selection, parserConfig := resolveDocumentParser(ctx, kb, filename, utility.FileType(filetype), kb.ParserConfig)doc := s.newDatasetDocument(kb, tenantID, filename, "", filetype, selection, parserConfig, input.SourceType, int64(len(input.SourceDocument.Blob)), input.SourceDocument.Blob)+ if ownerID := strings.TrimSpace(kb.CreatedBy); ownerID != "" {+ doc.CreatedBy = ownerID+ }doc.ID = input.DocumentID// A fingerprint is acknowledged only after all dependent work succeeds.doc.ContentHash = nildiff --git a/internal/service/file/file_browse_permission_test.go b/internal/service/file/file_browse_permission_test.goindex 8628959e81..b9497fa5e0 100644--- a/internal/service/file/file_browse_permission_test.go+++ b/internal/service/file/file_browse_permission_test.go@@ -7,6 +7,7 @@ import ("ragflow/internal/dao""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport")func seedFileBrowsing(t *testing.T) {@@ -20,6 +21,9 @@ func seedFileBrowsing(t *testing.T) {t.Fatal(err)}}+ if err := testsupport.PrepareEnterprisePermissionFixture(db, "owner", "owner", "reader"); err != nil {+ t.Fatalf("prepare tenant permission fixture: %v", err)+ }for _, entry := range []entity.File{{ID: "root", ParentID: "root", TenantID: "owner", CreatedBy: "owner", Name: "/", Type: FileTypeFolder},{ID: "tags", ParentID: "root", TenantID: "owner", CreatedBy: "reader", Name: "tags.txt", Type: "doc"},@@ -36,7 +40,7 @@ func seedFileBrowsing(t *testing.T) {func TestTenantMemberSeesOnlyReadableFilesAndPaths(t *testing.T) {seedFileBrowsing(t)svc := testFileService()- ctx := t.Context()+ ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "reader", TenantID: "owner"})list, err := svc.ListFilesForTenant(ctx, "reader", "owner", "", 1, 1, nil, "")if err != nil {t.Fatalf("list shared tenant files: %v", err)diff --git a/internal/service/file/file_delete_test.go b/internal/service/file/file_delete_test.goindex ed55cb99ba..c93fa12073 100644--- a/internal/service/file/file_delete_test.go+++ b/internal/service/file/file_delete_test.go@@ -134,7 +134,7 @@ func TestDeleteFilesAuthorizesEveryDescendantBeforeDeleting(t *testing.T) {}}- err := testFileService().DeleteFiles(t.Context(), "user-1", []string{"folder"})+ err := testFileService().DeleteFiles(fileTestContext(t, "user-1", "user-1"), "user-1", []string{"folder"})if !errors.Is(err, permission.ErrPermissionDenied) {t.Fatalf("DeleteFiles error = %v, want permission denied", err)}@@ -148,7 +148,10 @@ func TestDeleteFilesAuthorizesEveryDescendantBeforeDeleting(t *testing.T) {func TestFileService_CheckFileTreeAccessBatchesWideSubtrees(t *testing.T) {db := setupFolderTestDB(t)entries := make([]entity.File, 0, 1+2*510)- entries = append(entries, entity.File{ID: "tree-root", ParentID: "tree-root", TenantID: "tenant-1", CreatedBy: "owner", Name: "/", Type: FileTypeFolder})+ entries = append(entries,+ entity.File{ID: "tenant-root", ParentID: "tenant-root", TenantID: "tenant-1", CreatedBy: "tenant-1", Name: "/", Type: FileTypeFolder},+ entity.File{ID: "tree-root", ParentID: "tenant-root", TenantID: "tenant-1", CreatedBy: "owner", Name: "tree", Type: FileTypeFolder},+ )for i := 0; i < 510; i++ {folderID := fmt.Sprintf("folder-%04d", i)entries = append(entries,@@ -161,7 +164,7 @@ func TestFileService_CheckFileTreeAccessBatchesWideSubtrees(t *testing.T) {}root := &entity.File{ID: "tree-root", ParentID: "tree-root", TenantID: "tenant-1", CreatedBy: "owner", Name: "/", Type: FileTypeFolder}- if err := testFileService().checkFileTreeAccess(t.Context(), "owner", root, permission.OperationDelete); err != nil {+ if err := testFileService().checkFileTreeAccess(fileTestContext(t, "owner", "tenant-1"), "owner", root, permission.OperationDelete); err != nil {t.Fatalf("check permissions for wide subtree: %v", err)}}diff --git a/internal/service/file/file_folder_test.go b/internal/service/file/file_folder_test.goindex 572956d486..7eb573b7f9 100644--- a/internal/service/file/file_folder_test.go+++ b/internal/service/file/file_folder_test.go@@ -10,6 +10,7 @@ import ("ragflow/internal/dao""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport""github.com/glebarez/sqlite""gorm.io/gorm"@@ -34,7 +35,7 @@ func TestFileService_CreateFolderDedupesDuplicateName(t *testing.T) {}svc := testFileService()- ctx := context.Background()+ ctx := fileTestContext(t, "tenant-1", "tenant-1")created, err := svc.CreateFolder(ctx, "tenant-1", "notes", "pf1", FileTypeFolder)if err != nil {@@ -67,10 +68,10 @@ func TestFileService_CreateFolderDedupesDuplicateName(t *testing.T) {}// Folders are not files: a dotted folder name keeps its dot at the end.- if got := firstCreatedFolderName(t, svc, "v1.2", FileTypeFolder); got != "v1.2" {+ if got := firstCreatedFolderName(t, svc, ctx, "v1.2", FileTypeFolder); got != "v1.2" {t.Fatalf("first folder name = %q, want %q", got, "v1.2")}- if got := firstCreatedFolderName(t, svc, "v1.2", FileTypeFolder); got != "v1.2(1)" {+ if got := firstCreatedFolderName(t, svc, ctx, "v1.2", FileTypeFolder); got != "v1.2(1)" {t.Fatalf("duplicate folder name = %q, want %q", got, "v1.2(1)")}}@@ -90,7 +91,7 @@ func TestFileService_CreateFolderRecordsRequesterAsOwner(t *testing.T) {t.Fatalf("create root folder: %v", err)}- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "member", TenantID: "owner"})+ ctx := fileTestContext(t, "member", "owner", "owner")created, err := testFileService().CreateFolder(ctx, "member", "notes", "root", FileTypeFolder)if err != nil {t.Fatalf("create folder: %v", err)@@ -106,9 +107,9 @@ func TestFileService_CreateFolderRecordsRequesterAsOwner(t *testing.T) {}// firstCreatedFolderName creates one entry and returns its resulting name.-func firstCreatedFolderName(t *testing.T, svc *FileService, name, fileType string) string {+func firstCreatedFolderName(t *testing.T, svc *FileService, ctx context.Context, name, fileType string) string {t.Helper()- created, err := svc.CreateFolder(context.Background(), "tenant-1", name, "pf1", fileType)+ created, err := svc.CreateFolder(ctx, "tenant-1", name, "pf1", fileType)if err != nil {t.Fatalf("CreateFolder(%q) failed: %v", name, err)}@@ -124,7 +125,7 @@ func TestFileService_MoveFiles_RejectsSlashInNewName(t *testing.T) {}svc := testFileService()- err := svc.MoveFiles(context.Background(), "tenant1", []string{"f1"}, "", "a/b")+ err := svc.MoveFiles(fileTestContext(t, "tenant1", "tenant1"), "tenant1", []string{"f1"}, "", "a/b")if err == nil || !strings.Contains(err.Error(), `cannot contain "/"`) {t.Fatalf("MoveFiles rename error = %v, want slash validation error", err)}@@ -141,7 +142,7 @@ func TestFileService_MoveFilesRejectsDuplicateName(t *testing.T) {}svc := testFileService()- ctx := context.Background()+ ctx := fileTestContext(t, "tenant-1", "tenant-1")err := svc.MoveFiles(ctx, "tenant-1", []string{"s1"}, "", "TARGET")if err == nil || !strings.Contains(err.Error(), "duplicated file name") {@@ -170,7 +171,7 @@ func TestFileService_MoveFilesRejectsCaseVariantDuplicateInDestinationFolder(t *}svc := testFileService()- err := svc.MoveFiles(context.Background(), "tenant-1", []string{"s1"}, "d1", "REPORT.TXT")+ err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"s1"}, "d1", "REPORT.TXT")if err == nil || !strings.Contains(err.Error(), "duplicated file name") {t.Fatalf("move+case-variant rename error = %v, want duplicate error", err)}@@ -193,7 +194,7 @@ func TestFileService_MoveFilesRejectsCaseVariantDuplicateWithoutRename(t *testin}svc := testFileService()- err := svc.MoveFiles(context.Background(), "tenant-1", []string{"s1"}, "d1", "")+ err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"s1"}, "d1", "")if err == nil || !strings.Contains(err.Error(), "Duplicated file name") {t.Fatalf("plain move into case-variant duplicate error = %v, want duplicate error", err)}@@ -228,6 +229,15 @@ func setupFolderTestDB(t *testing.T) *gorm.DB {return db}+func fileTestContext(t *testing.T, userID, tenantID string, memberIDs ...string) context.Context {+ t.Helper()+ members := append([]string{userID}, memberIDs...)+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, members...); err != nil {+ t.Fatalf("prepare permission fixture: %v", err)+ }+ return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})+}+func insertFolderTestFile(t *testing.T, id, parentID, name string) {t.Helper()f := &entity.File{@@ -253,7 +263,7 @@ func TestFileService_ListFilesMissingParentReturnsNotFound(t *testing.T) {}svc := testFileService()- _, err := svc.ListFiles(context.Background(), "tenant-1", "missing-folder", 1, 10, nil, "")+ _, err := svc.ListFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", "missing-folder", 1, 10, nil, "")var coded *common.CodedErrorif !errors.As(err, &coded) || coded.Code != common.CodeNotFound {t.Fatalf("ListFiles error = %v, want CodeNotFound CodedError", err)@@ -264,7 +274,7 @@ func TestFileService_AncestryMissingIDReturnsNotFound(t *testing.T) {setupFolderTestDB(t)svc := testFileService()- ctx := context.Background()+ ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})for name, call := range map[string]func() error{"GetParentFolder": func() error { _, err := svc.GetParentFolder(ctx, "user-1", "missing-file"); return err },"GetAllParentFolders": func() error { _, err := svc.GetAllParentFolders(ctx, "user-1", "missing-file"); return err },@@ -288,7 +298,7 @@ func TestFileService_DatabaseErrorIsNotReportedAsNotFound(t *testing.T) {}svc := testFileService()- ctx := context.Background()+ ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})for name, call := range map[string]func() error{"ListFiles": func() error { _, err := svc.ListFiles(ctx, "tenant-1", "any", 1, 10, nil, ""); return err },"GetParentFolder": func() error { _, err := svc.GetParentFolder(ctx, "user-1", "any"); return err },@@ -307,9 +317,10 @@ func TestFileService_AncestryRejectsUnauthorized(t *testing.T) {setupFolderTestDB(t)insertFolderTestFile(t, "file-1", "folder-1", "file.pdf")svc := testFileService()+ ctx := fileTestContext(t, "user-2", "tenant-1", "tenant-1")for _, call := range []func() error{- func() error { _, err := svc.GetParentFolder(t.Context(), "user-2", "file-1"); return err },- func() error { _, err := svc.GetAllParentFolders(t.Context(), "user-2", "file-1"); return err },+ func() error { _, err := svc.GetParentFolder(ctx, "user-2", "file-1"); return err },+ func() error { _, err := svc.GetAllParentFolders(ctx, "user-2", "file-1"); return err },} {if err := call(); !errors.Is(err, permission.ErrPermissionDenied) {t.Fatalf("error = %v, want permission denied", err)@@ -321,7 +332,7 @@ func TestFileService_GetFileContentRejectsInaccessibleFile(t *testing.T) {setupFolderTestDB(t)insertFolderTestFile(t, "file-1", "folder-1", "private.pdf")- _, err := testFileService().GetFileContent(t.Context(), "user-2", "file-1")+ _, err := testFileService().GetFileContent(fileTestContext(t, "user-2", "tenant-1", "tenant-1"), "user-2", "file-1")if !errors.Is(err, permission.ErrPermissionDenied) {t.Fatalf("GetFileContent error = %v, want permission denied", err)}@@ -334,7 +345,7 @@ func TestFileService_ListFilesRejectsInaccessibleParent(t *testing.T) {t.Fatalf("seed foreign folder: %v", err)}- _, err := testFileService().ListFiles(t.Context(), "user-1", foreignFolder.ID, 1, 15, nil, "")+ _, err := testFileService().ListFiles(fileTestContext(t, "user-1", "user-1"), "user-1", foreignFolder.ID, 1, 15, nil, "")if !errors.Is(err, permission.ErrResourceNotFound) {t.Fatalf("ListFiles error = %v, want resource not found", err)}@@ -347,7 +358,7 @@ func TestFileService_CreateFolderRejectsInaccessibleParent(t *testing.T) {t.Fatalf("seed foreign folder: %v", err)}- _, err := testFileService().CreateFolder(t.Context(), "user-1", "child", foreignFolder.ID, FileTypeFolder)+ _, err := testFileService().CreateFolder(fileTestContext(t, "user-1", "user-1"), "user-1", "child", foreignFolder.ID, FileTypeFolder)if !errors.Is(err, permission.ErrResourceNotFound) {t.Fatalf("CreateFolder error = %v, want resource not found", err)}@@ -367,7 +378,7 @@ func TestFileService_MoveFilesRejectsInaccessibleSource(t *testing.T) {t.Fatalf("seed foreign file: %v", err)}- err := testFileService().MoveFiles(t.Context(), "user-1", []string{foreignFile.ID}, "", "renamed.pdf")+ err := testFileService().MoveFiles(fileTestContext(t, "user-1", "user-1"), "user-1", []string{foreignFile.ID}, "", "renamed.pdf")if !errors.Is(err, permission.ErrPermissionDenied) {t.Fatalf("MoveFiles error = %v, want permission denied", err)}@@ -388,7 +399,7 @@ func TestFileService_MoveFilesRejectsInaccessibleDestination(t *testing.T) {t.Fatalf("seed foreign folder: %v", err)}- err := testFileService().MoveFiles(t.Context(), "user-1", []string{"file-1"}, foreignFolder.ID, "")+ err := testFileService().MoveFiles(fileTestContext(t, "user-1", "tenant-1"), "user-1", []string{"file-1"}, foreignFolder.ID, "")if !errors.Is(err, permission.ErrPermissionDenied) {t.Fatalf("MoveFiles error = %v, want permission denied", err)}@@ -408,7 +419,7 @@ func TestFileService_UploadRejectsInaccessibleParent(t *testing.T) {t.Fatalf("seed foreign folder: %v", err)}- _, err := testFileService().UploadFile(t.Context(), "user-1", foreignFolder.ID, nil, 1024)+ _, err := testFileService().UploadFile(fileTestContext(t, "user-1", "user-1"), "user-1", foreignFolder.ID, nil, 1024)if !errors.Is(err, permission.ErrResourceNotFound) {t.Fatalf("UploadFile error = %v, want resource not found", err)}@@ -455,7 +466,7 @@ func TestMoveFilesRenameUpdatesAllLinkedDocuments(t *testing.T) {insertFolderTestFile2Document(t, "f2d-2", "file-1", "doc-2")svc := testFileService()- ctx := t.Context()+ ctx := fileTestContext(t, "tenant-1", "tenant-1")if err := svc.MoveFiles(ctx, "tenant-1", []string{"file-1"}, "", "new.pdf"); err != nil {t.Fatalf("MoveFiles failed: %v", err)}@@ -497,11 +508,12 @@ func TestRenameLinkedDocumentsLookupErrorPropagates(t *testing.T) {}svc := testFileService()- if err := svc.renameLinkedDocuments(t.Context(), "file-1", "new.pdf"); err == nil {+ ctx := fileTestContext(t, "tenant-1", "tenant-1")+ if err := svc.renameLinkedDocuments(ctx, "file-1", "new.pdf"); err == nil {t.Fatal("renameLinkedDocuments returned nil error on update failure")}- err := svc.MoveFiles(t.Context(), "tenant-1", []string{"file-1"}, "", "new.pdf")+ err := svc.MoveFiles(ctx, "tenant-1", []string{"file-1"}, "", "new.pdf")if err == nil {t.Fatal("MoveFiles succeeded despite file2document lookup failure")}@@ -604,7 +616,7 @@ func TestMoveFilesRejectsFolderAndSubfolder(t *testing.T) {seedMoveHierarchyDB(t)svc := testFileService()- err := svc.MoveFiles(context.Background(), "tenant-1", []string{"A", "B"}, "D", "")+ err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"A", "B"}, "D", "")if err == nil || !strings.Contains(err.Error(), "descendant") {t.Fatalf("move folder+subfolder error = %v, want descendant rejection", err)}@@ -621,7 +633,7 @@ func TestMoveFilesRejectsFolderAndGrandchild(t *testing.T) {seedMoveHierarchyDB(t)svc := testFileService()- err := svc.MoveFiles(context.Background(), "tenant-1", []string{"A", "C"}, "D", "")+ err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"A", "C"}, "D", "")if err == nil || !strings.Contains(err.Error(), "descendant") {t.Fatalf("move folder+grandchild error = %v, want descendant rejection", err)}@@ -639,7 +651,7 @@ func TestMoveFilesRejectsFolderAndContainedFile(t *testing.T) {insertFolderTestFile(t, "f1", "A", "inside.pdf")svc := testFileService()- err := svc.MoveFiles(context.Background(), "tenant-1", []string{"A", "f1"}, "D", "")+ err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"A", "f1"}, "D", "")if err == nil || !strings.Contains(err.Error(), "descendant") {t.Fatalf("move folder+contained file error = %v, want descendant rejection", err)}@@ -657,7 +669,7 @@ func TestMoveFilesRejectsNestedSourcesInEitherOrder(t *testing.T) {svc := testFileService()for _, src := range [][]string{{"A", "B"}, {"B", "A"}} {- err := svc.MoveFiles(context.Background(), "tenant-1", src, "D", "")+ err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", src, "D", "")if err == nil || !strings.Contains(err.Error(), "descendant") {t.Fatalf("move %v error = %v, want descendant rejection", src, err)}@@ -685,7 +697,7 @@ func TestMoveFilesAllowsUnrelatedEntries(t *testing.T) {}svc := testFileService()- if err := svc.MoveFiles(context.Background(), "tenant-1", []string{"A", "X"}, "D", ""); err != nil {+ if err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"A", "X"}, "D", ""); err != nil {t.Fatalf("move unrelated entries failed: %v", err)}if got := countChildren(t, "D"); got != 2 {@@ -701,7 +713,7 @@ func TestMoveFilesSingleFolderWithSubtreeStillMoves(t *testing.T) {seedMoveHierarchyDB(t)svc := testFileService()- if err := svc.MoveFiles(context.Background(), "tenant-1", []string{"A"}, "D", ""); err != nil {+ if err := svc.MoveFiles(fileTestContext(t, "tenant-1", "tenant-1"), "tenant-1", []string{"A"}, "D", ""); err != nil {t.Fatalf("move single folder failed: %v", err)}diff --git a/internal/service/memory_saver_adapter_test.go b/internal/service/memory_saver_adapter_test.goindex d71f7a6f5c..754824f0dd 100644--- a/internal/service/memory_saver_adapter_test.go+++ b/internal/service/memory_saver_adapter_test.go@@ -26,6 +26,7 @@ import ("ragflow/internal/engine""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport")func TestMemorySaverAuthorizesWithAuthenticatedCanvasCaller(t *testing.T) {@@ -33,33 +34,27 @@ func TestMemorySaverAuthorizesWithAuthenticatedCanvasCaller(t *testing.T) {if err := dao.DB.AutoMigrate(&entity.UserCanvas{}); err != nil {t.Fatalf("migrate canvas table: %v", err)}- status := string(entity.StatusValid)+ ctx := serviceTestContext(t, "caller", "canvas-owner", "canvas-owner")canvas := entity.UserCanvas{ID: "canvas-1",UserID: "canvas-owner",+ TenantID: sptr("canvas-owner"),Permission: string(entity.TenantPermissionTeam),}if err := dao.DB.Create(&canvas).Error; err != nil {t.Fatalf("seed canvas: %v", err)}- for _, membership := range []*entity.UserTenant{- {ID: "canvas-owner-membership", UserID: "canvas-owner", TenantID: "canvas-owner", Role: string(permission.RoleOwner), Status: &status},- {ID: "caller-canvas-membership", UserID: "caller", TenantID: "canvas-owner", Role: string(permission.RoleNormal), Status: &status},- {ID: "memory-owner-membership", UserID: "canvas-owner", TenantID: "memory-tenant", Role: string(permission.RoleNormal), Status: &status},- {ID: "memory-tenant-owner-membership", UserID: "memory-tenant", TenantID: "memory-tenant", Role: string(permission.RoleOwner), Status: &status},- } {- if err := dao.DB.Create(membership).Error; err != nil {- t.Fatalf("seed membership: %v", err)- }+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, "canvas-owner", "caller", "canvas-owner"); err != nil {+ t.Fatalf("prepare canvas permission fixture: %v", err)}memory := entity.Memory{ID: "memory-1",Name: "Shared memory",- TenantID: "memory-tenant",+ TenantID: "canvas-owner",StorageType: "table",EmbdID: "embedding",LLMID: "chat",- Permissions: string(entity.TenantPermissionTeam),+ Permissions: string(entity.TenantPermissionMe),ForgettingPolicy: string(ForgettingPolicyFIFO),}if err := dao.DB.Create(&memory).Error; err != nil {@@ -69,7 +64,13 @@ func TestMemorySaverAuthorizesWithAuthenticatedCanvasCaller(t *testing.T) {state := runtime.NewCanvasState("run-1", "session-1")state.Sys["canvas_id"] = canvas.IDstate.Sys["user_id"] = "caller"- ctx := runtime.WithState(serviceTestContext(t, "caller", "canvas-owner"), state)+ ctx = runtime.WithState(ctx, state)+ ownerCtx := permission.WithSubject(ctx, permission.Subject{UserID: "canvas-owner", TenantID: "canvas-owner"})+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ownerCtx, permission.Subject{UserID: "canvas-owner"}, permission.ResourceRef{+ Kind: permission.ResourceKindMemory, ID: memory.ID,+ }, permission.OperationUse); err != nil {+ t.Fatalf("canvas owner should be able to use memory: %v", err)+ }// req.UserID is the memory-message partition key and must not be trusted as// the permission subject. The canvas owner can access memory-1, but callerdiff --git a/internal/service/test_helpers_ee_test.go b/internal/service/test_helpers_ee_test.goindex fe8c431ec8..5acb821e34 100644--- a/internal/service/test_helpers_ee_test.go+++ b/internal/service/test_helpers_ee_test.go@@ -18,8 +18,6 @@ package serviceimport "testing"-func prepareServiceTestContextEE(_ *testing.T, _ string, _ ...string) {}-func grantServiceTestResource(_ *testing.T, _ string, _ string, _ string, _ string, _ int32) {}func restrictServiceTestFeatureRole(_ *testing.T, _ string, _ string, _ int32) {}diff --git a/internal/service/test_helpers_test.go b/internal/service/test_helpers_test.goindex d91e481340..4d636d3935 100644--- a/internal/service/test_helpers_test.go+++ b/internal/service/test_helpers_test.go@@ -28,6 +28,7 @@ import ("ragflow/internal/engine/types""ragflow/internal/entity""ragflow/internal/permission"+ "ragflow/internal/permission/testsupport")const (@@ -59,6 +60,7 @@ func setupServiceTestDB(t *testing.T) *gorm.DB {&entity.IngestionTaskLog{},&entity.PipelineOperationLog{},&entity.UserCanvas{},+ &entity.UserCanvasVersion{},&entity.File2Document{},&entity.File{},&entity.User{},@@ -117,7 +119,9 @@ func serviceTestContext(t *testing.T, userID, tenantID string, additionalMemberI}}}- prepareServiceTestContextEE(t, tenantID, memberIDs...)+ if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, memberIDs...); err != nil {+ t.Fatalf("prepare enterprise permission fixture: %v", err)+ }}}return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})