Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix: respect active tenant in service operations (#21462)

buua43667f9b211abe5
diff --git a/internal/admin/user_detail_community_test.go b/internal/admin/user_detail_community_test.go
new file mode 100644
index 0000000000..dd4ef869c8
--- /dev/null
+++ b/internal/admin/user_detail_community_test.go
@@ -0,0 +1,76 @@
+//
+// 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 admin
+
+import (
+ "encoding/json"
+ "net/http"
+ "net/http/httptest"
+ "testing"
+
+ "ragflow/internal/common"
+
+ "github.com/gin-gonic/gin"
+)
+
+func TestUserAgentsRouteRequiresEE(t *testing.T) {
+ engine := gin.New()
+ RegisterEERouter(engine.Group("/api/v1/admin"), NewRouter(&Handler{}))
+
+ response := httptest.NewRecorder()
+ request := httptest.NewRequest(http.MethodGet, "/api/v1/admin/users/user%40example.com/agents", nil)
+ engine.ServeHTTP(response, request)
+ if response.Code != http.StatusNotImplemented {
+ t.Fatalf("HTTP status = %d, want %d; body = %s", response.Code, http.StatusNotImplemented, response.Body.String())
+ }
+
+ var result struct {
+ Code common.ErrorCode `json:"code"`
+ Data json.RawMessage `json:"data"`
+ Message string `json:"message"`
+ }
+ if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil {
+ t.Fatal(err)
+ }
+ if result.Code != common.CodeNotImplemented || string(result.Data) != "null" || result.Message != "listing user agents is only available in the enterprise edition" {
+ t.Fatalf("response = %s, want enterprise edition error with null data", response.Body.String())
+ }
+}
+
+func TestUserDatasetsRouteRequiresEE(t *testing.T) {
+ engine := gin.New()
+ RegisterEERouter(engine.Group("/api/v1/admin"), NewRouter(&Handler{}))
+
+ response := httptest.NewRecorder()
+ request := httptest.NewRequest(http.MethodGet, "/api/v1/admin/users/user%40example.com/datasets", nil)
+ engine.ServeHTTP(response, request)
+ if response.Code != http.StatusNotImplemented {
+ t.Fatalf("HTTP status = %d, want %d; body = %s", response.Code, http.StatusNotImplemented, response.Body.String())
+ }
+
+ var result struct {
+ Code common.ErrorCode `json:"code"`
+ Data json.RawMessage `json:"data"`
+ Message string `json:"message"`
+ }
+ if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil {
+ t.Fatal(err)
+ }
+ if result.Code != common.CodeNotImplemented || string(result.Data) != "null" || result.Message != "listing user datasets is only available in the enterprise edition" {
+ t.Fatalf("response = %s, want enterprise edition error with null data", response.Body.String())
+ }
+}
diff --git a/internal/admin/user_detail_ee_test.go b/internal/admin/user_detail_ee_test.go
index dd4ef869c8..80e113d182 100644
--- a/internal/admin/user_detail_ee_test.go
+++ b/internal/admin/user_detail_ee_test.go
@@ -15,62 +15,3 @@
//
package admin
-
-import (
- "encoding/json"
- "net/http"
- "net/http/httptest"
- "testing"
-
- "ragflow/internal/common"
-
- "github.com/gin-gonic/gin"
-)
-
-func TestUserAgentsRouteRequiresEE(t *testing.T) {
- engine := gin.New()
- RegisterEERouter(engine.Group("/api/v1/admin"), NewRouter(&Handler{}))
-
- response := httptest.NewRecorder()
- request := httptest.NewRequest(http.MethodGet, "/api/v1/admin/users/user%40example.com/agents", nil)
- engine.ServeHTTP(response, request)
- if response.Code != http.StatusNotImplemented {
- t.Fatalf("HTTP status = %d, want %d; body = %s", response.Code, http.StatusNotImplemented, response.Body.String())
- }
-
- var result struct {
- Code common.ErrorCode `json:"code"`
- Data json.RawMessage `json:"data"`
- Message string `json:"message"`
- }
- if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil {
- t.Fatal(err)
- }
- if result.Code != common.CodeNotImplemented || string(result.Data) != "null" || result.Message != "listing user agents is only available in the enterprise edition" {
- t.Fatalf("response = %s, want enterprise edition error with null data", response.Body.String())
- }
-}
-
-func TestUserDatasetsRouteRequiresEE(t *testing.T) {
- engine := gin.New()
- RegisterEERouter(engine.Group("/api/v1/admin"), NewRouter(&Handler{}))
-
- response := httptest.NewRecorder()
- request := httptest.NewRequest(http.MethodGet, "/api/v1/admin/users/user%40example.com/datasets", nil)
- engine.ServeHTTP(response, request)
- if response.Code != http.StatusNotImplemented {
- t.Fatalf("HTTP status = %d, want %d; body = %s", response.Code, http.StatusNotImplemented, response.Body.String())
- }
-
- var result struct {
- Code common.ErrorCode `json:"code"`
- Data json.RawMessage `json:"data"`
- Message string `json:"message"`
- }
- if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil {
- t.Fatal(err)
- }
- if result.Code != common.CodeNotImplemented || string(result.Data) != "null" || result.Message != "listing user datasets is only available in the enterprise edition" {
- t.Fatalf("response = %s, want enterprise edition error with null data", response.Body.String())
- }
-}
diff --git a/internal/agentic_rag/agent.go b/internal/agentic_rag/agent.go
index 75be704428..84f570ffd7 100644
--- a/internal/agentic_rag/agent.go
+++ b/internal/agentic_rag/agent.go
@@ -70,6 +70,8 @@ type Input struct {
// the session created in the UI). It is injected into the retrieval tools so
// they search the right index without a canvas runtime.
TenantID string
+ // UserID identifies whose per-Tenant default models apply to this run.
+ UserID string
// DatasetIDs is the conversation's bound dataset scope, decided by the
// session created in the UI. It is injected into the retrieval tools.
DatasetIDs []string
@@ -347,7 +349,7 @@ func Run(ctx context.Context, in Input) (string, error) {
// serving. The generated key above is a per-turn placeholder and must not be
// used here — a run with no real chat id falls back to the tenant default,
// exactly as a chat that never overrode it does.
- ctx = withDecisionScope(ctx, in.TenantID, in.ConversationKey)
+ ctx = withDecisionScope(ctx, in.TenantID, in.ConversationKey, in.UserID)
if generatedKey {
// The generated key belongs to this turn alone: no later run reuses it,
// so release its availability marks on the way out instead of leaking
diff --git a/internal/agentic_rag/decision_config.go b/internal/agentic_rag/decision_config.go
index cc126c2e4a..4cf55cf74f 100644
--- a/internal/agentic_rag/decision_config.go
+++ b/internal/agentic_rag/decision_config.go
@@ -46,15 +46,21 @@ import (
type decisionScope struct {
tenantID string
chatID string
+ userID string
}
type decisionScopeContextKey struct{}
// withDecisionScope attaches the tenant/chat the run belongs to.
-func withDecisionScope(ctx context.Context, tenantID, chatID string) context.Context {
+func withDecisionScope(ctx context.Context, tenantID, chatID string, userIDs ...string) context.Context {
+ userID := ""
+ if len(userIDs) > 0 {
+ userID = strings.TrimSpace(userIDs[0])
+ }
return context.WithValue(ctx, decisionScopeContextKey{}, decisionScope{
tenantID: strings.TrimSpace(tenantID),
chatID: strings.TrimSpace(chatID),
+ userID: userID,
})
}
@@ -103,7 +109,7 @@ func resolveDecisionBackend(ctx context.Context) *decisionBackend {
// ownership check only runs on a miss. Keyed by model id alone, a second
// tenant that names the same id within the TTL would receive the first
// tenant's backend without the check ever running.
- cacheKey := scope.tenantID + "\x00" + modelID
+ cacheKey := scope.tenantID + "\x00" + scope.userID + "\x00" + modelID
decisionConfigMu.Lock()
entry := decisionConfigCache[cacheKey]
@@ -144,7 +150,14 @@ func decisionModelIDFor(ctx context.Context, scope decisionScope) string {
}
}
if scope.tenantID != "" {
- membership, err := dao.NewUserTenantDAO().GetOwnerByTenantID(ctx, dao.DB, scope.tenantID)
+ membershipDAO := dao.NewUserTenantDAO()
+ var membership *entity.UserTenant
+ var err error
+ if scope.userID != "" {
+ membership, err = membershipDAO.FilterByUserIDAndTenantID(ctx, dao.DB, scope.userID, scope.tenantID)
+ } else {
+ membership, err = membershipDAO.GetOwnerByTenantID(ctx, dao.DB, scope.tenantID)
+ }
if err == nil && membership != nil {
if id := resolvedDecisionID(membership.TenantDecisionID, membership.DecisionID); id != "" {
return id
diff --git a/internal/cli/admin_command_community_test.go b/internal/cli/admin_command_community_test.go
new file mode 100644
index 0000000000..4e1d910bdb
--- /dev/null
+++ b/internal/cli/admin_command_community_test.go
@@ -0,0 +1,74 @@
+//
+// 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 cli
+
+import (
+ "strings"
+ "testing"
+)
+
+func TestParseAdminListUserAgentsRequiresEE(t *testing.T) {
+ cmd, err := NewParser("LIST USER '[email protected]' AGENTS;").Parse(AdminMode)
+ if cmd != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
+ t.Fatalf("Parse() = (%v, %v), want nil command and enterprise edition error", cmd, err)
+ }
+}
+
+func TestAdminListUserAgentsRequiresEE(t *testing.T) {
+ cmd := NewCommand("admin_list_user_agents")
+ cmd.Params["user_name"] = "[email protected]"
+ response, err := (&CLI{}).AdminListUserAgentsCommand(1, cmd)
+ if response != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
+ t.Fatalf("AdminListUserAgentsCommand() = (%v, %v), want nil response and enterprise edition error", response, err)
+ }
+}
+
+func TestParseAPIListAgents(t *testing.T) {
+ cmd, err := NewParser("LIST AGENTS;").Parse(APIMode)
+ if err != nil {
+ t.Fatalf("Parse() error = %v", err)
+ }
+ if cmd == nil || cmd.Type != "api_list_agents" {
+ t.Fatalf("Parse() command = %v, want api_list_agents", cmd)
+ }
+}
+
+func TestParseAdminListUserDatasetsRequiresEE(t *testing.T) {
+ cmd, err := NewParser("LIST USER '[email protected]' DATASETS;").Parse(AdminMode)
+ if cmd != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
+ t.Fatalf("Parse() = (%v, %v), want nil command and enterprise edition error", cmd, err)
+ }
+}
+
+func TestAdminListUserDatasetsRequiresEE(t *testing.T) {
+ cmd := NewCommand("admin_list_user_datasets")
+ cmd.Params["user_name"] = "[email protected]"
+ response, err := (&CLI{}).AdminListUserDatasetsCommand(1, cmd)
+ if response != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
+ t.Fatalf("AdminListUserDatasetsCommand() = (%v, %v), want nil response and enterprise edition error", response, err)
+ }
+}
+
+func TestParseAPIListDatasets(t *testing.T) {
+ cmd, err := NewParser("LIST DATASETS;").Parse(APIMode)
+ if err != nil {
+ t.Fatalf("Parse() error = %v", err)
+ }
+ if cmd == nil || cmd.Type != "api_list_datasets" {
+ t.Fatalf("Parse() command = %v, want api_list_datasets", cmd)
+ }
+}
diff --git a/internal/cli/admin_command_ee_test.go b/internal/cli/admin_command_ee_test.go
index 4e1d910bdb..14de499cc1 100644
--- a/internal/cli/admin_command_ee_test.go
+++ b/internal/cli/admin_command_ee_test.go
@@ -15,60 +15,3 @@
//
package cli
-
-import (
- "strings"
- "testing"
-)
-
-func TestParseAdminListUserAgentsRequiresEE(t *testing.T) {
- cmd, err := NewParser("LIST USER '[email protected]' AGENTS;").Parse(AdminMode)
- if cmd != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
- t.Fatalf("Parse() = (%v, %v), want nil command and enterprise edition error", cmd, err)
- }
-}
-
-func TestAdminListUserAgentsRequiresEE(t *testing.T) {
- cmd := NewCommand("admin_list_user_agents")
- cmd.Params["user_name"] = "[email protected]"
- response, err := (&CLI{}).AdminListUserAgentsCommand(1, cmd)
- if response != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
- t.Fatalf("AdminListUserAgentsCommand() = (%v, %v), want nil response and enterprise edition error", response, err)
- }
-}
-
-func TestParseAPIListAgents(t *testing.T) {
- cmd, err := NewParser("LIST AGENTS;").Parse(APIMode)
- if err != nil {
- t.Fatalf("Parse() error = %v", err)
- }
- if cmd == nil || cmd.Type != "api_list_agents" {
- t.Fatalf("Parse() command = %v, want api_list_agents", cmd)
- }
-}
-
-func TestParseAdminListUserDatasetsRequiresEE(t *testing.T) {
- cmd, err := NewParser("LIST USER '[email protected]' DATASETS;").Parse(AdminMode)
- if cmd != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
- t.Fatalf("Parse() = (%v, %v), want nil command and enterprise edition error", cmd, err)
- }
-}
-
-func TestAdminListUserDatasetsRequiresEE(t *testing.T) {
- cmd := NewCommand("admin_list_user_datasets")
- cmd.Params["user_name"] = "[email protected]"
- response, err := (&CLI{}).AdminListUserDatasetsCommand(1, cmd)
- if response != nil || err == nil || !strings.Contains(err.Error(), "enterprise edition") {
- t.Fatalf("AdminListUserDatasetsCommand() = (%v, %v), want nil response and enterprise edition error", response, err)
- }
-}
-
-func TestParseAPIListDatasets(t *testing.T) {
- cmd, err := NewParser("LIST DATASETS;").Parse(APIMode)
- if err != nil {
- t.Fatalf("Parse() error = %v", err)
- }
- if cmd == nil || cmd.Type != "api_list_datasets" {
- t.Fatalf("Parse() command = %v, want api_list_datasets", cmd)
- }
-}
diff --git a/internal/dao/mcp.go b/internal/dao/mcp.go
index de78bfbeae..85738de847 100644
--- a/internal/dao/mcp.go
+++ b/internal/dao/mcp.go
@@ -20,6 +20,7 @@ import (
"context"
"errors"
"fmt"
+ "math/big"
"strings"
"ragflow/internal/entity"
@@ -73,43 +74,80 @@ func (dao *MCPServerDAO) CreateMCPServer(ctx context.Context, db *gorm.DB, serve
return db.WithContext(ctx).Create(server).Error
}
-// ListMCPServers returns MCP servers for one tenant with optional ID filtering.
-func (dao *MCPServerDAO) ListMCPServers(ctx context.Context, db *gorm.DB, tenantID string, ids []string, keywords string, orderby string, desc bool) ([]*entity.MCPServer, int64, error) {
+// ListMCPServers returns the authorized MCP server page and the total number
+// of authorized servers. Authorization is applied before counting and paging.
+func (dao *MCPServerDAO) ListMCPServers(ctx context.Context, db *gorm.DB, tenantID string, ids []string, keywords, orderby string, desc bool, page, pageSize int, authorize func(*gorm.DB) *gorm.DB) ([]*entity.MCPServer, int64, error) {
orderColumn, err := mcpServerOrderColumn(orderby)
if err != nil {
return nil, 0, err
}
- var servers []*entity.MCPServer
- var total int64
-
- query := db.WithContext(ctx).Model(&entity.MCPServer{}).Where("tenant_id = ?", tenantID)
- if len(ids) > 0 {
- query = query.Where("id IN ?", ids)
+ if authorize == nil {
+ return nil, 0, fmt.Errorf("MCP server list requires an authorization scope")
}
- if keywords != "" {
- query = query.Where("LOWER(name) LIKE ?", "%"+strings.ToLower(keywords)+"%")
+ baseQuery := func() *gorm.DB {
+ query := db.WithContext(ctx).Model(&entity.MCPServer{}).Where("tenant_id = ?", tenantID)
+ if len(ids) > 0 {
+ query = query.Where("id IN ?", ids)
+ }
+ if keywords != "" {
+ query = query.Where("LOWER(name) LIKE ?", "%"+strings.ToLower(keywords)+"%")
+ }
+ return authorize(query)
}
- if err := query.Count(&total).Error; err != nil {
+ var total int64
+ if err := baseQuery().Count(&total).Error; err != nil {
return nil, 0, err
}
+ query := baseQuery().Select("id", "name", "server_type", "url", "description", "variables", "create_date", "update_date")
orderDirection := "ASC"
if desc {
orderDirection = "DESC"
}
query = query.Order(orderColumn + " " + orderDirection)
-
- if err := query.
- Select("id", "name", "server_type", "url", "description", "variables", "create_date", "update_date").
- Find(&servers).Error; err != nil {
+ if orderColumn != "id" {
+ query = query.Order("id ASC")
+ }
+ if page != 0 && pageSize != 0 {
+ start, stop := mcpServerPageRange(total, page, pageSize)
+ if stop <= start {
+ return []*entity.MCPServer{}, total, nil
+ }
+ query = query.Offset(start).Limit(stop - start)
+ }
+ var servers []*entity.MCPServer
+ if err := query.Find(&servers).Error; err != nil {
return nil, 0, err
}
-
return servers, total, nil
}
+func mcpServerPageRange(total int64, page, pageSize int) (int, int) {
+ pageValue := big.NewInt(int64(page))
+ pageSizeValue := big.NewInt(int64(pageSize))
+ startValue := new(big.Int).Sub(new(big.Int).Set(pageValue), big.NewInt(1))
+ startValue.Mul(startValue, pageSizeValue)
+ stopValue := new(big.Int).Mul(new(big.Int).Set(pageValue), pageSizeValue)
+ totalValue := big.NewInt(total)
+
+ clamp := func(value *big.Int) int {
+ value = new(big.Int).Set(value)
+ if value.Sign() < 0 {
+ value.Add(value, totalValue)
+ }
+ if value.Sign() < 0 {
+ return 0
+ }
+ if value.Cmp(totalValue) > 0 {
+ return int(total)
+ }
+ return int(value.Int64())
+ }
+ return clamp(startValue), clamp(stopValue)
+}
+
// DeleteMCPServer deletes an MCP server owned by a tenant.
func (dao *MCPServerDAO) DeleteMCPServer(ctx context.Context, db *gorm.DB, id, tenantID string) (bool, error) {
result := db.WithContext(ctx).Where("id = ? AND tenant_id = ?", id, tenantID).Delete(&entity.MCPServer{})
diff --git a/internal/dao/mcp_test.go b/internal/dao/mcp_test.go
index 54b4dd5e5a..8e6ef30604 100644
--- a/internal/dao/mcp_test.go
+++ b/internal/dao/mcp_test.go
@@ -17,8 +17,15 @@
package dao
import (
+ "context"
"errors"
+ "net/url"
"testing"
+
+ "ragflow/internal/entity"
+
+ "github.com/glebarez/sqlite"
+ "gorm.io/gorm"
)
func TestMCPServerOrderColumnInvalidField(t *testing.T) {
@@ -37,3 +44,52 @@ func TestMCPServerOrderColumnInvalidField(t *testing.T) {
t.Fatalf("expected %q, got %q", want, err.Error())
}
}
+
+func TestListMCPServersCountsAndPaginatesAfterSQLAuthorization(t *testing.T) {
+ db, err := gorm.Open(sqlite.Open("file:"+url.QueryEscape(t.Name())+"?mode=memory&cache=shared"), &gorm.Config{})
+ if err != nil {
+ t.Fatalf("open sqlite: %v", err)
+ }
+ if err := db.AutoMigrate(&entity.MCPServer{}); err != nil {
+ t.Fatalf("migrate MCP server: %v", err)
+ }
+ for _, server := range []*entity.MCPServer{
+ {ID: "mcp-a", TenantID: "tenant-1", Name: "alpha", URL: "https://example.test/a", ServerType: "sse"},
+ {ID: "mcp-b", TenantID: "tenant-1", Name: "bravo", URL: "https://example.test/b", ServerType: "sse"},
+ {ID: "mcp-c", TenantID: "tenant-1", Name: "charlie", URL: "https://example.test/c", ServerType: "sse"},
+ {ID: "other-tenant", TenantID: "tenant-2", Name: "delta", URL: "https://example.test/d", ServerType: "sse"},
+ } {
+ if err := db.Create(server).Error; err != nil {
+ t.Fatalf("create MCP server %q: %v", server.ID, err)
+ }
+ }
+
+ authorize := func(query *gorm.DB) *gorm.DB { return query.Where("name <> ?", "alpha") }
+ servers, total, err := NewMCPServerDAO().ListMCPServers(context.Background(), db, "tenant-1", nil, "", "name", false, 2, 1, authorize)
+ if err != nil {
+ t.Fatalf("ListMCPServers(): %v", err)
+ }
+ if total != 2 || len(servers) != 1 || servers[0].ID != "mcp-c" {
+ t.Fatalf("ListMCPServers() = (total %d, %#v), want total 2 and page [mcp-c]", total, servers)
+ }
+}
+
+func TestMCPServerPageRangeMatchesSliceBounds(t *testing.T) {
+ for _, test := range []struct {
+ name string
+ total int64
+ page, pageSize int
+ wantStart, wantEnd int
+ }{
+ {name: "positive page", total: 5, page: 2, pageSize: 2, wantStart: 2, wantEnd: 4},
+ {name: "negative slice", total: 13, page: -1, pageSize: 5, wantStart: 3, wantEnd: 8},
+ {name: "reversed slice", total: 13, page: -1, pageSize: -2, wantStart: 4, wantEnd: 2},
+ } {
+ t.Run(test.name, func(t *testing.T) {
+ start, end := mcpServerPageRange(test.total, test.page, test.pageSize)
+ if start != test.wantStart || end != test.wantEnd {
+ t.Fatalf("mcpServerPageRange() = (%d, %d), want (%d, %d)", start, end, test.wantStart, test.wantEnd)
+ }
+ })
+ }
+}
diff --git a/internal/dao/tenant_ee_test.go b/internal/dao/tenant_ee_test.go
new file mode 100644
index 0000000000..7a0a416010
--- /dev/null
+++ b/internal/dao/tenant_ee_test.go
@@ -0,0 +1,19 @@
+//
+// 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 dao
+
+func tenantDAOTestExtraModels() []interface{} { return nil }
diff --git a/internal/dao/tenant_test.go b/internal/dao/tenant_test.go
index f5b1e833dd..1bae8527a6 100644
--- a/internal/dao/tenant_test.go
+++ b/internal/dao/tenant_test.go
@@ -31,8 +31,10 @@ func setupTenantDAOTestDB(t *testing.T) *gorm.DB {
if err != nil {
t.Fatalf("failed to open sqlite: %v", err)
}
- if err := db.AutoMigrate(&entity.Tenant{}); err != nil {
- t.Fatalf("failed to migrate tenant: %v", err)
+ models := []interface{}{&entity.Tenant{}}
+ models = append(models, tenantDAOTestExtraModels()...)
+ if err := db.AutoMigrate(models...); err != nil {
+ t.Fatalf("failed to migrate tenant tables: %v", err)
}
return db
}
diff --git a/internal/handler/searchbot.go b/internal/handler/searchbot.go
index 6a06c27e94..7d361d0443 100644
--- a/internal/handler/searchbot.go
+++ b/internal/handler/searchbot.go
@@ -290,7 +290,7 @@ func (h *SearchBotHandler) Ask(c *gin.Context) {
}
if modelID == "" && h.tenantSvc != nil {
ctx := c.Request.Context()
- defaultModel, err := h.tenantSvc.GetDefaultModelName(ctx, user.ID, entity.ModelTypeChat)
+ defaultModel, err := h.tenantSvc.GetDefaultModelNameForUser(ctx, user.ID, entity.ModelTypeChat)
if err == nil && defaultModel != "" {
modelID = defaultModel
}
diff --git a/internal/ingestion/component/dispatch_model.go b/internal/ingestion/component/dispatch_model.go
index a89e790f5d..8c37cd885f 100644
--- a/internal/ingestion/component/dispatch_model.go
+++ b/internal/ingestion/component/dispatch_model.go
@@ -178,10 +178,7 @@ func ocrProviderAliases(providerName string) []string {
func resolveDefaultModelMembership(ctx context.Context, db *gorm.DB, tenantID string) (*entity.UserTenant, error) {
membershipDAO := dao.NewUserTenantDAO()
if subject, ok := permission.SubjectFromContext(ctx); ok && subject.UserID != "" && (subject.TenantID == "" || subject.TenantID == tenantID) {
- membership, err := membershipDAO.FilterByUserIDAndTenantID(ctx, db, subject.UserID, tenantID)
- if err == nil {
- return membership, nil
- }
+ return membershipDAO.FilterByUserIDAndTenantID(ctx, db, subject.UserID, tenantID)
}
return membershipDAO.GetOwnerByTenantID(ctx, db, tenantID)
}
diff --git a/internal/permission/mcp_query_scope_test.go b/internal/permission/mcp_query_scope_test.go
new file mode 100644
index 0000000000..1160db2db9
--- /dev/null
+++ b/internal/permission/mcp_query_scope_test.go
@@ -0,0 +1,56 @@
+//go:build !enterprise
+
+package permission
+
+import (
+ "context"
+ "net/url"
+ "testing"
+
+ "ragflow/internal/entity"
+
+ "github.com/glebarez/sqlite"
+ "gorm.io/gorm"
+)
+
+func TestCommunityMCPQueryScopeFiltersBeforeListing(t *testing.T) {
+ db, err := gorm.Open(sqlite.Open("file:"+url.QueryEscape(t.Name())+"?mode=memory&cache=shared"), &gorm.Config{})
+ if err != nil {
+ t.Fatalf("open sqlite: %v", err)
+ }
+ if err := db.AutoMigrate(&entity.MCPServer{}, &entity.UserTenant{}); err != nil {
+ t.Fatalf("migrate MCP permission tables: %v", err)
+ }
+ status := string(entity.StatusValid)
+ if err := db.Create(&entity.UserTenant{ID: "owner-membership", UserID: "owner", TenantID: "tenant-1", Role: string(RoleOwner), Status: &status}).Error; err != nil {
+ t.Fatalf("create owner membership: %v", err)
+ }
+ if err := db.Create(&entity.UserTenant{ID: "member-membership", UserID: "member", TenantID: "tenant-1", Role: string(RoleNormal), Status: &status}).Error; err != nil {
+ t.Fatalf("create member membership: %v", err)
+ }
+ if err := db.Create(&entity.MCPServer{ID: "mcp-1", TenantID: "tenant-1", Name: "server", URL: "https://example.test", ServerType: "sse"}).Error; err != nil {
+ t.Fatalf("create MCP server: %v", err)
+ }
+
+ checker := newCommunityDatabaseChecker(db)
+ query := ScopeQuery{Kind: ResourceKindMCPServer, Operation: OperationRead}
+ for _, test := range []struct {
+ userID string
+ want int64
+ }{
+ {userID: "owner", want: 1},
+ {userID: "member", want: 0},
+ } {
+ scope, err := checker.QueryScope(context.Background(), Subject{UserID: test.userID, TenantID: "tenant-1"}, query)
+ if err != nil {
+ t.Fatalf("QueryScope(%q): %v", test.userID, err)
+ }
+ var count int64
+ if err := scope.Apply(db.Model(&entity.MCPServer{})).Count(&count).Error; err != nil {
+ t.Fatalf("count MCP servers for %q: %v", test.userID, err)
+ }
+ if count != test.want {
+ t.Errorf("QueryScope(%q) count = %d, want %d", test.userID, count, test.want)
+ }
+ }
+}
diff --git a/internal/permission/policy_ce.go b/internal/permission/policy_ce.go
index 90da98504c..95207324d3 100644
--- a/internal/permission/policy_ce.go
+++ b/internal/permission/policy_ce.go
@@ -172,6 +172,9 @@ func (p *communityPolicy) Scope(ctx context.Context, subject Subject, query Scop
}
func (p *communityPolicy) QueryScope(ctx context.Context, subject Subject, query ScopeQuery) (QueryScope, bool, error) {
+ if query.Kind == ResourceKindMCPServer && query.Operation == OperationRead && query.Parent.ID == "" && query.Parent.Kind == "" && query.Entry == nil {
+ return p.mcpServerReadQueryScope(ctx, subject)
+ }
if query.Kind == ResourceKindFile || query.Kind == ResourceKindFolder {
return p.fileReadQueryScope(ctx, subject, query)
}
@@ -215,6 +218,27 @@ func (p *communityPolicy) QueryScope(ctx context.Context, subject Subject, query
}}, true, nil
}
+func (p *communityPolicy) mcpServerReadQueryScope(ctx context.Context, subject Subject) (QueryScope, bool, error) {
+ if err := validateSubject(subject); err != nil {
+ return QueryScope{}, true, err
+ }
+ tenantID := strings.TrimSpace(subject.TenantID)
+ if tenantID == "" {
+ return QueryScope{}, true, ErrInvalidSubject
+ }
+ source, ok := p.source.(*databaseSource)
+ if !ok || source.db == nil {
+ return QueryScope{}, false, nil
+ }
+ return QueryScope{apply: func(query *gorm.DB) *gorm.DB {
+ activeOwner := source.db.WithContext(ctx).Model(&entity.UserTenant{}).
+ Select("1").
+ Where("user_tenant.tenant_id = mcp_server.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?",
+ subject.UserID, string(RoleOwner), string(entity.StatusValid))
+ return query.Where("mcp_server.tenant_id = ?", tenantID).Where("EXISTS (?)", activeOwner)
+ }}, true, nil
+}
+
func (p *communityPolicy) fileReadQueryScope(ctx context.Context, subject Subject, query ScopeQuery) (QueryScope, bool, error) {
if query.Operation != OperationRead || query.Parent.Kind != ResourceKindFolder || strings.TrimSpace(query.Parent.ID) == "" || query.Entry != nil {
return QueryScope{}, false, nil
@@ -298,13 +322,10 @@ func (p *communityPolicy) FilterResources(ctx context.Context, subject Subject,
return accessible, nil
}
-func (p *communityPolicy) FilterAccesses(ctx context.Context, subject Subject, refs []ResourceRef, operation Operation) (map[ResourceRef]Access, error) {
+func (p *communityPolicy) ResolveAccesses(ctx context.Context, subject Subject, refs []ResourceRef) (map[ResourceRef]Access, error) {
if err := validateSubject(subject); err != nil {
return nil, err
}
- if !validOperation(operation) {
- return nil, ErrInvalidPermission
- }
evaluation := newEvaluation(p.source)
refs = uniqueRefs(refs)
if err := evaluation.loadResources(ctx, refs); err != nil {
@@ -313,11 +334,8 @@ func (p *communityPolicy) FilterAccesses(ctx context.Context, subject Subject, r
accesses := make(map[ResourceRef]Access, len(refs))
for _, ref := range refs {
access, err := evaluation.resolveAccess(ctx, subject, ref)
- if err == nil && access.Allows(operation) {
- accesses[ref] = access
- continue
- }
if err == nil {
+ accesses[ref] = access
continue
}
if errorsIsPermissionDenial(err) || errors.Is(err, ErrResourceNotFound) {
@@ -328,6 +346,22 @@ func (p *communityPolicy) FilterAccesses(ctx context.Context, subject Subject, r
return accesses, nil
}
+func (p *communityPolicy) FilterAccesses(ctx context.Context, subject Subject, refs []ResourceRef, operation Operation) (map[ResourceRef]Access, error) {
+ if !validOperation(operation) {
+ return nil, ErrInvalidPermission
+ }
+ accesses, err := p.ResolveAccesses(ctx, subject, refs)
+ if err != nil {
+ return nil, err
+ }
+ for ref, access := range accesses {
+ if !access.Allows(operation) {
+ delete(accesses, ref)
+ }
+ }
+ return accesses, nil
+}
+
func newEvaluation(source Source) *evaluation {
return &evaluation{
source: source,
diff --git a/internal/permission/types.go b/internal/permission/types.go
index aaddbef476..e4ec8b7c7b 100644
--- a/internal/permission/types.go
+++ b/internal/permission/types.go
@@ -280,8 +280,8 @@ type queryScopePolicy interface {
QueryScope(context.Context, Subject, ScopeQuery) (QueryScope, bool, error)
}
-type accessFilterPolicy interface {
- FilterAccesses(context.Context, Subject, []ResourceRef, Operation) (map[ResourceRef]Access, error)
+type accessResolverPolicy interface {
+ ResolveAccesses(context.Context, Subject, []ResourceRef) (map[ResourceRef]Access, error)
}
type resourceOwnerGranter interface {
@@ -432,22 +432,18 @@ func (c *Checker) FilterResources(ctx context.Context, subject Subject, resource
return c.policy.FilterResources(ctx, subject, resources, operation)
}
-// FilterAccesses resolves permissions for a batch of resources and returns the
-// effective access for each resource that allows operation. Database-backed
-// policies can load resource facts once for the whole batch.
-func (c *Checker) FilterAccesses(ctx context.Context, subject Subject, resources []ResourceRef, operation Operation) (map[ResourceRef]Access, error) {
+// ResolveAccesses resolves effective access for a batch of resources.
+// Database-backed policies can load resource facts once for the whole batch.
+func (c *Checker) ResolveAccesses(ctx context.Context, subject Subject, resources []ResourceRef) (map[ResourceRef]Access, error) {
if c == nil || c.policy == nil {
return nil, ErrSourceUnavailable
}
- if !validOperation(operation) {
- return nil, ErrInvalidPermission
- }
var err error
if subject, err = resolveSubject(ctx, subject); err != nil {
return nil, err
}
- if batchPolicy, ok := c.policy.(accessFilterPolicy); ok {
- return batchPolicy.FilterAccesses(ctx, subject, resources, operation)
+ if batchPolicy, ok := c.policy.(accessResolverPolicy); ok {
+ return batchPolicy.ResolveAccesses(ctx, subject, resources)
}
accesses := make(map[ResourceRef]Access, len(resources))
@@ -459,8 +455,27 @@ func (c *Checker) FilterAccesses(ctx context.Context, subject Subject, resources
}
return nil, err
}
- if access.Allows(operation) {
- accesses[resource] = access
+ accesses[resource] = access
+ }
+ return accesses, nil
+}
+
+// FilterAccesses resolves permissions for a batch of resources and returns the
+// effective access for each resource that allows operation.
+func (c *Checker) FilterAccesses(ctx context.Context, subject Subject, resources []ResourceRef, operation Operation) (map[ResourceRef]Access, error) {
+ if c == nil || c.policy == nil {
+ return nil, ErrSourceUnavailable
+ }
+ if !validOperation(operation) {
+ return nil, ErrInvalidPermission
+ }
+ accesses, err := c.ResolveAccesses(ctx, subject, resources)
+ if err != nil {
+ return nil, err
+ }
+ for ref, access := range accesses {
+ if !access.Allows(operation) {
+ delete(accesses, ref)
}
}
return accesses, nil
diff --git a/internal/service/agent_deferred_failure_test.go b/internal/service/agent_deferred_failure_test.go
index 56944ef7a8..231a96ddf1 100644
--- a/internal/service/agent_deferred_failure_test.go
+++ b/internal/service/agent_deferred_failure_test.go
@@ -114,7 +114,7 @@ func TestRunAgent_DeferredAgentModelFailureStaysInChatStream(t *testing.T) {
tracker, _ := newAgentCancelTracker(t)
svc := NewAgentServiceWithOptions(nil, nil, tracker)
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-deferred-fail"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-deferred-fail"),
"user-1",
"canvas-deferred-fail",
"session-deferred-fail",
diff --git a/internal/service/agent_input_test.go b/internal/service/agent_input_test.go
index 612dadf3c7..fba533b922 100644
--- a/internal/service/agent_input_test.go
+++ b/internal/service/agent_input_test.go
@@ -67,7 +67,7 @@ func TestAgentbotCompletionPreservesBooleanBeginInput(t *testing.T) {
if err := json.Unmarshal([]byte(body), &req); err != nil {
t.Fatal(err)
}
- events, code, err := svc.AgentbotCompletion(t.Context(), "user-1", "canvas-bool", req)
+ events, code, err := svc.AgentbotCompletion(serviceTestContext(t, "user-1", "tenant-1"), "user-1", "canvas-bool", req)
if err != nil || code != common.CodeSuccess {
t.Fatalf("AgentbotCompletion = (%d, %v)", code, err)
}
diff --git a/internal/service/agent_message_draft_test.go b/internal/service/agent_message_draft_test.go
index b5370d4586..f26f6f3cc6 100644
--- a/internal/service/agent_message_draft_test.go
+++ b/internal/service/agent_message_draft_test.go
@@ -42,15 +42,16 @@ func TestMessageDraftRoundTripAndExecution(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
title := "Message " + tt.name
- row, code, err := svc.CreateAgent(t.Context(), "user-1", &CreateAgentRequest{Title: &title, DSL: messageDraftDSL(tt.params)})
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ row, code, err := svc.CreateAgent(ctx, "user-1", &CreateAgentRequest{Title: &title, DSL: messageDraftDSL(tt.params)})
if err != nil || code != common.CodeSuccess {
t.Fatalf("create: code=%v err=%v", code, err)
}
for range 2 {
- if err := svc.UpdateAgent(t.Context(), "user-1", row.ID, map[string]any{"dsl": messageDraftDSL(tt.params)}); err != nil {
+ if err := svc.UpdateAgent(ctx, "user-1", row.ID, map[string]any{"dsl": messageDraftDSL(tt.params)}); err != nil {
t.Fatalf("save: %v", err)
}
- saved, err := svc.GetAgent(t.Context(), "user-1", row.ID)
+ saved, err := svc.GetAgent(ctx, "user-1", row.ID)
if err != nil {
t.Fatal(err)
}
diff --git a/internal/service/agent_persistence_test.go b/internal/service/agent_persistence_test.go
index 4d96057bd9..428cb347bf 100644
--- a/internal/service/agent_persistence_test.go
+++ b/internal/service/agent_persistence_test.go
@@ -180,7 +180,7 @@ func TestPersistAgentRunSessionPreservesThinking(t *testing.T) {
}
sqlDB.SetMaxOpenConns(1)
svc.activeSessions["session-think"] = &activeAgentRun{sessionID: "session-think"}
- ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
+ ctx, cancel := context.WithTimeout(serviceTestContext(t, "user-1", "user-1"), 5*time.Second)
defer cancel()
results := make(chan error, 2)
for _, question := range []string{"concurrent question 1", "concurrent question 2"} {
diff --git a/internal/service/agent_run_e2e_test.go b/internal/service/agent_run_e2e_test.go
index 56bee6727f..c7d4fa7f22 100644
--- a/internal/service/agent_run_e2e_test.go
+++ b/internal/service/agent_run_e2e_test.go
@@ -72,6 +72,7 @@ func makeCanvasWithDSL(t *testing.T, canvasID, userID, tenantID, versionID strin
dao.DB.Create(&entity.UserCanvas{
ID: canvasID,
UserID: userID,
+ TenantID: sptr(tenantID),
Title: sptr("Phase 4.4 V2 canvas"),
Permission: "me",
CanvasType: sptr("agent"),
@@ -202,7 +203,7 @@ func TestRunAgent_RealCanvas_BeginMessage(t *testing.T) {
cp := canvas.NewKvrocksCheckPointStoreWithClient(cpClient, 30*24*time.Hour)
svc := NewAgentServiceWithOptions(cp, nil, tracker)
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-hello"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-hello"),
"user-1",
"canvas-hello",
"session-hello",
@@ -295,7 +296,7 @@ func TestRunAgent_SessionHistoryFeedsSysHistoryAndPersists(t *testing.T) {
svc := NewAgentService()
run := func(input string) canvas.MessageEvent {
t.Helper()
- events, err := svc.RunAgent(t.Context(), "user-1", "canvas-history", "session-history", "", input, nil)
+ events, err := svc.RunAgent(serviceTestContext(t, "user-1", "tenant-1"), "user-1", "canvas-history", "session-history", "", input, nil)
if err != nil {
t.Fatalf("RunAgent(%q): %v", input, err)
}
@@ -391,7 +392,7 @@ func TestRunAgent_NewSessionPersistsHistoryForNextTurn(t *testing.T) {
makeCanvasWithDSL(t, "canvas-new-session", "user-1", "tenant-1", "v-new-session", dsl)
svc := NewAgentService()
- events, err := svc.RunAgent(t.Context(), "user-1", "canvas-new-session", "", "", "1", nil)
+ events, err := svc.RunAgent(serviceTestContext(t, "user-1", "tenant-1"), "user-1", "canvas-new-session", "", "", "1", nil)
if err != nil {
t.Fatalf("first RunAgent: %v", err)
}
@@ -422,7 +423,7 @@ func TestRunAgent_NewSessionPersistsHistoryForNextTurn(t *testing.T) {
t.Fatalf("new session lost reusable env state: %#v", globals["env.topic"])
}
- events, err = svc.RunAgent(t.Context(), "user-1", "canvas-new-session", session.ID, "", "1", nil)
+ events, err = svc.RunAgent(serviceTestContext(t, "user-1", "tenant-1"), "user-1", "canvas-new-session", session.ID, "", "1", nil)
if err != nil {
t.Fatalf("second RunAgent: %v", err)
}
@@ -479,7 +480,7 @@ func TestRunAgent_RejectsSessionOwnedByAnotherUser(t *testing.T) {
}
events, err := NewAgentService().RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-session-owner",
"session-foreign",
@@ -602,7 +603,7 @@ func TestRunAgent_RealCanvas_WaitForUserResume(t *testing.T) {
// Run 1: should emit a waiting_for_user event.
events1, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-fillup",
"session-fillup",
@@ -636,7 +637,7 @@ func TestRunAgent_RealCanvas_WaitForUserResume(t *testing.T) {
// — the actual cause was the test running without the
// production environment's checkpoint store.
events2, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-fillup",
"session-fillup", // SAME sessionID as run 1
@@ -714,7 +715,7 @@ func TestRunAgent_InterruptPersistsPartialAssistantHistory(t *testing.T) {
}
events, err := NewAgentService().RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-partial",
"session-partial",
@@ -800,7 +801,7 @@ func TestRunAgent_RealCanvas_WaitForUserResume_EventSemantics(t *testing.T) {
svc := NewAgentServiceWithOptions(cp, nil, tracker)
events1, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-fillup-events"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-fillup-events"),
"user-1",
"canvas-fillup-events",
"session-fillup-events",
@@ -823,7 +824,7 @@ func TestRunAgent_RealCanvas_WaitForUserResume_EventSemantics(t *testing.T) {
}
events2, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-fillup-events",
"session-fillup-events",
@@ -941,7 +942,7 @@ func TestRunAgent_RealCanvas_GroupedParallelOuterFollower(t *testing.T) {
svc := NewAgentService()
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-parallel"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-parallel"),
"user-1",
"canvas-parallel",
"session-parallel",
@@ -1018,7 +1019,7 @@ func TestRunAgent_AllFixture_LoopInterruptResume(t *testing.T) {
svc := NewAgentServiceWithOptions(cp, nil, tracker)
events1, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-all-loop"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-all-loop"),
"user-1",
"canvas-all",
"session-all-loop",
@@ -1058,7 +1059,7 @@ func TestRunAgent_AllFixture_LoopInterruptResume(t *testing.T) {
}
events2, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-all",
"session-all-loop",
@@ -1085,7 +1086,7 @@ func TestRunAgent_AllFixture_LoopInterruptResume(t *testing.T) {
}
events3, err := svc.RunAgent(
- t.Context(), "user-1", "canvas-all", "session-all-loop", "", "1", nil,
+ serviceTestContext(t, "user-1", "tenant-1"), "user-1", "canvas-all", "session-all-loop", "", "1", nil,
)
if err != nil {
t.Fatalf("RunAgent run 3: %v", err)
@@ -1140,7 +1141,7 @@ func TestRunAgent_AllFixture_LoopInterruptResume_MultiTurn(t *testing.T) {
var allMessages []canvas.MessageEvent
for i, input := range inputs {
- runCtx := t.Context()
+ runCtx := serviceTestContext(t, "user-1", "tenant-1")
if i == 0 {
runCtx = WithAgentSessionID(runCtx, sessionID)
}
@@ -1238,7 +1239,7 @@ func TestRunAgent_AllFixture_IterationFormatsItems(t *testing.T) {
sessionID := "session-all-iteration"
events1, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), sessionID),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), sessionID),
"user-1",
"canvas-all-iteration",
sessionID,
@@ -1267,7 +1268,7 @@ func TestRunAgent_AllFixture_IterationFormatsItems(t *testing.T) {
}
events2, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-all-iteration",
sessionID,
@@ -1294,7 +1295,7 @@ func TestRunAgent_AllFixture_IterationFormatsItems(t *testing.T) {
}
events3, err := svc.RunAgent(
- t.Context(), "user-1", "canvas-all-iteration", sessionID, "", "a,b,c,d,e", nil,
+ serviceTestContext(t, "user-1", "tenant-1"), "user-1", "canvas-all-iteration", sessionID, "", "a,b,c,d,e", nil,
)
if err != nil {
t.Fatalf("RunAgent run 3: %v", err)
@@ -1348,7 +1349,7 @@ func TestRunAgent_AllFixture_VarAssigner(t *testing.T) {
cp := canvas.NewKvrocksCheckPointStoreWithClient(cpClient, 30*24*time.Hour)
svc := NewAgentServiceWithOptions(cp, nil, tracker)
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-all-var-assigner"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-all-var-assigner"),
"user-1",
"canvas-all-var-assigner",
"session-all-var-assigner",
@@ -1371,7 +1372,7 @@ func TestRunAgent_AllFixture_VarAssigner(t *testing.T) {
t.Fatalf("expected no message before menu resume, got %d", len(messages))
}
events, err = svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-all-var-assigner",
"session-all-var-assigner",
@@ -1432,7 +1433,7 @@ func TestRunAgent_AllFixture_DataOps(t *testing.T) {
cp := canvas.NewKvrocksCheckPointStoreWithClient(cpClient, 30*24*time.Hour)
svc := NewAgentServiceWithOptions(cp, nil, tracker)
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-all-data-ops"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-all-data-ops"),
"user-1",
"canvas-all-data-ops",
"session-all-data-ops",
@@ -1455,7 +1456,7 @@ func TestRunAgent_AllFixture_DataOps(t *testing.T) {
t.Fatalf("expected no message before menu resume, got %d", len(messages))
}
events, err = svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-all-data-ops",
"session-all-data-ops",
@@ -1534,7 +1535,7 @@ func TestRunAgent_RealCanvas_CompileFails(t *testing.T) {
svc := NewAgentService()
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-bogus"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-bogus"),
"user-1",
"canvas-bogus",
"session-bogus",
@@ -1576,7 +1577,7 @@ func TestRunAgent_ExeSQLConfigErrorIsUserFacing(t *testing.T) {
}}
makeCanvasWithDSL(t, "canvas-exesql-config", "user-1", "tenant-1", "v-exesql-config", dsl)
- events, err := NewAgentService().RunAgent(WithAgentSessionID(t.Context(), "session-exesql-config"), "user-1", "canvas-exesql-config", "session-exesql-config", "", "hello", nil)
+ events, err := NewAgentService().RunAgent(WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-exesql-config"), "user-1", "canvas-exesql-config", "session-exesql-config", "", "hello", nil)
if err != nil {
t.Fatalf("RunAgent returned sync error: %v", err)
}
@@ -1638,7 +1639,7 @@ func TestRunAgent_AllFixture_CategorizeResume(t *testing.T) {
cp := canvas.NewKvrocksCheckPointStoreWithClient(cpClient, 30*24*time.Hour)
svc := NewAgentServiceWithOptions(cp, nil, tracker)
events1, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-all-categorize"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-all-categorize"),
"user-1",
"canvas-all-categorize",
"session-all-categorize",
@@ -1666,7 +1667,7 @@ func TestRunAgent_AllFixture_CategorizeResume(t *testing.T) {
}
events2, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-all-categorize",
"session-all-categorize",
@@ -1700,7 +1701,7 @@ func TestRunAgent_AllFixture_CategorizeResume(t *testing.T) {
}
events3, err := svc.RunAgent(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-1"),
"user-1",
"canvas-all-categorize",
"session-all-categorize",
@@ -1796,7 +1797,7 @@ func TestRunAgent_RealCanvas_InvokeFails(t *testing.T) {
svc := NewAgentService()
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-invoke-fail"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-invoke-fail"),
"user-1",
"canvas-invoke-fail",
"session-invoke-fail",
@@ -1903,7 +1904,7 @@ func TestRunAgent_RunTracker_AttachCheckpoint_CallSequence(t *testing.T) {
svc := NewAgentServiceWithOptions(cp, canvas.CanvasStateSerializer{}, tracker)
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), "session-cp"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-cp"),
"user-1",
"canvas-cp",
"session-cp",
@@ -1972,7 +1973,6 @@ func TestRunAgent_RunTracker_AttachCheckpoint_CallSequence(t *testing.T) {
// TestRunAgent_FilesPopulateIteration verifies the full upload object ->
// sys.files -> Parallel/Iteration item path.
func TestRunAgent_FilesPopulateIteration(t *testing.T) {
- ctx := t.Context()
testDB := setupServiceTestDB(t)
if err := testDB.AutoMigrate(
&entity.UserCanvas{},
@@ -1989,6 +1989,7 @@ func TestRunAgent_FilesPopulateIteration(t *testing.T) {
orig := dao.DB
dao.DB = testDB
t.Cleanup(func() { dao.DB = orig })
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
canvasID := "canvas-files-e2e"
sessionID := "session-files-e2e"
@@ -2145,7 +2146,7 @@ func TestRunAgent_MissingUploadEmitsError(t *testing.T) {
makeCanvasWithDSL(t, "canvas-missing-upload", "user-1", "tenant-1", "v-missing-upload", dsl)
events, err := NewAgentService().RunAgent(
- WithAgentSessionID(t.Context(), "session-missing-upload"),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), "session-missing-upload"),
"user-1",
"canvas-missing-upload",
"session-missing-upload",
@@ -2223,7 +2224,7 @@ func TestRunAgent_NoFilesRunsNormally(t *testing.T) {
svc := NewAgentService()
events, err := svc.RunAgent(
- WithAgentSessionID(t.Context(), sessionID),
+ WithAgentSessionID(serviceTestContext(t, "user-1", "tenant-1"), sessionID),
"user-1",
canvasID,
sessionID,
diff --git a/internal/service/agent_test.go b/internal/service/agent_test.go
index 16e798a214..99cafcbfcd 100644
--- a/internal/service/agent_test.go
+++ b/internal/service/agent_test.go
@@ -308,7 +308,7 @@ func TestListVersions_Success(t *testing.T) {
},
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
versions, err := svc.ListVersions(ctx, "user-1", "canvas-1")
if err != nil {
@@ -353,7 +353,7 @@ func TestListVersions_Empty(t *testing.T) {
Title: sptr("Empty Agent"),
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
versions, err := svc.ListVersions(ctx, "user-1", "canvas-empty")
if err != nil {
@@ -466,7 +466,7 @@ func TestGetVersion_Success(t *testing.T) {
DSL: entity.JSONMap{"model": "gpt-4"},
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
v, err := svc.GetVersion(ctx, "user-1", "canvas-1", "v1")
if err != nil {
@@ -500,7 +500,7 @@ func TestGetVersion_WrongCanvas(t *testing.T) {
Title: sptr("version-1"),
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
_, err := svc.GetVersion(ctx, "user-other", "canvas-other", "v1")
if err == nil {
@@ -525,7 +525,7 @@ func TestGetVersion_NotFound(t *testing.T) {
dao.DB = testDB
t.Cleanup(func() { dao.DB = orig })
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
_, err := svc.GetVersion(ctx, "user-1", "canvas-1", "non-existent")
if err == nil {
@@ -580,7 +580,7 @@ func TestRunAgent_VersionBelongsToOtherCanvas(t *testing.T) {
DSL: entity.JSONMap{"components": map[string]any{}},
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
_, err := svc.RunAgent(
ctx,
@@ -627,7 +627,7 @@ func TestRunAgent_VersionNotFound(t *testing.T) {
Title: sptr("Canvas 1"),
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
_, err := svc.RunAgent(
ctx,
@@ -685,7 +685,7 @@ func TestRunAgent_NoVersionPublishedPlaceholder(t *testing.T) {
Title: sptr("Canvas With No Version"),
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
events, err := svc.RunAgent(
WithAgentSessionID(ctx, "test-session"),
@@ -765,7 +765,7 @@ func TestRunAgentRejectsUntrustedSessionContinuation(t *testing.T) {
{name: "valid resume", sessionID: "session-valid", userID: "user-1"},
} {
t.Run(tc.name, func(t *testing.T) {
- events, err := svc.RunAgent(t.Context(), tc.userID, "canvas-1", tc.sessionID, "", "hello", nil)
+ events, err := svc.RunAgent(serviceTestContext(t, tc.userID, "user-1"), tc.userID, "canvas-1", tc.sessionID, "", "hello", nil)
if tc.wantErr {
if !errors.Is(err, dao.ErrUserCanvasNotFound) {
t.Fatalf("RunAgent error = %v, want ErrUserCanvasNotFound", err)
@@ -832,7 +832,7 @@ func TestRunAgent_StorageErrorFromCanvasAccess(t *testing.T) {
t.Fatalf("failed to close sql.DB: %v", cErr)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
_, err := svc.RunAgent(
ctx,
@@ -887,7 +887,7 @@ func TestLoadCanvasForUser_StorageErrorWrap(t *testing.T) {
t.Fatalf("failed to close sql.DB: %v", cErr)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
_, err := svc.loadCanvasForUser(ctx, "user-1", "canvas-1", permission.OperationRead)
if err == nil {
@@ -972,7 +972,7 @@ func TestListAgentSessionsServiceSuccess(t *testing.T) {
createAgentSessionTestConversation(t, "session-team", "canvas-1", "team-user", 2000)
createAgentSessionTestConversation(t, "session-other-agent", "canvas-other", "user-1", 9999)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := NewAgentService().ListAgentSessions(ctx, "user-1", "user-1", "canvas-1", ListAgentSessionsRequest{
Page: 1,
PageSize: 10,
@@ -1012,7 +1012,7 @@ func TestListAgentSessionsServiceDenied(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-2")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := NewAgentService().ListAgentSessions(ctx, "user-1", "user-1", "canvas-1", ListAgentSessionsRequest{})
if err == nil {
t.Fatal("expected permission error")
@@ -1031,7 +1031,7 @@ func TestGetAgentSessionServiceSuccess(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
createAgentSessionTestConversation(t, "session-1", "canvas-1", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
session, code, err := NewAgentService().GetAgentSession(ctx, "user-1", "canvas-1", "session-1")
if err != nil {
t.Fatalf("GetAgentSession failed: %v", err)
@@ -1079,7 +1079,7 @@ func TestCreateAgentSessionWritesLatestVersionTitle(t *testing.T) {
t.Fatalf("failed to create newest version: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
svc := NewAgentService()
session, code, err := svc.CreateAgentSession(ctx, &CreateAgentSessionRequest{
UserID: "user-1",
@@ -1132,7 +1132,7 @@ func TestCreateAgentSessionNoVersionLeavesTitleNil(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
session, code, err := NewAgentService().CreateAgentSession(ctx, &CreateAgentSessionRequest{
UserID: "user-1",
AgentID: "canvas-1",
@@ -1239,7 +1239,7 @@ func TestCreateAgentSessionVersionLookupErrorReturnsServerError(t *testing.T) {
t.Fatalf("failed to drop user_canvas_version: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
session, code, err := NewAgentService().CreateAgentSession(ctx, &CreateAgentSessionRequest{
UserID: "user-1",
AgentID: "canvas-1",
@@ -1261,7 +1261,7 @@ func TestGetAgentSessionServiceNotFoundWhenSessionBelongsToAnotherAgent(t *testi
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
createAgentSessionTestConversation(t, "session-other", "canvas-other", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
session, code, err := NewAgentService().GetAgentSession(ctx, "user-1", "canvas-1", "session-other")
if err == nil {
t.Fatal("expected not found error")
@@ -1281,7 +1281,7 @@ func TestDeleteAgentSessionItemServiceDeletesMatchingSession(t *testing.T) {
createAgentSessionTestConversation(t, "session-1", "canvas-1", "user-1", 1000)
createAgentSessionTestConversation(t, "session-other", "canvas-other", "user-1", 2000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
deleted, code, err := NewAgentService().DeleteAgentSessionItem(ctx, "user-1", "canvas-1", "session-1")
if err != nil {
t.Fatalf("DeleteAgentSessionItem failed: %v", err)
@@ -1315,7 +1315,7 @@ func TestDeleteAgentSessionItemServiceNoopForSessionFromAnotherAgent(t *testing.
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
createAgentSessionTestConversation(t, "session-other", "canvas-other", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
deleted, code, err := NewAgentService().DeleteAgentSessionItem(ctx, "user-1", "canvas-1", "session-other")
if err != nil {
t.Fatalf("DeleteAgentSessionItem failed: %v", err)
@@ -1344,7 +1344,7 @@ func TestDeleteAgentSessionsServiceDeleteAll(t *testing.T) {
createAgentSessionTestConversation(t, "session-2", "canvas-1", "user-1", 2000)
createAgentSessionTestConversation(t, "session-other", "canvas-other", "user-1", 3000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, code, err := NewAgentService().DeleteAgentSessions(ctx, "user-1", "canvas-1", nil, true)
if err != nil {
t.Fatalf("DeleteAgentSessions failed: %v", err)
@@ -1382,7 +1382,7 @@ func TestDeleteAgentSessionsServiceDuplicateIDsPartial(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
createAgentSessionTestConversation(t, "session-1", "canvas-1", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, code, err := NewAgentService().DeleteAgentSessions(ctx, "user-1", "canvas-1", []string{"session-1", "session-1"}, false)
if err != nil {
t.Fatalf("DeleteAgentSessions failed: %v", err)
@@ -1414,7 +1414,7 @@ func TestDeleteAgentSessionsServiceMissingSessionError(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, code, err := NewAgentService().DeleteAgentSessions(ctx, "user-1", "canvas-1", []string{"missing-session"}, false)
if err == nil {
t.Fatal("expected missing session error")
@@ -1436,7 +1436,7 @@ func TestDeleteAgentSessionsServiceRequiresOwner(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-2")
createAgentSessionTestConversation(t, "session-1", "canvas-1", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, code, err := NewAgentService().DeleteAgentSessions(ctx, "user-1", "canvas-1", []string{"session-1"}, false)
if err == nil {
t.Fatal("expected owner error")
@@ -1462,7 +1462,7 @@ func TestUpdateAgentTagsServiceSuccess(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
ok, code, err := NewAgentService().UpdateAgentTags(ctx, "user-1", "canvas-1", []interface{}{"alpha", "beta", "alpha", "with,comma"})
if err != nil {
t.Fatalf("UpdateAgentTags failed: %v", err)
@@ -1488,7 +1488,7 @@ func TestUpdateAgentTagsServiceInvalidPayload(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-1")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
ok, code, err := NewAgentService().UpdateAgentTags(ctx, "user-1", "canvas-1", map[string]string{"tag": "alpha"})
if err == nil {
t.Fatal("expected invalid tags error")
@@ -1514,7 +1514,7 @@ func TestUpdateAgentTagsServiceNoPermission(t *testing.T) {
createAgentSessionTestCanvas(t, "canvas-1", "user-2")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
ok, code, err := NewAgentService().UpdateAgentTags(ctx, "user-1", "canvas-1", []string{"alpha"})
if err == nil {
t.Fatal("expected permission error")
@@ -1605,7 +1605,7 @@ func TestAssertHostIsSafeAllowsPrivateHostWhenConfigured(t *testing.T) {
}
func TestTestDBConnectionMissingFields(t *testing.T) {
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
code, err := NewAgentService().TestDBConnection(ctx, "user-1", &TestDBConnectionRequest{DBType: "mysql"})
if err == nil {
t.Fatal("expected missing field error")
@@ -1620,7 +1620,7 @@ func TestTestDBConnectionMissingFields(t *testing.T) {
}
func TestTestDBConnectionUnsupportedDatabaseType(t *testing.T) {
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
code, err := NewAgentService().TestDBConnection(ctx, "user-1", &TestDBConnectionRequest{
DBType: "unsupported",
Database: "rag_flow",
@@ -1661,7 +1661,7 @@ func ptr(v int64) *int64 { return &v }
func TestResetAgentServiceClearsPerRunState(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
initialDSL := entity.JSONMap{
"graph": map[string]any{
"nodes": []any{map[string]any{"id": "begin"}},
@@ -1766,7 +1766,7 @@ func TestResetAgentServiceClearsPerRunState(t *testing.T) {
func TestResetAgentServiceNotFound(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := NewAgentService().ResetAgent(ctx, "user-1", "missing")
if err == nil {
t.Fatal("expected error for missing canvas")
@@ -1790,7 +1790,7 @@ func TestUpdateAgentSettingsPreservesDSL(t *testing.T) {
},
},
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{
ID: "canvas-settings",
UserID: "user-1",
@@ -1826,7 +1826,7 @@ func TestUpdateAgentSettingsPreservesDSL(t *testing.T) {
func TestUpdateAgentAllowsExistingTitleForSameCanvas(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{
ID: "canvas-same-title",
@@ -1850,7 +1850,6 @@ func TestUpdateAgentAllowsExistingTitleForSameCanvas(t *testing.T) {
func TestUpdateAgentTeamMemberCanUpdateButCannotChangePermission(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
status := "1"
for _, row := range []*entity.UserCanvas{
@@ -1871,11 +1870,11 @@ func TestUpdateAgentTeamMemberCanUpdateButCannotChangePermission(t *testing.T) {
DSL: entity.JSONMap{},
},
} {
- if err := dao.DB.WithContext(ctx).Create(row).Error; err != nil {
+ if err := dao.DB.WithContext(t.Context()).Create(row).Error; err != nil {
t.Fatalf("failed to seed canvas %s: %v", row.ID, err)
}
}
- if err := dao.DB.WithContext(ctx).Create(&entity.UserTenant{
+ if err := dao.DB.WithContext(t.Context()).Create(&entity.UserTenant{
ID: "ut-agent-team",
UserID: "member-1",
TenantID: "owner-1",
@@ -1885,6 +1884,8 @@ func TestUpdateAgentTeamMemberCanUpdateButCannotChangePermission(t *testing.T) {
}).Error; err != nil {
t.Fatalf("failed to seed user tenant: %v", err)
}
+ ctx := serviceTestContext(t, "member-1", "owner-1", "owner-1")
+ grantServiceTestResource(t, "owner-1", "canvas", "canvas-team-edit", "member-1", testResourcePermissionRead|testResourcePermissionWrite)
samePermission := " TEAM "
if err := NewAgentService().UpdateAgent(ctx, "member-1", "canvas-team-edit", map[string]interface{}{
@@ -1913,7 +1914,8 @@ func TestUpdateAgentTeamMemberCanUpdateButCannotChangePermission(t *testing.T) {
if canvas.Permission != string(entity.TenantPermissionTeam) {
t.Fatalf("canvas permission = %q, want unchanged %q", canvas.Permission, entity.TenantPermissionTeam)
}
- if err := NewAgentService().UpdateAgent(ctx, "owner-1", "canvas-team-edit", map[string]interface{}{
+ ownerCtx := serviceTestContext(t, "owner-1", "owner-1")
+ if err := NewAgentService().UpdateAgent(ownerCtx, "owner-1", "canvas-team-edit", map[string]interface{}{
"permission": nextPermission,
}); err != nil {
t.Fatalf("canvas owner could not change permission: %v", err)
@@ -1922,7 +1924,7 @@ func TestUpdateAgentTeamMemberCanUpdateButCannotChangePermission(t *testing.T) {
func TestUpdateAgentRejectsDuplicateTitleInDestinationCategory(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{
ID: "canvas-source-category",
@@ -1974,7 +1976,7 @@ func TestUpdateAgentRejectsCategoryOnlyDuplicateTitleInDestinationCategory(t *te
t.Fatalf("failed to seed duplicate agent: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
err := NewAgentService().UpdateAgent(ctx, "user-1", "canvas-category-only-source", map[string]interface{}{
"canvas_category": "dataflow_canvas",
})
@@ -1985,7 +1987,7 @@ func TestUpdateAgentRejectsCategoryOnlyDuplicateTitleInDestinationCategory(t *te
func TestUpdateAgentAllowsCaseOnlyTitleChange(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{
ID: "canvas-case-only-title",
@@ -2077,7 +2079,7 @@ func seedAgentServiceCreateContext(t *testing.T) context.Context {
t.Fatalf("create Agent permission test table: %v", err)
}
}
- return permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "tenant-agent"})
+ return serviceTestContext(t, "user-1", "tenant-agent")
}
func TestCreateAgentRequiresAuthenticatedUserID(t *testing.T) {
@@ -2093,7 +2095,7 @@ func TestCreateAgentRequiresAuthenticatedUserID(t *testing.T) {
func TestUpdateAgentPersistsDSLAsJSONMap(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{
ID: "canvas-dsl-update",
UserID: "user-1",
@@ -2133,7 +2135,7 @@ func TestUpdateAgentPersistsDSLAsJSONMap(t *testing.T) {
func TestUpdateAgentDSLCreatesAndReplacesDraftVersion(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ 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 {
t.Fatalf("failed to seed user: %v", err)
}
@@ -2179,8 +2181,12 @@ func TestUpdateAgentDSLCreatesAndReplacesDraftVersion(t *testing.T) {
if len(versions) != 1 {
t.Fatalf("expected same DSL to replace latest draft, got %d versions", len(versions))
}
- if versions[0].Title == nil || !strings.HasPrefix(*versions[0].Title, "owner_Renamed Agent_") {
- t.Fatalf("unexpected version title: %v", versions[0].Title)
+ title := ""
+ if versions[0].Title != nil {
+ title = *versions[0].Title
+ }
+ if !strings.HasPrefix(title, "owner_Renamed Agent_") {
+ t.Fatalf("unexpected version title: %q", title)
}
var release bool
if err = dao.DB.WithContext(ctx).Table("user_canvas_version").Select("release").Where("id = ?", versions[0].ID).Scan(&release).Error; err != nil {
@@ -2207,7 +2213,7 @@ func TestUpdateAgentReleaseTrueMarksCanvasAndVersionReleased(t *testing.T) {
t.Fatalf("failed to seed agent: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
// The front-end publish flow sends release as the string "true".
if err := NewAgentService().UpdateAgent(ctx, "user-1", "canvas-update-release", map[string]interface{}{
"title": "Release Agent",
@@ -2274,7 +2280,7 @@ func TestUpdateAgentWithoutReleaseKeepsCanvasUnreleased(t *testing.T) {
// Python parity: update_agent coerces a missing release to False and
// always writes it back to the canvas row.
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
if err := NewAgentService().UpdateAgent(ctx, "user-1", "canvas-update-draft", map[string]interface{}{
"title": "Draft Agent",
"dsl": map[string]interface{}{
@@ -2325,7 +2331,7 @@ func TestListAgentsIncludesReleaseTime(t *testing.T) {
}).Error; err != nil {
t.Fatalf("failed to seed released version: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := NewAgentService().ListAgents(ctx, "user-1", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil, "", "", nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListAgents failed: code=%v err=%v", code, err)
@@ -2375,7 +2381,7 @@ func TestListAgents_MultiCategoryFilter(t *testing.T) {
}
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := NewAgentService().ListAgents(ctx, "user-1", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil, "dataflow_canvas,agent_canvas", "", nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListAgents failed: code=%v err=%v", code, err)
@@ -2425,7 +2431,7 @@ func TestListAgents_MergesCompilationTemplateGroups(t *testing.T) {
t.Fatalf("failed to seed builtin group: %v", err)
}
- resp, code, err := NewAgentService().ListAgents(t.Context(), "user-1", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil, "", "", nil)
+ resp, code, err := NewAgentService().ListAgents(serviceTestContext(t, "user-1", "user-1"), "user-1", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil, "", "", nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListAgents failed: code=%v err=%v", code, err)
}
@@ -2541,7 +2547,7 @@ func createAgentSessionTestCompilationGroup(t *testing.T, id, tenantID string, n
func TestPublishAgentUpdatesCanvasAndReleasedVersion(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ 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 {
t.Fatalf("failed to seed user: %v", err)
}
@@ -2588,8 +2594,12 @@ func TestPublishAgentUpdatesCanvasAndReleasedVersion(t *testing.T) {
if row.Description == nil || *row.Description != description {
t.Fatalf("published version description = %v", row.Description)
}
- if row.Title == nil || !strings.HasPrefix(*row.Title, "owner_Published Agent_") {
- t.Fatalf("unexpected published version title: %v", row.Title)
+ title := ""
+ if row.Title != nil {
+ title = *row.Title
+ }
+ if !strings.HasPrefix(title, "owner_Published Agent_") {
+ t.Fatalf("unexpected published version title: %q", title)
}
persisted, err := dao.NewUserCanvasDAO().GetByID(ctx, dao.DB, "canvas-publish")
@@ -2627,8 +2637,8 @@ func TestPublishAgentUpdatesCanvasAndReleasedVersion(t *testing.T) {
func TestUpdateAgentDSLDoesNotOverwriteLatestReleasedVersion(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
- if err := dao.DB.WithContext(ctx).Create(&entity.User{ID: "user-1", Nickname: "owner", Email: "[email protected]"}).Error; err != nil {
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ 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)
}
dsl := entity.JSONMap{
@@ -2703,7 +2713,7 @@ func TestResetAgentServiceOtherTenant(t *testing.T) {
setupAgentSessionServiceTest(t)
createAgentSessionTestCanvas(t, "canvas-1", "user-2")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := NewAgentService().ResetAgent(ctx, "user-1", "canvas-1")
if !errors.Is(err, dao.ErrUserCanvasNotFound) {
t.Errorf("expected ErrUserCanvasNotFound for cross-tenant access, got %v", err)
@@ -2730,7 +2740,7 @@ func TestGetAgentSession_RejectsIDOR(t *testing.T) {
createAgentSessionTestCanvas(t, "agent-2", "user-1")
createAgentSessionTestConversation(t, "session-1", "agent-1", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
data, code, err := NewAgentService().GetAgentSession(ctx, "user-1", "agent-2", "session-1")
if err == nil {
t.Fatal("expected non-nil error for cross-agent session access")
@@ -2753,7 +2763,7 @@ func TestGetAgentSession_SuccessWhenAgentMatches(t *testing.T) {
createAgentSessionTestCanvas(t, "agent-1", "user-1")
createAgentSessionTestConversation(t, "session-1", "agent-1", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
data, code, err := NewAgentService().GetAgentSession(ctx, "user-1", "agent-1", "session-1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
@@ -2783,7 +2793,7 @@ func TestDeleteAgentSessionItem_RejectsIDOR(t *testing.T) {
createAgentSessionTestCanvas(t, "agent-2", "user-1")
createAgentSessionTestConversation(t, "session-1", "agent-1", "user-1", 1000)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
deleted, code, err := NewAgentService().DeleteAgentSessionItem(ctx, "user-1", "agent-2", "session-1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
@@ -2855,6 +2865,7 @@ func createTeamSharedAgentTestFixtures(t *testing.T, canvasOwner, teammate, sess
if err := dao.DB.Create(&entity.UserCanvas{
ID: "canvas-1",
UserID: canvasOwner,
+ TenantID: sptr(canvasOwner),
Title: sptr("Shared Agent"),
CanvasCategory: "agent_canvas",
Permission: string(entity.TenantPermissionTeam),
@@ -2870,6 +2881,7 @@ func createTeamSharedAgentTestFixtures(t *testing.T, canvasOwner, teammate, sess
}).Error; err != nil {
t.Fatalf("failed to create user tenant: %v", err)
}
+ grantServiceTestResource(t, canvasOwner, "canvas", "canvas-1", teammate, testResourcePermissionRead)
createAgentSessionTestConversation(t, sessionID, "canvas-1", sessionOwner, 1000)
}
@@ -2877,7 +2889,8 @@ func TestDeleteAgent_SharedCanvasMemberCannotDeleteAgent(t *testing.T) {
setupAgentSessionServiceTest(t)
createTeamSharedAgentTestFixtures(t, "owner-1", "user-1", "session-1", "owner-1")
- err := NewAgentService().DeleteAgent(t.Context(), "user-1", "canvas-1")
+ ctx := serviceTestContext(t, "user-1", "owner-1", "owner-1")
+ err := NewAgentService().DeleteAgent(ctx, "user-1", "canvas-1")
if !errors.Is(err, ErrAgentNotOwner) {
t.Fatalf("DeleteAgent error = %v, want ErrAgentNotOwner", err)
}
@@ -2894,7 +2907,8 @@ func TestDeleteAgentSessionItem_SharedCanvasGrantsDeleteAccess(t *testing.T) {
setupAgentSessionServiceTest(t)
createTeamSharedAgentTestFixtures(t, "owner-1", "user-1", "session-1", "owner-1")
- deleted, code, err := NewAgentService().DeleteAgentSessionItem(t.Context(), "user-1", "canvas-1", "session-1")
+ ctx := serviceTestContext(t, "user-1", "owner-1", "owner-1")
+ deleted, code, err := NewAgentService().DeleteAgentSessionItem(ctx, "user-1", "canvas-1", "session-1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -2918,7 +2932,8 @@ func TestDeleteAgentSessionItem_SessionCreatorCanDeleteOwnSession(t *testing.T)
setupAgentSessionServiceTest(t)
createTeamSharedAgentTestFixtures(t, "owner-1", "user-1", "session-1", "user-1")
- deleted, code, err := NewAgentService().DeleteAgentSessionItem(t.Context(), "user-1", "canvas-1", "session-1")
+ ctx := serviceTestContext(t, "user-1", "owner-1", "owner-1")
+ deleted, code, err := NewAgentService().DeleteAgentSessionItem(ctx, "user-1", "canvas-1", "session-1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -2934,7 +2949,8 @@ func TestDeleteAgentSessionItem_CanvasOwnerCanDeleteAnySession(t *testing.T) {
setupAgentSessionServiceTest(t)
createTeamSharedAgentTestFixtures(t, "owner-1", "user-1", "session-1", "user-1")
- deleted, code, err := NewAgentService().DeleteAgentSessionItem(t.Context(), "owner-1", "canvas-1", "session-1")
+ ctx := serviceTestContext(t, "owner-1", "owner-1", "user-1")
+ deleted, code, err := NewAgentService().DeleteAgentSessionItem(ctx, "owner-1", "canvas-1", "session-1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
diff --git a/internal/service/agent_version_test.go b/internal/service/agent_version_test.go
index 5450c9b5d4..5dc7d79b7f 100644
--- a/internal/service/agent_version_test.go
+++ b/internal/service/agent_version_test.go
@@ -56,7 +56,7 @@ func TestApplyVersionDraftSave(t *testing.T) {
t.Fatal(err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
var wantErr error
if scenario == "version_save_failure" {
wantErr = errors.New("version write failed")
diff --git a/internal/service/agentic_pipeline.go b/internal/service/agentic_pipeline.go
index c82a676a8c..3e87d604ad 100644
--- a/internal/service/agentic_pipeline.go
+++ b/internal/service/agentic_pipeline.go
@@ -239,6 +239,7 @@ func (s *ChatPipelineService) agenticRag(
TemplateID: mode,
Template: &tmpl,
TenantID: chat.TenantID,
+ UserID: userID,
DatasetIDs: chatDatasetIDs(chat),
DocIDs: docIDs,
ConversationKey: chat.ID,
diff --git a/internal/service/bot_completion_history_test.go b/internal/service/bot_completion_history_test.go
index d7e5efaa2b..032d679dd4 100644
--- a/internal/service/bot_completion_history_test.go
+++ b/internal/service/bot_completion_history_test.go
@@ -174,7 +174,7 @@ func TestBotService_AgentbotInputs_CrossTenantDenied(t *testing.T) {
svc := NewBotService(nil)
// Attacker (tenant-B) asks for victim (tenant-A's canvas).
- title, _, _, _, _, code, err := svc.AgentbotInputs(t.Context(),
+ title, _, _, _, _, code, err := svc.AgentbotInputs(serviceTestContext(t, "tenant-B", "tenant-B"),
"tenant-B", "agent-victim")
if !errors.Is(err, dao.ErrUserCanvasNotFound) {
t.Errorf("cross-tenant: want ErrUserCanvasNotFound, got %v", err)
@@ -213,6 +213,7 @@ func TestBotService_AgentbotInputsReadsBeginParams(t *testing.T) {
if err := db.Create(&entity.UserCanvas{
ID: "agent-1",
UserID: "owner-1",
+ TenantID: sptr("tenant-1"),
Title: &title,
Avatar: &avatar,
CanvasCategory: "agent_canvas",
@@ -238,7 +239,7 @@ func TestBotService_AgentbotInputsReadsBeginParams(t *testing.T) {
svc := NewBotService(nil)
gotTitle, gotAvatar, prologue, mode, inputs, code, err := svc.AgentbotInputs(
- t.Context(), "owner-1", "agent-1")
+ serviceTestContext(t, "owner-1", "tenant-1"), "owner-1", "agent-1")
if err != nil {
t.Fatalf("AgentbotInputs: %v", err)
}
@@ -408,7 +409,7 @@ func TestBotService_ChatbotCompletion_NewSessionSkipsLLM(t *testing.T) {
// llmService is nil — any attempt to reach the LLM path would
// fail loudly, so a successful run proves the LLM was skipped.
svc := NewBotService(nil)
- frames, code, err := svc.ChatbotCompletion(t.Context(),
+ frames, code, err := svc.ChatbotCompletion(serviceTestContext(t, "tenant-1", "tenant-1"),
"tenant-1", "dlg-1", ChatbotCompletionRequest{Question: ""})
if err != nil {
t.Fatalf("ChatbotCompletion: %v", err)
diff --git a/internal/service/bot_permission_test.go b/internal/service/bot_permission_test.go
index ddd61e24e9..9c91d1bfb7 100644
--- a/internal/service/bot_permission_test.go
+++ b/internal/service/bot_permission_test.go
@@ -48,17 +48,19 @@ func TestBotServiceChatbotEndpointsUseChatPermissions(t *testing.T) {
}
svc := NewBotService(nil)
- _, _, _, _, _, code, err := svc.ChatbotInfo(t.Context(), "owner-1", "chat-1")
+ ownerCtx := serviceTestContext(t, "owner-1", "owner-1", "outsider")
+ _, _, _, _, _, code, err := svc.ChatbotInfo(ownerCtx, "owner-1", "chat-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ChatbotInfo(owner) = (%d, %v), want success", code, err)
}
- _, _, _, _, _, code, err = svc.ChatbotInfo(t.Context(), "outsider", "chat-1")
+ outsiderCtx := serviceTestContext(t, "outsider", "owner-1", "owner-1")
+ _, _, _, _, _, code, err = svc.ChatbotInfo(outsiderCtx, "outsider", "chat-1")
if !errors.Is(err, permission.ErrPermissionDenied) || code != common.CodeNotFound {
t.Fatalf("ChatbotInfo(outsider) = (%d, %v), want hidden permission denial", code, err)
}
- _, code, err = svc.ChatbotCompletion(t.Context(), "outsider", "chat-1", ChatbotCompletionRequest{Question: "hello"})
+ _, code, err = svc.ChatbotCompletion(outsiderCtx, "outsider", "chat-1", ChatbotCompletionRequest{Question: "hello"})
if !errors.Is(err, permission.ErrPermissionDenied) || code != common.CodeNotFound {
t.Fatalf("ChatbotCompletion(outsider) = (%d, %v), want hidden permission denial", code, err)
}
diff --git a/internal/service/chat.go b/internal/service/chat.go
index ba21771946..9fd2d32716 100644
--- a/internal/service/chat.go
+++ b/internal/service/chat.go
@@ -195,6 +195,10 @@ func (s *ChatService) Create(ctx context.Context, userID string, req map[string]
if _, err := s.tenantDAO.GetByID(ctx, dao.DB, tenantID); err != nil {
return nil, common.CodeDataError, errors.New("tenant not found")
}
+ membership, err := dao.NewUserTenantDAO().FilterByUserIDAndTenantID(ctx, dao.DB, userID, tenantID)
+ if err != nil {
+ return nil, common.CodeForbidden, err
+ }
if tenantValue, ok := req["tenant_id"]; ok && isTruthy(tenantValue) {
return nil, common.CodeDataError, errors.New("`tenant_id` must not be provided")
@@ -261,10 +265,6 @@ func (s *ChatService) Create(ctx context.Context, userID string, req map[string]
req["kb_ids"] = []string{}
}
if _, ok := req["llm_id"]; !ok || req["llm_id"] == nil {
- membership, membershipErr := dao.NewUserTenantDAO().FilterByUserIDAndTenantID(ctx, dao.DB, userID, tenantID)
- if membershipErr != nil {
- return nil, common.CodeForbidden, membershipErr
- }
modelName, modelID := defaultModelRefs(membership, entity.ModelTypeChat)
req["llm_id"] = modelName
if modelID != "" {
diff --git a/internal/service/chat_agentic_config_test.go b/internal/service/chat_agentic_config_test.go
index 527c511827..4f773477f3 100644
--- a/internal/service/chat_agentic_config_test.go
+++ b/internal/service/chat_agentic_config_test.go
@@ -19,7 +19,7 @@ func TestChatAgenticConfigPersistsAndResets(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
t.Setenv("AGENTIC_RAG_CONFIG", filepath.Join("..", "..", "conf", "agentic_rag.yaml"))
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
for _, override := range []any{
map[string]any{"content": "Use this saved instruction", "tools": []any{"grep_chunks", "list_chunks"}},
@@ -72,8 +72,9 @@ func TestChatAgenticConfigPersistsAndResets(t *testing.T) {
func TestChatAgenticConfigCreateAndPut(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
+ ctx := serviceTestContext(t, "user-1", "user-1")
override := map[string]any{"content": "Created instruction", "tools": []any{"grep_chunks", "list_chunks"}}
- result, code, err := svc.Create(t.Context(), "user-1", map[string]any{
+ result, code, err := svc.Create(ctx, "user-1", map[string]any{
"name": "Agentic configuration",
"prompt_config": map[string]any{"agentic_rag": override},
})
@@ -81,20 +82,20 @@ func TestChatAgenticConfigCreateAndPut(t *testing.T) {
t.Fatalf("Create() = (%d, %v)", code, err)
}
chatID := result["id"].(string)
- chat, err := svc.chatDAO.GetByID(t.Context(), dao.DB, chatID)
+ chat, err := svc.chatDAO.GetByID(ctx, dao.DB, chatID)
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(chat.PromptConfig["agentic_rag"], override) {
t.Fatalf("create did not persist override: %#v", chat.PromptConfig)
}
- _, err = svc.UpdateChat(t.Context(), "user-1", chatID, map[string]any{
+ _, err = svc.UpdateChat(ctx, "user-1", chatID, map[string]any{
"prompt_config": map[string]any{"agentic_rag": nil, "system": "replacement"},
})
if err != nil {
t.Fatal(err)
}
- chat, err = svc.chatDAO.GetByID(t.Context(), dao.DB, chatID)
+ chat, err = svc.chatDAO.GetByID(ctx, dao.DB, chatID)
if err != nil {
t.Fatal(err)
}
@@ -159,13 +160,14 @@ func TestChatAgenticConfigEnforcesPermissions(t *testing.T) {
db := setupChatRESTUpdateServiceTestDB(t)
createChatRESTUpdateServiceTestChat(t, db, "other-chat", "other-tenant")
svc := NewChatService()
- if _, err := svc.GetAgenticRAGConfig(t.Context(), "user-1", "other-chat"); !errors.Is(err, permission.ErrPermissionDenied) {
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ if _, err := svc.GetAgenticRAGConfig(ctx, "user-1", "other-chat"); !errors.Is(err, permission.ErrResourceNotFound) && !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("cross-tenant read error = %v", err)
}
- _, err := svc.PatchChat(t.Context(), "user-1", "other-chat", map[string]any{
+ _, err := svc.PatchChat(ctx, "user-1", "other-chat", map[string]any{
"prompt_config": map[string]any{"agentic_rag": map[string]any{"content": "Forbidden"}},
})
- if !errors.Is(err, permission.ErrPermissionDenied) {
+ if !errors.Is(err, permission.ErrResourceNotFound) && !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("cross-tenant update error = %v", err)
}
}
diff --git a/internal/service/chat_channel_test.go b/internal/service/chat_channel_test.go
index 6a97f37267..80c5069524 100644
--- a/internal/service/chat_channel_test.go
+++ b/internal/service/chat_channel_test.go
@@ -25,7 +25,7 @@ func setupChatChannelServiceTestDB(t *testing.T) *gorm.DB {
t.Fatalf("failed to open sqlite: %v", err)
}
- if err = db.AutoMigrate(&entity.ChatChannel{}, &entity.Chat{}, &entity.UserTenant{}); err != nil {
+ if err = db.AutoMigrate(&entity.ChatChannel{}, &entity.Chat{}, &entity.User{}, &entity.UserTenant{}); err != nil {
t.Fatalf("failed to migrate test schema: %v", err)
}
@@ -92,7 +92,7 @@ func TestChatChannelServiceCreateAndList(t *testing.T) {
svc := NewChatChannelService()
chatID := "dialog-1"
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
channel, err := svc.CreateChatChannel(
ctx,
"tenant-1",
@@ -135,7 +135,8 @@ func TestChatChannelServiceGetChatChannelAllowsJoinedTenant(t *testing.T) {
})
createServiceTestMembership(t, db, "user-2", "tenant-1")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-2", "tenant-1")
+ grantServiceTestResource(t, "tenant-1", "dialog", "cc-1", "user-2", testResourcePermissionRead)
channel, code, err := NewChatChannelService().GetChatChannel(ctx, "user-2", "cc-1")
if err != nil {
t.Fatalf("GetChatChannel failed: %v", err)
@@ -158,7 +159,9 @@ func TestChatChannelServiceListUsesPermissionScope(t *testing.T) {
})
createServiceTestMembership(t, db, "user-2", "tenant-1")
- channels, err := NewChatChannelService().List(t.Context(), "user-2")
+ ctx := serviceTestContext(t, "user-2", "tenant-1")
+ grantServiceTestResource(t, "tenant-1", "dialog", "channel-team", "user-2", testResourcePermissionRead)
+ channels, err := NewChatChannelService().List(ctx, "user-2")
if err != nil {
t.Fatalf("List() failed: %v", err)
}
@@ -182,7 +185,7 @@ func TestChatChannelServiceUpdateChatChannelSuccess(t *testing.T) {
Status: 1,
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
updated, code, err := NewChatChannelService().UpdateChatChannel(ctx, "tenant-1", "cc-1", map[string]interface{}{
"name": "bot-b",
"config": map[string]interface{}{"token": "new"},
@@ -217,15 +220,15 @@ func TestChatChannelServiceUpdateChatChannelRejectsCrossTenantDialog(t *testing.
Status: 1,
})
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
_, code, err := NewChatChannelService().UpdateChatChannel(ctx, "tenant-1", "cc-1", map[string]interface{}{
"chat_id": "dialog-2",
})
if code != common.CodeNotFound {
t.Fatalf("expected hidden not-found error, got %v", code)
}
- if !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("expected permission denial, got %v", err)
+ if err == nil {
+ t.Fatalf("expected cross-tenant dialog to be hidden, got %v", err)
}
}
@@ -243,7 +246,7 @@ func TestChatChannelServiceUpdateChatChannelRequiresChannelOwnerAccess(t *testin
createServiceTestMembership(t, db, "user-1", "tenant-1")
createServiceTestMembership(t, db, "user-1", "tenant-2")
- _, code, err := NewChatChannelService().UpdateChatChannel(t.Context(), "user-1", "cc-1", map[string]interface{}{
+ _, code, err := NewChatChannelService().UpdateChatChannel(serviceTestContext(t, "user-1", "tenant-1", "tenant-1"), "user-1", "cc-1", map[string]interface{}{
"chat_id": "dialog-2",
})
if code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
@@ -253,6 +256,10 @@ func TestChatChannelServiceUpdateChatChannelRequiresChannelOwnerAccess(t *testin
func TestChatChannelServiceDeleteChatChannel(t *testing.T) {
db := setupChatChannelServiceTestDB(t)
+ if err := db.Create(&entity.User{ID: "user-2", Nickname: "member", Email: "[email protected]"}).Error; err != nil {
+ t.Fatalf("create non-owner user: %v", err)
+ }
+ createServiceTestMembership(t, db, "user-2", "tenant-2")
createServiceTestChannel(t, db, &entity.ChatChannel{
ID: "cc-1",
TenantID: "tenant-1",
@@ -264,7 +271,7 @@ func TestChatChannelServiceDeleteChatChannel(t *testing.T) {
svc := NewChatChannelService()
- ctx := t.Context()
+ 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)
@@ -276,7 +283,7 @@ func TestChatChannelServiceDeleteChatChannel(t *testing.T) {
t.Fatal("expected delete to be rejected")
}
- deleted, code, err = svc.DeleteChatChannel(ctx, "tenant-1", "cc-1")
+ deleted, code, err = svc.DeleteChatChannel(serviceTestContext(t, "tenant-1", "tenant-1"), "tenant-1", "cc-1")
if err != nil {
t.Fatalf("DeleteChatChannel failed: %v", err)
}
diff --git a/internal/service/chat_delete_test.go b/internal/service/chat_delete_test.go
index 575b83abcb..e2cb73b872 100644
--- a/internal/service/chat_delete_test.go
+++ b/internal/service/chat_delete_test.go
@@ -62,7 +62,7 @@ func TestChatServiceDeleteChatRejectsNonOwner(t *testing.T) {
createChatDeleteServiceTestChat(t, db, "chat-1", "tenant-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
err := svc.DeleteChat(ctx, "user-1", "chat-1")
if !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("expected permission denied, got %v", err)
@@ -84,7 +84,7 @@ func TestChatServiceBulkDeleteChatsDeleteAllOnlyDeletesOwnedChats(t *testing.T)
createChatDeleteServiceTestChat(t, db, "chat-3", "tenant-2")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := svc.BulkDeleteChats(ctx, "user-1", &BulkDeleteChatsRequest{DeleteAll: true})
if err != nil {
t.Fatalf("BulkDeleteChats failed: %v", err)
@@ -125,7 +125,7 @@ func TestChatServiceBulkDeleteChatsReturnsPartialSuccessErrors(t *testing.T) {
createChatDeleteServiceTestChat(t, db, "chat-2", "tenant-2")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := svc.BulkDeleteChats(ctx, "user-1", &BulkDeleteChatsRequest{
IDs: []string{"chat-1", "chat-2", "chat-1"},
})
diff --git a/internal/service/chat_list_test.go b/internal/service/chat_list_test.go
index bcc94d9f39..de9f6424c4 100644
--- a/internal/service/chat_list_test.go
+++ b/internal/service/chat_list_test.go
@@ -57,7 +57,6 @@ func setupChatListTestDB(t *testing.T) *gorm.DB {
}).Error; err != nil {
t.Fatalf("failed to create user: %v", err)
}
-
return db
}
@@ -88,7 +87,7 @@ func TestChatServiceListChatsDefaultReturnsAllWithCorrectTotal(t *testing.T) {
createChatListTestChat(t, db, "chat-3", "user-1", "list_test_2")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := svc.ListChats(ctx, "user-1", "1", "", "", "", 0, 0, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil)
if err != nil {
t.Fatalf("ListChats failed: %v", err)
@@ -130,7 +129,7 @@ func TestChatServiceListChatsDoesNotExposeAnotherTenantsChats(t *testing.T) {
createChatListTestChat(t, db, "chat-team", "tenant-2", "team_chat")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := svc.ListChats(ctx, "user-1", "1", "", "", "", 0, 0, []dao.OrderTerm{{Column: "create_time", Desc: true}}, []string{"tenant-2"})
if err != nil {
t.Fatalf("ListChats failed: %v", err)
@@ -148,7 +147,7 @@ func TestChatServiceListChatsKeywordFiltersCorrectly(t *testing.T) {
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
exactResult, err := svc.ListChats(ctx, "user-1", "1", "list_keyword_1", "", "", 0, 0, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil)
if err != nil {
t.Fatalf("ListChats keyword exact failed: %v", err)
@@ -185,7 +184,7 @@ func TestChatServiceListChatsPagination(t *testing.T) {
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
page1, err := svc.ListChats(ctx, "user-1", "1", "", "", "", 1, 2, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil)
if err != nil {
t.Fatalf("ListChats page 1 failed: %v", err)
@@ -215,7 +214,7 @@ func TestChatServiceListChatsExcludesDeletedChats(t *testing.T) {
db.Model(&entity.Chat{}).Where("id = ?", "chat-2").Update("status", invalidStatus)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := svc.ListChats(ctx, "user-1", "1", "", "", "", 0, 0, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil)
if err != nil {
t.Fatalf("ListChats failed: %v", err)
@@ -234,7 +233,7 @@ func TestChatServiceListChatsExactFilters(t *testing.T) {
createChatListTestChat(t, db, "chat-2", "user-1", "exact_beta")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
terms := []dao.OrderTerm{{Column: "create_time", Desc: true}}
byID, err := svc.ListChats(ctx, "user-1", "1", "", "chat-2", "", 0, 0, terms, nil)
@@ -300,7 +299,7 @@ func TestChatServiceListChatsPaginatesOwnerBranch(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- result, err := NewChatService().ListChats(t.Context(), "user-1", "1", "", "", "", tt.page, tt.pageSize, []dao.OrderTerm{{Column: "create_time", Desc: true}}, []string{"user-1"})
+ result, err := NewChatService().ListChats(serviceTestContext(t, "user-1", "user-1"), "user-1", "1", "", "", "", tt.page, tt.pageSize, []dao.OrderTerm{{Column: "create_time", Desc: true}}, []string{"user-1"})
if err != nil {
t.Fatalf("ListChats failed: %v", err)
}
diff --git a/internal/service/chat_pipeline_test.go b/internal/service/chat_pipeline_test.go
index 1737ec3d22..081943598e 100644
--- a/internal/service/chat_pipeline_test.go
+++ b/internal/service/chat_pipeline_test.go
@@ -49,6 +49,7 @@ func dialForTest(llmid string) *entity.Chat {
"refine_multiturn": false,
"keyword": false,
"use_kg": false,
+ "toc_enhance": false,
},
KBIDs: []interface{}{},
VectorSimilarityWeight: 0.3,
@@ -1825,7 +1826,7 @@ func setupChatPipelineToolSupportTestDB(t *testing.T) *gorm.DB {
return db
}
-// seedChatPipelineToolSupportTenant sets the tenant's default chat model, which
+// seedChatPipelineToolSupportTenant sets the owner membership's default chat model, which
// the no-explicit-LLM branch of the probe resolves.
func seedChatPipelineToolSupportTenant(t *testing.T, db *gorm.DB, defaultLLMID string) {
t.Helper()
diff --git a/internal/service/chat_pipeline_vision_test.go b/internal/service/chat_pipeline_vision_test.go
index 7afeefdb4e..757f2209b5 100644
--- a/internal/service/chat_pipeline_vision_test.go
+++ b/internal/service/chat_pipeline_vision_test.go
@@ -66,7 +66,7 @@ func seedChatPipelineVisionTenant(t *testing.T, db *gorm.DB, defaultLLMID string
ID: "tenant-1",
Status: &status,
}).Error; err != nil {
- t.Fatalf("failed to create tenant: %v", err)
+ t.Fatalf("set tenant owner default chat model: %v", err)
}
if err := db.Model(&entity.UserTenant{}).Where("id = ?", "user-tenant-1").Update("llm_id", defaultLLMID).Error; err != nil {
t.Fatalf("failed to configure owner default model: %v", err)
diff --git a/internal/service/chat_rest_update_test.go b/internal/service/chat_rest_update_test.go
index 1b32c0675b..9d16f4378f 100644
--- a/internal/service/chat_rest_update_test.go
+++ b/internal/service/chat_rest_update_test.go
@@ -128,7 +128,7 @@ func TestChatServiceCreateDefaultsMetaDataFilter(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "created chat",
})
@@ -158,7 +158,7 @@ func TestChatServiceCreateAcceptsNilMetaDataFilter(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "created chat",
"meta_data_filter": nil,
@@ -176,7 +176,7 @@ func TestChatServiceCreateRejectsInvalidMetaDataFilter(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "created chat",
"meta_data_filter": []interface{}{"invalid"},
@@ -194,7 +194,7 @@ func TestChatServicePatchChatMergesPromptConfigAndLLMSetting(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, err := svc.PatchChat(ctx, "user-1", "chat-1", map[string]interface{}{
"prompt_config": map[string]interface{}{"quote": false},
"llm_setting": map[string]interface{}{"temperature": float64(0.2)},
@@ -232,7 +232,7 @@ func TestChatServiceUpdateChatRejectsTenantID(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{
"tenant_id": "tenant-2",
})
@@ -246,7 +246,7 @@ func TestChatServiceUpdateChatRejectsInvalidLLMSetting(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{
"llm_setting": "invalid",
})
@@ -268,7 +268,7 @@ func TestChatServiceUpdateChatAcceptsMetaDataFilterObject(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{
"name": "chat-chat-1",
"meta_data_filter": map[string]interface{}{
@@ -294,7 +294,8 @@ func TestChatServiceUpdateChatNormalizesKeywordsSimilarityWeight(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- resp, err := svc.UpdateChat(t.Context(), "user-1", "chat-1", map[string]interface{}{
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ resp, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{
"name": "chat-chat-1",
"keywords_similarity_weight": 0.7,
})
@@ -302,7 +303,7 @@ func TestChatServiceUpdateChatNormalizesKeywordsSimilarityWeight(t *testing.T) {
t.Fatalf("UpdateChat failed: %v", err)
}
- chat, err := svc.chatDAO.GetByID(t.Context(), dao.DB, "chat-1")
+ chat, err := svc.chatDAO.GetByID(ctx, dao.DB, "chat-1")
if err != nil {
t.Fatalf("failed to fetch chat: %v", err)
}
@@ -344,7 +345,7 @@ func TestChatServiceUpdateChatRejectsMismatchedSimilarityWeights(t *testing.T) {
db := setupChatRESTUpdateServiceTestDB(t)
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
- _, err := NewChatService().UpdateChat(t.Context(), "user-1", "chat-1", map[string]interface{}{
+ _, err := NewChatService().UpdateChat(serviceTestContext(t, "user-1", "user-1"), "user-1", "chat-1", map[string]interface{}{
"name": "chat-chat-1",
"keywords_similarity_weight": 0.7,
"vector_similarity_weight": 0.4,
@@ -359,7 +360,7 @@ func TestChatServiceUpdateChatBackfillsNilMetaDataFilter(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{
"name": "chat-chat-1",
})
@@ -383,7 +384,7 @@ func TestChatServicePatchChatIgnoresTenantIDAndUpdatesName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.PatchChat(ctx, "user-1", "chat-1", map[string]interface{}{
"tenant_id": "tenant-2",
"name": " renamed chat ",
@@ -408,7 +409,7 @@ func TestChatServiceCreateValidatesName(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, code, err := svc.Create(ctx, "user-1", map[string]interface{}{"name": " "})
if err == nil {
t.Fatal("expected name validation error")
@@ -426,7 +427,7 @@ func TestChatServiceCreateDedupesDuplicateName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, code, err := svc.Create(ctx, "user-1", map[string]interface{}{"name": "chat-chat-1"})
if err != nil {
t.Fatalf("expected deduped create to succeed, got %v", err)
@@ -445,7 +446,7 @@ func TestChatServiceUpdateValidatesName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{"name": " "})
if err == nil {
t.Fatal("expected name validation error")
@@ -461,7 +462,7 @@ func TestChatServiceUpdateRejectsDuplicateName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-2", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.UpdateChat(ctx, "user-1", "chat-1", map[string]interface{}{"name": "chat-chat-2"})
if err == nil {
t.Fatal("expected duplicate name error")
@@ -476,7 +477,7 @@ func TestChatServicePatchChatRejectsEmptyName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.PatchChat(ctx, "user-1", "chat-1", map[string]interface{}{"name": ""})
if err == nil || err.Error() != "`name` cannot be empty" {
t.Fatalf("expected empty name error, got %v", err)
@@ -488,7 +489,7 @@ func TestChatServicePatchChatRejectsNonStringName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.PatchChat(ctx, "user-1", "chat-1", map[string]interface{}{"name": 123})
if err == nil || err.Error() != "chat name must be a string" {
t.Fatalf("expected non-string name error, got %v", err)
@@ -500,7 +501,7 @@ func TestChatServicePatchChatRejectsTooLongName(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
longName := strings.Repeat("a", 256)
_, err := svc.PatchChat(ctx, "user-1", "chat-1", map[string]interface{}{"name": longName})
if err == nil {
@@ -517,7 +518,7 @@ func TestChatServiceUpdateRejectsDuplicateNameCaseInsensitive(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-2", "user-1")
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, err := svc.PatchChat(ctx, "user-1", "chat-1", map[string]interface{}{"name": "CHAT-CHAT-2"})
if err == nil || err.Error() != "duplicated chat name" {
t.Fatalf("expected case-insensitive duplicate name error, got %v", err)
@@ -528,7 +529,7 @@ func TestChatServiceCreateRejectsTenantID(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "valid chat",
"tenant_id": "other-tenant",
@@ -545,7 +546,7 @@ func TestChatServiceCreateRejectsInvalidPromptConfig(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
_, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "valid chat",
"prompt_config": "invalid",
@@ -563,7 +564,7 @@ func TestChatServiceUpdateRejectsDuplicatePromptParameterKeys(t *testing.T) {
createChatRESTUpdateServiceTestChat(t, db, "chat-1", "user-1")
svc := NewChatService()
- _, err := svc.UpdateChat(t.Context(), "user-1", "chat-1", map[string]interface{}{
+ _, err := svc.UpdateChat(serviceTestContext(t, "user-1", "user-1"), "user-1", "chat-1", map[string]interface{}{
"prompt_config": map[string]interface{}{
"parameters": []interface{}{
map[string]interface{}{"key": "knowledge"},
@@ -580,7 +581,7 @@ func TestChatServiceCreatePromptDefaultsContract(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "prompt defaults chat",
})
@@ -621,7 +622,7 @@ func TestChatServiceCreateWithDatasetSeedsDatasetSystemPrompt(t *testing.T) {
setupChatRESTUpdateServiceTestDB(t)
svc := NewChatService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, code, err := svc.Create(ctx, "user-1", map[string]interface{}{
"name": "prompt defaults chat with dataset",
"kb_ids": []interface{}{"kb-1"},
diff --git a/internal/service/compilation_template_service.go b/internal/service/compilation_template_service.go
index 553a38e53b..101fe88162 100644
--- a/internal/service/compilation_template_service.go
+++ b/internal/service/compilation_template_service.go
@@ -36,7 +36,7 @@ import (
// fillConfigDefaultLLM mirrors Python CompilationTemplateService.
// fill_config_default_llm: when the config has no explicit llm_id it lazily
-// fills the tenant's default chat model id (read-side only; the DB row is left
+// fills the current member's default chat model id (read-side only; the DB row is left
// untouched).
func fillConfigDefaultLLM(ctx context.Context, config entity.JSONMap, tenantID *string) entity.JSONMap {
if len(config) == 0 || tenantID == nil || *tenantID == "" {
diff --git a/internal/service/connector.go b/internal/service/connector.go
index d81bdc09fd..410d5febe0 100644
--- a/internal/service/connector.go
+++ b/internal/service/connector.go
@@ -394,6 +394,14 @@ func (s *ConnectorService) TestConnector(ctx context.Context, connectorID, userI
if config == nil {
return ErrConnectorNotFound
}
+ // A caller may test settings for an unsaved connector by supplying a
+ // request config, but must not use that path to test an existing
+ // connector they cannot access.
+ if _, lookupErr := s.connectorDAO.GetByID(ctx, dao.DB, connectorID); lookupErr == nil {
+ return ErrConnectorNotFound
+ } else if !errors.Is(lookupErr, gorm.ErrRecordNotFound) {
+ return lookupErr
+ }
} else {
loadedConnector, err := s.connectorDAO.GetByID(ctx, dao.DB, connectorID)
if err != nil {
diff --git a/internal/service/connector_freq_test.go b/internal/service/connector_freq_test.go
index fae7c9084e..6e2bbbe7d3 100644
--- a/internal/service/connector_freq_test.go
+++ b/internal/service/connector_freq_test.go
@@ -41,7 +41,7 @@ func TestCreateConnectorRejectsNonPositiveFreq(t *testing.T) {
"prune zero": {Name: "c", Source: "rss", Config: entity.JSONMap{}, PruneFreq: int64Ptr(0)},
"prune negative": {Name: "c", Source: "rss", Config: entity.JSONMap{}, PruneFreq: int64Ptr(-1)},
} {
- if _, err := svc.CreateConnector(t.Context(), "user-1", req); err == nil {
+ if _, err := svc.CreateConnector(serviceTestContext(t, "user-1", "user-1"), "user-1", req); err == nil {
t.Fatalf("%s: CreateConnector succeeded, want frequency error", name)
} else if !errors.Is(err, ErrConnectorInvalidFreq) {
t.Fatalf("%s: error = %v, want ErrConnectorInvalidFreq", name, err)
@@ -59,7 +59,7 @@ func TestUpdateConnectorRejectsNonPositiveFreq(t *testing.T) {
"prune zero": {PruneFreq: int64Ptr(0)},
"prune negative": {PruneFreq: int64Ptr(-1)},
} {
- _, code, err := svc.UpdateConnector(t.Context(), "conn-freq", "user-1", req)
+ _, code, err := svc.UpdateConnector(serviceTestContext(t, "user-1", "user-1"), "conn-freq", "user-1", req)
if err == nil {
t.Fatalf("%s: UpdateConnector succeeded, want frequency error", name)
}
diff --git a/internal/service/connector_logs_test.go b/internal/service/connector_logs_test.go
index e5e8e9ed7c..ef200f935c 100644
--- a/internal/service/connector_logs_test.go
+++ b/internal/service/connector_logs_test.go
@@ -17,7 +17,6 @@
package service
import (
- "context"
"fmt"
"testing"
"time"
@@ -79,7 +78,7 @@ func TestListLogsPaginationModes(t *testing.T) {
}
svc := NewConnectorService()
- ctx := context.Background()
+ ctx := serviceTestContext(t, "user-1", "user-1")
all, total, code, err := svc.ListLogs(ctx, "user-1", "", 1, 0)
if err != nil || code != common.CodeSuccess {
@@ -182,7 +181,7 @@ func TestListLogsStatusPriority(t *testing.T) {
}
svc := NewConnectorService()
- ctx := context.Background()
+ ctx := serviceTestContext(t, "user-1", "user-1")
byConnector, total, code, err := svc.ListLog(ctx, "conn-1", "user-1", 1, 100)
if err != nil || code != common.CodeSuccess {
diff --git a/internal/service/connector_syncer_test.go b/internal/service/connector_syncer_test.go
index c1c553f2ed..dd0b158592 100644
--- a/internal/service/connector_syncer_test.go
+++ b/internal/service/connector_syncer_test.go
@@ -91,7 +91,7 @@ func TestUpdateConnectorSchedulePublishesSyncerTask(t *testing.T) {
}
t.Cleanup(func() { getSyncerTaskPublisher = previousPublisher })
- _, code, err := NewConnectorService().UpdateConnector(t.Context(), "conn-1", "user-1", &UpdateConnectorRequest{
+ _, code, err := NewConnectorService().UpdateConnector(serviceTestContext(t, "user-1", "user-1"), "conn-1", "user-1", &UpdateConnectorRequest{
Status: string(entity.TaskStatusSchedule),
})
if err != nil {
@@ -180,7 +180,7 @@ func TestResumeFailedSyncSchedulesOriginalTaskFromCheckpoint(t *testing.T) {
getSyncCheckpointLoader = previousLoader
})
- ok, code, err := NewConnectorService().ResumeFailedSync(t.Context(), "conn-1", "user-1", &ResumeFailedSyncRequest{KbID: "kb-1", TaskID: "task-1"})
+ ok, code, err := NewConnectorService().ResumeFailedSync(serviceTestContext(t, "user-1", "user-1"), "conn-1", "user-1", &ResumeFailedSyncRequest{KbID: "kb-1", TaskID: "task-1"})
if err != nil {
t.Fatalf("ResumeFailedSync error: %v", err)
}
@@ -272,7 +272,7 @@ func TestRebuildConnectorDeletesOldSyncCheckpointsBeforePublishing(t *testing.T)
getSyncCheckpointDeleter = previousDeleter
})
- ok, code, err := NewConnectorService().RebuildConnector(t.Context(), "conn-1", "user-1", "kb-1")
+ ok, code, err := NewConnectorService().RebuildConnector(serviceTestContext(t, "user-1", "user-1"), "conn-1", "user-1", "kb-1")
if err != nil {
t.Fatalf("RebuildConnector error: %v", err)
}
@@ -326,7 +326,7 @@ func TestRebuildConnectorRejectsCrossTenantAndUnboundKB(t *testing.T) {
// The caller can access kb-1, but conn-1 is not bound to it: denied before
// any documents are listed or deleted.
- ok, code, err := svc.RebuildConnector(t.Context(), "conn-1", "user-1", "kb-1")
+ ok, code, err := svc.RebuildConnector(serviceTestContext(t, "user-1", "user-1"), "conn-1", "user-1", "kb-1")
if err == nil || !errors.Is(err, ErrConnectorNotBoundToKB) {
t.Fatalf("err = %v, want ErrConnectorNotBoundToKB", err)
}
@@ -335,12 +335,12 @@ func TestRebuildConnectorRejectsCrossTenantAndUnboundKB(t *testing.T) {
}
// The caller cannot access a cross-tenant kb at all: denied up front.
- ok, code, err = svc.RebuildConnector(t.Context(), "conn-1", "user-1", "kb-foreign")
- if err == nil || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("err = %v, want permission denial", err)
+ ok, code, err = svc.RebuildConnector(serviceTestContext(t, "user-1", "user-1"), "conn-1", "user-1", "kb-foreign")
+ if err == nil || (!errors.Is(err, permission.ErrResourceNotFound) && !errors.Is(err, permission.ErrPermissionDenied)) {
+ t.Fatalf("err = %v, want hidden cross-tenant resource", err)
}
- if ok || code != common.CodeForbidden {
- t.Fatalf("ok/code = %v/%v, want false/forbidden", ok, code)
+ if ok || (code != common.CodeForbidden && code != common.CodeNotFound) {
+ t.Fatalf("ok/code = %v/%v, want false/denied", ok, code)
}
}
@@ -400,7 +400,7 @@ func TestUpdateConnectorScheduleDoesNotDuplicateRunningTask(t *testing.T) {
}
t.Cleanup(func() { getSyncerTaskPublisher = previousPublisher })
- _, code, err := NewConnectorService().UpdateConnector(t.Context(), "conn-1", "user-1", &UpdateConnectorRequest{
+ _, code, err := NewConnectorService().UpdateConnector(serviceTestContext(t, "user-1", "user-1"), "conn-1", "user-1", &UpdateConnectorRequest{
Status: string(entity.TaskStatusSchedule),
})
if err != nil {
diff --git a/internal/service/connector_test_connection_test.go b/internal/service/connector_test_connection_test.go
index 425d299264..6a094cec47 100644
--- a/internal/service/connector_test_connection_test.go
+++ b/internal/service/connector_test_connection_test.go
@@ -43,7 +43,7 @@ func TestConnectorServiceTestConnectorUsesRequestConfig(t *testing.T) {
"source": "mock",
"config": entity.JSONMap{"from": "request"},
}
- if err := svc.TestConnector(t.Context(), "conn-1", "tenant-1", request); err != nil {
+ if err := svc.TestConnector(serviceTestContext(t, "tenant-1", "tenant-1"), "conn-1", "tenant-1", request); err != nil {
t.Fatalf("TestConnector failed: %v", err)
}
if capturedConfig["from"] != "request" {
@@ -65,7 +65,7 @@ func TestConnectorServiceTestConnectorAllowsUnsavedConnectorWithSource(t *testin
svc := NewConnectorService()
svc.connectorRegistry = registry
- err := svc.TestConnector(t.Context(), "missing", "tenant-1", entity.JSONMap{
+ err := svc.TestConnector(serviceTestContext(t, "tenant-1", "tenant-1"), "missing", "tenant-1", entity.JSONMap{
"source": "mock",
"config": entity.JSONMap{"ok": true},
})
@@ -88,7 +88,7 @@ func TestConnectorServiceTestConnectorSurfacesRawValidationError(t *testing.T) {
svc := NewConnectorService()
svc.connectorRegistry = registry
- err := svc.TestConnector(t.Context(), "missing", "tenant-1", entity.JSONMap{
+ err := svc.TestConnector(serviceTestContext(t, "tenant-1", "tenant-1"), "missing", "tenant-1", entity.JSONMap{
"source": "mock",
"config": entity.JSONMap{"ok": true},
})
@@ -105,7 +105,7 @@ func TestConnectorServiceTestConnectorRejectsMissingConfigForMissingConnector(t
t.Fatalf("migrate connector tables: %v", err)
}
- err := NewConnectorService().TestConnector(t.Context(), "missing", "tenant-1", nil)
+ err := NewConnectorService().TestConnector(serviceTestContext(t, "tenant-1", "tenant-1"), "missing", "tenant-1", nil)
if !errors.Is(err, ErrConnectorNotFound) {
t.Fatalf("error = %v, want ErrConnectorNotFound", err)
}
@@ -129,12 +129,12 @@ func TestConnectorServiceTestConnectorRejectsUnauthorizedConnector(t *testing.T)
t.Fatalf("insert connector: %v", err)
}
- err := NewConnectorService().TestConnector(t.Context(), "conn-1", "user-2", entity.JSONMap{
+ err := NewConnectorService().TestConnector(serviceTestContext(t, "user-2", "user-2"), "conn-1", "user-2", entity.JSONMap{
"source": "mock",
"config": entity.JSONMap{"ok": true},
})
- if !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("error = %v, want permission denial", err)
+ if !errors.Is(err, ErrConnectorNotFound) && !errors.Is(err, permission.ErrPermissionDenied) {
+ t.Fatalf("error = %v, want hidden connector not found", err)
}
}
@@ -145,7 +145,7 @@ func TestConnectorServiceTestConnectorRejectsUnsupportedSource(t *testing.T) {
t.Fatalf("migrate connector tables: %v", err)
}
- err := NewConnectorService().TestConnector(t.Context(), "missing", "tenant-1", entity.JSONMap{
+ err := NewConnectorService().TestConnector(serviceTestContext(t, "tenant-1", "tenant-1"), "missing", "tenant-1", entity.JSONMap{
"source": "unknown",
"config": entity.JSONMap{"ok": true},
})
@@ -168,7 +168,7 @@ func TestConnectorServiceTestConnectorRejectsConnectorWithoutValidator(t *testin
svc := NewConnectorService()
svc.connectorRegistry = registry
- err := svc.TestConnector(t.Context(), "missing", "tenant-1", entity.JSONMap{
+ err := svc.TestConnector(serviceTestContext(t, "tenant-1", "tenant-1"), "missing", "tenant-1", entity.JSONMap{
"source": "plain",
"config": entity.JSONMap{"ok": true},
})
diff --git a/internal/service/dataset/compilation_status_test.go b/internal/service/dataset/compilation_status_test.go
index e0f1573bef..cf020ec63a 100644
--- a/internal/service/dataset/compilation_status_test.go
+++ b/internal/service/dataset/compilation_status_test.go
@@ -99,7 +99,7 @@ func TestGetDatasetCompilationStatus_NoRowIsIdle(t *testing.T) {
insertCompilationOwnerKB(t, "kb-no-row", "user-1")
st, code, err := testCompilationStatusService().GetDatasetCompilationStatus(
- t.Context(), "user-1", "kb-no-row", "graph")
+ withDatasetTestContext(t.Context(), "user-1", "user-1"), "user-1", "kb-no-row", "graph")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -156,7 +156,7 @@ func TestGetDatasetCompilationStatus_FullOutput(t *testing.T) {
}
st, code, err := testCompilationStatusService().GetDatasetCompilationStatus(
- t.Context(), "user-1", "kb-full", "graph")
+ withDatasetTestContext(t.Context(), "user-1", "user-1"), "user-1", "kb-full", "graph")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -198,7 +198,7 @@ func TestGetDatasetCompilationStatus_Unauthorized(t *testing.T) {
}
st, code, err := testCompilationStatusService().GetDatasetCompilationStatus(
- t.Context(), "user-2", "kb-other", "graph")
+ withDatasetTestContext(t.Context(), "user-2", "user-1"), "user-2", "kb-other", "graph")
if err == nil {
t.Fatalf("expected authorization error, got nil (status=%+v)", st)
}
diff --git a/internal/service/dataset/dataset_test_helpers_ee_test.go b/internal/service/dataset/dataset_test_helpers_ee_test.go
new file mode 100644
index 0000000000..90d1970c62
--- /dev/null
+++ b/internal/service/dataset/dataset_test_helpers_ee_test.go
@@ -0,0 +1,27 @@
+// 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 dataset
+
+import (
+ "testing"
+)
+
+func datasetTestExtraModels() []interface{} { return nil }
+
+func datasetTestMembershipRole(_ *testing.T, _ string, role string) string { return role }
+
+func grantDatasetTestResource(_ *testing.T, _ string, _ string, _ string, _ string, _ ...string) {}
+
+func enableDatasetTestModelAccess(_ *testing.T, _ string, _ string, _ string) {}
diff --git a/internal/service/dataset/ingestion.go b/internal/service/dataset/ingestion.go
index b9cb7e9be2..f7bf67f6ea 100644
--- a/internal/service/dataset/ingestion.go
+++ b/internal/service/dataset/ingestion.go
@@ -262,6 +262,11 @@ func (d *DatasetService) ListSyncLogs(ctx context.Context, datasetID, userID str
EntryOp: permission.OperationUse,
})
if scopeErr != nil {
+ if errors.Is(scopeErr, permission.ErrPermissionDenied) ||
+ errors.Is(scopeErr, permission.ErrMembershipNotFound) ||
+ errors.Is(scopeErr, permission.ErrResourceNotFound) {
+ continue
+ }
code, permissionErr := permissionresponse.Normalize(scopeErr)
return nil, code, permissionErr
}
diff --git a/internal/service/dataset/ingestion_messages_test.go b/internal/service/dataset/ingestion_messages_test.go
index 2360412d8c..35dbbd9bd6 100644
--- a/internal/service/dataset/ingestion_messages_test.go
+++ b/internal/service/dataset/ingestion_messages_test.go
@@ -6,6 +6,7 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
+ "ragflow/internal/permission"
"ragflow/internal/service"
"gorm.io/gorm"
@@ -23,7 +24,7 @@ func TestListIngestionMessagesUsesRunScopedKeysets(t *testing.T) {
insertMessageEvent(t, db, "run-1", "task-1", dao.EventTypeMessage, "detail")
}
- response, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "run-1", 2, nil, nil)
+ response, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "run-1", 2, nil, nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionMessages = (%+v, %v, %v), want success", response, code, err)
}
@@ -33,7 +34,7 @@ func TestListIngestionMessagesUsesRunScopedKeysets(t *testing.T) {
assertMessageEventIDs(t, response.Items, 4, 5)
afterID := 2
- response, code, err = NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "run-1", 2, &afterID, nil)
+ response, code, err = NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "run-1", 2, &afterID, nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("after page = (%+v, %v, %v), want success", response, code, err)
}
@@ -43,7 +44,7 @@ func TestListIngestionMessagesUsesRunScopedKeysets(t *testing.T) {
}
beforeID := 4
- if _, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "run-1", 2, &afterID, &beforeID); err == nil || code != common.CodeArgumentError {
+ if _, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "run-1", 2, &afterID, &beforeID); err == nil || code != common.CodeArgumentError {
t.Fatalf("mutually exclusive cursors = code:%v err:%v, want argument error", code, err)
}
}
@@ -58,7 +59,7 @@ func TestListIngestionMessagesRejectsUnnumberedRun(t *testing.T) {
insertMessageRun(t, "legacy-run", "kb-1", "doc-1", entity.TaskStatusRunning, 0)
insertMessageEvent(t, db, "legacy-run", "task-1", dao.EventTypeMessage, "old detail")
- response, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "legacy-run", 200, nil, nil)
+ response, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "legacy-run", 200, nil, nil)
if response != nil || err == nil || code != common.CodeDataError {
t.Fatalf("ListIngestionMessages = (%+v, %v, %v), want not-found data error", response, code, err)
}
@@ -88,7 +89,7 @@ func TestDatasetIngestionLogUsesEventStream(t *testing.T) {
insertMessageRun(t, "numbered-sentinel-run", "kb-1", entity.DatasetLogDocumentID, entity.TaskStatusDone, 1)
insertMessageEvent(t, db, "dataset-run", "dataset-run", dao.EventTypeTerminal, "Knowledge compilation completed")
- result, code, err := NewDatasetService().ListIngestionLogs(t.Context(), "kb-1", "user-1", 1, 30, nil, nil, "", "", "dataset", "", "")
+ result, code, err := NewDatasetService().ListIngestionLogs(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", 1, 30, nil, nil, "", "", "dataset", "", "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionLogs = (%+v, %v, %v), want success", result, code, err)
}
@@ -98,7 +99,7 @@ func TestDatasetIngestionLogUsesEventStream(t *testing.T) {
}
assertLatestEventMap(t, logs[0], 1, "Knowledge compilation completed")
- messages, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "dataset-run", 200, nil, nil)
+ messages, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "dataset-run", 200, nil, nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionMessages = (%+v, %v, %v), want success", messages, code, err)
}
@@ -106,7 +107,7 @@ func TestDatasetIngestionLogUsesEventStream(t *testing.T) {
t.Fatalf("dataset messages = %+v, want terminal event stream", messages)
}
- log, code, err := NewDatasetService().GetIngestionLog(t.Context(), "kb-1", "user-1", "dataset-run")
+ log, code, err := NewDatasetService().GetIngestionLog(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "dataset-run")
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetIngestionLog = (%+v, %v, %v), want success", log, code, err)
}
@@ -127,6 +128,7 @@ func TestListSyncLogsReturnsOnlyCurrentlyLinkedDatasetConnectors(t *testing.T) {
if err := db.Create(&connectors).Error; err != nil {
t.Fatalf("insert connectors: %v", err)
}
+ grantDatasetTestResource(t, "user-1", "connector", "connector-1", "user-1", "owner")
if err := db.Create(&entity.Connector2Kb{ID: "connector-1-kb-1", ConnectorID: "connector-1", KbID: "kb-1", AutoParse: "1"}).Error; err != nil {
t.Fatalf("link connector to kb-1: %v", err)
}
@@ -148,7 +150,19 @@ func TestListSyncLogsReturnsOnlyCurrentlyLinkedDatasetConnectors(t *testing.T) {
t.Fatalf("insert sync logs: %v", err)
}
- result, code, err := NewDatasetService().ListSyncLogs(t.Context(), "kb-1", "user-1", 1, 30)
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
+ subject := permission.Subject{UserID: "user-1"}
+ checker := permission.NewDatabaseChecker(db)
+ if err := checker.CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: "kb-1"}, permission.OperationRead); err != nil {
+ t.Fatalf("check dataset access fixture: %v", err)
+ }
+ if err := checker.CheckDependency(ctx, subject,
+ permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: "connector-1"},
+ permission.ResourceRef{Kind: permission.ResourceKindSyncTask, ID: "sync-kb-1"},
+ permission.OperationUse, permission.OperationRead); err != nil {
+ t.Fatalf("check linked sync log access fixture: %v", err)
+ }
+ result, code, err := NewDatasetService().ListSyncLogs(ctx, "kb-1", "user-1", 1, 30)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListSyncLogs = (%+v, %v, %v), want success", result, code, err)
}
@@ -180,7 +194,7 @@ func TestListIngestionLogsIncludesPythonFileLogsAndStatusFilters(t *testing.T) {
t.Fatalf("insert Python run: %v", err)
}
- result, code, err := NewDatasetService().ListIngestionLogs(t.Context(), "kb-1", "user-1", 1, 30, nil, []string{"DONE"}, "", "", "file", "", "")
+ result, code, err := NewDatasetService().ListIngestionLogs(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", 1, 30, nil, []string{"DONE"}, "", "", "file", "", "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionLogs = (%+v, %v, %v), want success", result, code, err)
}
@@ -202,7 +216,7 @@ func TestListIngestionLogsIncludesPythonFileLogsAndStatusFilters(t *testing.T) {
t.Fatalf("Python file log = %#v, want file-log fields", byID["python-run"])
}
- detail, code, err := NewDatasetService().GetIngestionLog(t.Context(), "kb-1", "user-1", "python-run")
+ detail, code, err := NewDatasetService().GetIngestionLog(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "python-run")
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetIngestionLog = (%+v, %v, %v), want success", detail, code, err)
}
@@ -213,7 +227,7 @@ func TestListIngestionLogsIncludesPythonFileLogsAndStatusFilters(t *testing.T) {
t.Fatalf("Python detail = %#v, want file-log fields", detail)
}
- messages, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "python-run", 200, nil, nil)
+ messages, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "python-run", 200, nil, nil)
if err != nil || code != common.CodeSuccess || !messages.Terminal || len(messages.Items) != 0 {
t.Fatalf("Python ListIngestionMessages = (%+v, %v, %v), want empty terminal success", messages, code, err)
}
@@ -235,7 +249,7 @@ func TestPythonDatasetLogIsReadableAndKeepsProgressMessage(t *testing.T) {
t.Fatalf("insert Python dataset run: %v", err)
}
- result, code, err := NewDatasetService().ListIngestionLogs(t.Context(), "kb-1", "user-1", 1, 30, nil, []string{"DONE"}, "", "", "dataset", "", "")
+ result, code, err := NewDatasetService().ListIngestionLogs(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", 1, 30, nil, []string{"DONE"}, "", "", "dataset", "", "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionLogs = (%+v, %v, %v), want success", result, code, err)
}
@@ -247,7 +261,7 @@ func TestPythonDatasetLogIsReadableAndKeepsProgressMessage(t *testing.T) {
t.Fatalf("Python dataset log fields = %#v, want stored status and progress_msg", logs[0])
}
- log, code, err := NewDatasetService().GetIngestionLog(t.Context(), "kb-1", "user-1", "python-dataset-run")
+ log, code, err := NewDatasetService().GetIngestionLog(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "python-dataset-run")
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetIngestionLog = (%+v, %v, %v), want success", log, code, err)
}
@@ -255,7 +269,7 @@ func TestPythonDatasetLogIsReadableAndKeepsProgressMessage(t *testing.T) {
t.Fatalf("detail progress_msg = %#v, want %q", log["progress_msg"], progressMessage)
}
- messages, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "python-dataset-run", 200, nil, nil)
+ messages, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "python-dataset-run", 200, nil, nil)
if err != nil || code != common.CodeSuccess || !messages.Terminal || len(messages.Items) != 0 {
t.Fatalf("legacy ListIngestionMessages = (%+v, %v, %v), want empty terminal success", messages, code, err)
}
@@ -277,7 +291,7 @@ func TestListIngestionLogsEmbedsLatestRunEventWithoutProgressMessage(t *testing.
insertMessageEvent(t, db, "run-1", "task-1", dao.EventTypeTerminal, "latest first")
insertMessageEvent(t, db, "run-2", "task-2", dao.EventTypeMessage, "latest second")
- result, code, err := NewDatasetService().ListIngestionLogs(t.Context(), "kb-1", "user-1", 1, 30, nil, nil, "", "", "file", "", "")
+ result, code, err := NewDatasetService().ListIngestionLogs(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", 1, 30, nil, nil, "", "", "file", "", "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionLogs = (%+v, %v, %v), want success", result, code, err)
}
@@ -308,7 +322,7 @@ func TestGetIngestionLogEmbedsLatestRunEvent(t *testing.T) {
insertMessageRun(t, "run-1", "kb-1", "doc-1", entity.TaskStatusDone, 1)
insertMessageEvent(t, db, "run-1", "task-1", dao.EventTypeMessage, "latest detail")
- result, code, err := NewDatasetService().GetIngestionLog(t.Context(), "kb-1", "user-1", "run-1")
+ result, code, err := NewDatasetService().GetIngestionLog(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "run-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetIngestionLog = (%+v, %v, %v), want success", result, code, err)
}
@@ -332,7 +346,7 @@ func TestIngestionEventWriterFeedsRunScopedLogReaders(t *testing.T) {
t.Fatalf("record progress event: %v", err)
}
- messages, code, err := NewDatasetService().ListIngestionMessages(t.Context(), "kb-1", "user-1", "run-1", 200, nil, nil)
+ messages, code, err := NewDatasetService().ListIngestionMessages(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "run-1", 200, nil, nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionMessages = (%+v, %v, %v), want success", messages, code, err)
}
@@ -340,7 +354,7 @@ func TestIngestionEventWriterFeedsRunScopedLogReaders(t *testing.T) {
t.Fatalf("messages = %+v, want lifecycle then latest progress", messages.Items)
}
- log, code, err := NewDatasetService().GetIngestionLog(t.Context(), "kb-1", "user-1", "run-1")
+ log, code, err := NewDatasetService().GetIngestionLog(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", "run-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetIngestionLog = (%+v, %v, %v), want success", log, code, err)
}
@@ -434,7 +448,7 @@ func TestListIngestionLogsRejectsUnknownLogType(t *testing.T) {
{name: "empty", logType: "", wantCode: common.CodeDataError},
} {
t.Run(tc.name, func(t *testing.T) {
- result, code, err := NewDatasetService().ListIngestionLogs(t.Context(), "kb-1", "user-1", 1, 30, nil, nil, "", "", tc.logType, "", "")
+ result, code, err := NewDatasetService().ListIngestionLogs(withDatasetTestContext(t.Context(), "user-1", "user-1"), "kb-1", "user-1", 1, 30, nil, nil, "", "", tc.logType, "", "")
if tc.wantCode == common.CodeSuccess {
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListIngestionLogs(%q) = (%+v, %v, %v), want success", tc.logType, result, code, err)
diff --git a/internal/service/dataset/list_test.go b/internal/service/dataset/list_test.go
index 730c02f656..8d252b6b81 100644
--- a/internal/service/dataset/list_test.go
+++ b/internal/service/dataset/list_test.go
@@ -26,7 +26,7 @@ func TestDatasetServiceListDatasetsFiltersByIDs(t *testing.T) {
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Alpha")
insertDatasetUpdateKB(t, "kb-2", "tenant-1", "Beta")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
data, total, code, err := testDatasetListService(t).ListDatasets(ctx,
"", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},
"", nil, "", "tenant-1", []string{"kb-1"}, "",
@@ -59,13 +59,14 @@ func TestDatasetServiceListDatasetsIDsAccessibleViaTeamTenant(t *testing.T) {
t.Fatalf("insert owner tenant: %v", err)
}
insertDatasetUpdateTeamMember(t, "user-1", "owner-1")
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-team", "user-1", "read")
if err := dao.DB.Model(&entity.Knowledgebase{}).
Where("id = ?", "kb-team").
Update("permission", string(entity.TenantPermissionTeam)).Error; err != nil {
t.Fatalf("update kb permission: %v", err)
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "owner-1")
data, total, code, err := testDatasetListService(t).ListDatasets(ctx,
"", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},
"", nil, "", "user-1", []string{"kb-team"}, "",
@@ -84,7 +85,6 @@ func TestDatasetServiceListDatasetsIDsAccessibleViaTeamTenant(t *testing.T) {
func TestDatasetServiceListDatasetsAndFiltersUseAuthorizedScope(t *testing.T) {
db := setupDatasetUpdateTestDB(t)
pushServiceDB(t, db)
- insertDatasetUpdateKB(t, "kb-own", "user-1", "Own")
insertDatasetUpdateKB(t, "kb-team", "owner-1", "Team")
insertDatasetUpdateKB(t, "kb-private", "owner-1", "Private")
insertDatasetUpdateTeamMember(t, "user-1", "owner-1")
@@ -93,8 +93,9 @@ func TestDatasetServiceListDatasetsAndFiltersUseAuthorizedScope(t *testing.T) {
Update("permission", string(entity.TenantPermissionTeam)).Error; err != nil {
t.Fatalf("share team dataset: %v", err)
}
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-team", "user-1", "read")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "owner-1")
data, total, code, err := testDatasetListService(t).ListDatasets(ctx,
"", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},
"", []string{"owner-1"}, "", "user-1", nil, "",
@@ -110,12 +111,12 @@ func TestDatasetServiceListDatasetsAndFiltersUseAuthorizedScope(t *testing.T) {
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListDatasetFilters = (%#v, %v, %v), want success", filters, code, err)
}
- if filters["total"] != int64(2) {
- t.Fatalf("ListDatasetFilters total = %#v, want 2 visible datasets", filters["total"])
+ if filters["total"] != int64(1) {
+ t.Fatalf("ListDatasetFilters total = %#v, want one visible dataset", filters["total"])
}
owners, ok := filters["filter"].(map[string]interface{})["owner"].([]*entity.DatasetOwnerFilter)
- if !ok || len(owners) != 2 {
- t.Fatalf("ListDatasetFilters owners = %#v, want own and shared tenant groups", filters["filter"])
+ if !ok || len(owners) != 1 {
+ t.Fatalf("ListDatasetFilters owners = %#v, want one visible owner group", filters["filter"])
}
}
@@ -140,9 +141,11 @@ func TestDatasetServiceListDatasetsForCanvasUsesCallerOwnerIntersection(t *testi
if err := dao.DB.Create(&canvas).Error; err != nil {
t.Fatalf("create shared canvas: %v", err)
}
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-shared", "user-1", "read")
+ grantDatasetTestResource(t, "owner-1", "canvas", "canvas-shared", "user-1", "read")
service := testDatasetListService(t)
- data, total, code, err := service.ListDatasets(t.Context(), "", "", 1, 30,
+ data, total, code, err := service.ListDatasets(withDatasetTestContext(t.Context(), "user-1", "owner-1"), "", "", 1, 30,
[]dao.OrderTerm{{Column: "create_time", Desc: true}}, "", nil, "", "user-1", nil, "canvas-shared")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListDatasets(canvas) = (%#v, %d, %v), want success", data, code, err)
@@ -151,7 +154,7 @@ func TestDatasetServiceListDatasetsForCanvasUsesCallerOwnerIntersection(t *testi
t.Fatalf("canvas dataset list = %#v (total=%d), want only kb-shared", data, total)
}
- data, total, code, err = service.ListDatasets(t.Context(), "", "", 1, 30,
+ data, total, code, err = service.ListDatasets(withDatasetTestContext(t.Context(), "user-1", "owner-1"), "", "", 1, 30,
[]dao.OrderTerm{{Column: "create_time", Desc: true}}, "", nil, "", "user-1",
[]string{"kb-caller-only", "kb-shared", "kb-owner-only"}, "canvas-shared")
if err != nil || code != common.CodeSuccess {
@@ -165,20 +168,27 @@ func TestDatasetServiceListDatasetsForCanvasUsesCallerOwnerIntersection(t *testi
func TestDatasetServiceListDatasetsPaginatesInsidePermissionScope(t *testing.T) {
db := setupDatasetUpdateTestDB(t)
pushServiceDB(t, db)
- insertDatasetUpdateKB(t, "kb-own", "user-1", "Own")
+ insertDatasetUpdateKB(t, "kb-own", "owner-1", "Own")
insertDatasetUpdateKB(t, "kb-team", "owner-1", "Shared")
insertDatasetUpdateKB(t, "kb-private", "owner-1", "Private")
insertDatasetUpdateKB(t, "kb-outside", "other-owner", "Outside")
insertDatasetUpdateTeamMember(t, "user-1", "owner-1")
+ if err := dao.DB.Model(&entity.Knowledgebase{}).
+ Where("id = ?", "kb-own").
+ Update("permission", string(entity.TenantPermissionTeam)).Error; err != nil {
+ t.Fatalf("share first dataset with tenant: %v", err)
+ }
if err := dao.DB.Model(&entity.Knowledgebase{}).
Where("id = ?", "kb-team").
Update("permission", string(entity.TenantPermissionTeam)).Error; err != nil {
t.Fatalf("share team dataset: %v", err)
}
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-own", "user-1", "read")
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-team", "user-1", "read")
service := testDatasetListService(t)
terms := []dao.OrderTerm{{Column: "name"}}
- pageOne, total, code, err := service.ListDatasets(t.Context(), "", "", 1, 1, terms, "", nil, "", "user-1", nil, "")
+ pageOne, total, code, err := service.ListDatasets(withDatasetTestContext(t.Context(), "user-1", "owner-1"), "", "", 1, 1, terms, "", nil, "", "user-1", nil, "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListDatasets(page 1) = (%#v, %d, %v), want success", pageOne, code, err)
}
@@ -186,7 +196,7 @@ func TestDatasetServiceListDatasetsPaginatesInsidePermissionScope(t *testing.T)
t.Fatalf("page 1 = %#v (total=%d), want kb-own and two accessible datasets", pageOne, total)
}
- pageTwo, secondTotal, code, err := service.ListDatasets(t.Context(), "", "", 2, 1, terms, "", nil, "", "user-1", nil, "")
+ pageTwo, secondTotal, code, err := service.ListDatasets(withDatasetTestContext(t.Context(), "user-1", "owner-1"), "", "", 2, 1, terms, "", nil, "", "user-1", nil, "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListDatasets(page 2) = (%#v, %d, %v), want success", pageTwo, code, err)
}
@@ -198,8 +208,9 @@ func TestDatasetServiceListDatasetsPaginatesInsidePermissionScope(t *testing.T)
func TestDatasetServiceListDatasetFiltersReturnsEmptyOwnerList(t *testing.T) {
db := setupDatasetUpdateTestDB(t)
pushServiceDB(t, db)
+ ensureDatasetTestMembership(t, "user-without-datasets", "user-without-datasets", "owner")
- filters, code, err := testDatasetListService(t).ListDatasetFilters(t.Context(), "user-without-datasets", "")
+ filters, code, err := testDatasetListService(t).ListDatasetFilters(withDatasetTestContext(t.Context(), "user-without-datasets", "user-without-datasets"), "user-without-datasets", "")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListDatasetFilters = (%#v, %v, %v), want success", filters, code, err)
}
@@ -231,7 +242,7 @@ func TestDatasetServiceListDatasetsRejectsIDAndIDsTogether(t *testing.T) {
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Alpha")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "tenant-1")
_, _, code, err := testDatasetListService(t).ListDatasets(ctx,
"kb-1", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},
"", nil, "", "tenant-1", []string{"kb-1"}, "",
@@ -254,7 +265,7 @@ func TestDatasetServiceListDatasetsFiltersInaccessibleIDs(t *testing.T) {
insertDatasetUpdateKB(t, "kb-valid", "user-1", "Valid")
insertDatasetUpdateKB(t, "kb-private", "owner-1", "Private")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
data, total, code, err := testDatasetListService(t).ListDatasets(ctx,
"", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},
"", nil, "", "user-1", []string{"kb-valid", "kb-private", "kb-missing"}, "",
@@ -275,7 +286,7 @@ func TestDatasetServiceListDatasetsReturnsEmptyForAllInaccessibleIDs(t *testing.
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-private", "owner-1", "Private")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
data, total, code, err := testDatasetListService(t).ListDatasets(ctx,
"", "", 1, 30, []dao.OrderTerm{{Column: "create_time", Desc: true}},
"", nil, "", "user-1", []string{"kb-private", "kb-missing"}, "",
diff --git a/internal/service/dataset/metadata_config_test.go b/internal/service/dataset/metadata_config_test.go
index f186bca133..a87d4ae69f 100644
--- a/internal/service/dataset/metadata_config_test.go
+++ b/internal/service/dataset/metadata_config_test.go
@@ -70,16 +70,7 @@ func insertDatasetMetadataConfigKB(t *testing.T, datasetID, tenantID string) {
func insertDatasetMetadataConfigTeamMember(t *testing.T, userID, tenantID string) {
t.Helper()
- if err := dao.DB.Create(&entity.UserTenant{
- ID: userID + "-" + tenantID,
- UserID: userID,
- TenantID: tenantID,
- Role: "normal",
- InvitedBy: tenantID,
- Status: sptr("1"),
- }).Error; err != nil {
- t.Fatalf("insert user tenant: %v", err)
- }
+ ensureDatasetTestMembership(t, userID, tenantID, "normal")
}
func insertDatasetMetadataConfigDoc(t *testing.T, docID, datasetID string, parserConfig entity.JSONMap) {
@@ -115,7 +106,7 @@ func TestDatasetServiceUpdateDocumentMetadataConfig(t *testing.T) {
insertDatasetMetadataConfigKB(t, "kb-1", "user-1")
insertDatasetMetadataConfigDoc(t, "doc-1", "kb-1", entity.JSONMap{"pages": []interface{}{1, 2}})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
metadata := map[string]interface{}{"author": "Alice", "year": float64(2026)}
doc, code, err := testDatasetServiceForDocumentMetadataConfig(t).UpdateDocumentMetadataConfig(
ctx,
@@ -168,7 +159,7 @@ func TestDatasetServiceUpdateDocumentMetadataConfigRequiresMetadata(t *testing.T
insertDatasetMetadataConfigKB(t, "kb-1", "user-1")
insertDatasetMetadataConfigDoc(t, "doc-1", "kb-1", entity.JSONMap{})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
_, code, err := testDatasetServiceForDocumentMetadataConfig(t).UpdateDocumentMetadataConfig(
ctx,
"user-1",
@@ -191,9 +182,10 @@ func TestDatasetServiceUpdateDocumentMetadataConfigRejectsNonOwner(t *testing.T)
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertDatasetMetadataConfigKB(t, "kb-1", "owner-1")
+ ensureDatasetTestMembership(t, "user-1", "owner-1", "normal")
insertDatasetMetadataConfigDoc(t, "doc-1", "kb-1", entity.JSONMap{})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "owner-1")
_, code, err := testDatasetServiceForDocumentMetadataConfig(t).UpdateDocumentMetadataConfig(
ctx,
"user-1",
@@ -223,9 +215,10 @@ func TestDatasetServiceUpdateDocumentMetadataConfigAllowsTeamMember(t *testing.T
t.Fatalf("update kb permission: %v", err)
}
insertDatasetMetadataConfigTeamMember(t, "user-1", "owner-1")
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-1", "user-1", "read", "write")
insertDatasetMetadataConfigDoc(t, "doc-1", "kb-1", entity.JSONMap{})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "owner-1")
doc, code, err := testDatasetServiceForDocumentMetadataConfig(t).UpdateDocumentMetadataConfig(
ctx,
"user-1",
@@ -270,7 +263,7 @@ func TestDatasetServiceUpdateMetadataConfigSyncsExtractorSchema(t *testing.T) {
t.Fatalf("seed parser_config: %v", err)
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := (&DatasetService{
kbDAO: dao.NewKnowledgebaseDAO(),
tenantDAO: dao.NewTenantDAO(),
@@ -416,7 +409,7 @@ func TestDatasetServiceGetMetadataConfig(t *testing.T) {
insertCreateDatasetTenant(t, "tenant-1")
insertDatasetMetadataConfigKB(t, "kb-1", "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := (&DatasetService{
kbDAO: dao.NewKnowledgebaseDAO(),
tenantDAO: dao.NewTenantDAO(),
@@ -469,7 +462,7 @@ func TestUpdateMetadataConfig_TenantLookupFailureDoesNotPersist(t *testing.T) {
// kb-1 points at a tenant that does not exist, so tenantDAO.GetByID fails.
insertDatasetMetadataConfigKB(t, "kb-1", "missing-tenant")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "missing-tenant", "missing-tenant")
result, code, err := (&DatasetService{
kbDAO: dao.NewKnowledgebaseDAO(),
tenantDAO: dao.NewTenantDAO(),
@@ -499,7 +492,7 @@ func TestUpdateMetadataConfig_ExplicitEnabledPreservedWhenEmpty(t *testing.T) {
insertDatasetMetadataConfigKB(t, "kb-1", "tenant-1")
enabled := true
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := (&DatasetService{
kbDAO: dao.NewKnowledgebaseDAO(),
tenantDAO: dao.NewTenantDAO(),
@@ -538,7 +531,7 @@ func TestUpdateDocumentMetadataConfig_KBAndTenantLookupFailure(t *testing.T) {
pushServiceDB(t, db)
insertDatasetMetadataConfigKB(t, "kb-ok", "owner-1")
insertDatasetMetadataConfigDoc(t, "doc-ok", "kb-ok", entity.JSONMap{})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "owner-1", "owner-1")
// Missing KB -> database layer should surface as CodeServerError / not found
_, code, err := testDatasetServiceForDocumentMetadataConfig(t).UpdateDocumentMetadataConfig(
@@ -552,8 +545,9 @@ func TestUpdateDocumentMetadataConfig_KBAndTenantLookupFailure(t *testing.T) {
// KB exists but tenant lookup fails (kb.TenantID points to missing tenant)
insertDatasetMetadataConfigKB(t, "kb-bad-tenant", "missing-tenant")
insertDatasetMetadataConfigDoc(t, "doc2", "kb-bad-tenant", entity.JSONMap{})
+ missingTenantCtx := withDatasetTestContext(t.Context(), "missing-tenant", "missing-tenant")
_, code, err = testDatasetServiceForDocumentMetadataConfig(t).UpdateDocumentMetadataConfig(
- ctx, "missing-tenant", "kb-bad-tenant", "doc2",
+ missingTenantCtx, "missing-tenant", "kb-bad-tenant", "doc2",
map[string]interface{}{"metadata": map[string]interface{}{"a": "b"}},
)
if code != common.CodeServerError || err == nil {
diff --git a/internal/service/dataset/setup_test.go b/internal/service/dataset/setup_test.go
index abd6f82f86..7c940adb9f 100644
--- a/internal/service/dataset/setup_test.go
+++ b/internal/service/dataset/setup_test.go
@@ -1,11 +1,13 @@
package dataset
import (
+ "context"
"net/url"
"testing"
"ragflow/internal/dao"
"ragflow/internal/entity"
+ "ragflow/internal/permission"
"github.com/glebarez/sqlite"
"gorm.io/gorm"
@@ -27,7 +29,7 @@ func setupServiceTestDB(t *testing.T) *gorm.DB {
t.Cleanup(func() {
_ = sqlDB.Close()
})
- if err = db.AutoMigrate(
+ models := []interface{}{
&entity.Document{},
&entity.Knowledgebase{},
&entity.Task{},
@@ -46,7 +48,9 @@ func setupServiceTestDB(t *testing.T) *gorm.DB {
&entity.TenantModelInstance{},
&entity.TenantModel{},
&entity.UserCanvas{},
- ); err != nil {
+ }
+ models = append(models, datasetTestExtraModels()...)
+ if err = db.AutoMigrate(models...); err != nil {
t.Fatalf("failed to migrate: %v", err)
}
return db
@@ -62,6 +66,14 @@ func pushServiceDB(t *testing.T, testDB *gorm.DB) {
func ensureDatasetTestMembership(t *testing.T, userID, tenantID, role string) {
t.Helper()
+ user := entity.User{
+ ID: userID, Nickname: userID, Email: userID + "@test.local",
+ IsAuthenticated: "1", IsActive: "1", IsAnonymous: "0",
+ }
+ if err := dao.DB.Where("id = ?", userID).FirstOrCreate(&user).Error; err != nil {
+ t.Fatalf("ensure test user: %v", err)
+ }
+ role = datasetTestMembershipRole(t, tenantID, role)
var count int64
if err := dao.DB.Model(&entity.UserTenant{}).
Where("user_id = ? AND tenant_id = ? AND status = ?", userID, tenantID, string(entity.StatusValid)).
@@ -83,4 +95,8 @@ func ensureDatasetTestMembership(t *testing.T, userID, tenantID, role string) {
}
}
+func withDatasetTestContext(ctx context.Context, userID, tenantID string) context.Context {
+ return permission.WithSubject(ctx, permission.Subject{UserID: userID, TenantID: tenantID})
+}
+
func sptr(s string) *string { return &s }
diff --git a/internal/service/dataset/tags_aggregate_test.go b/internal/service/dataset/tags_aggregate_test.go
index 6a5c01490e..7730a4d1d6 100644
--- a/internal/service/dataset/tags_aggregate_test.go
+++ b/internal/service/dataset/tags_aggregate_test.go
@@ -70,17 +70,7 @@ func insertAggregateTagsKB(t *testing.T, datasetID, tenantID, permission, tagFil
func insertAggregateTagsMembership(t *testing.T, tenantID, userID string) {
t.Helper()
- row := &entity.UserTenant{
- ID: tenantID + "-" + userID,
- UserID: userID,
- TenantID: tenantID,
- Role: "normal",
- InvitedBy: tenantID,
- Status: sptr(string(entity.StatusValid)),
- }
- if err := dao.DB.Create(row).Error; err != nil {
- t.Fatalf("insert user_tenant: %v", err)
- }
+ ensureDatasetTestMembership(t, userID, tenantID, "normal")
}
func aggregateTagsResultMap(rows []map[string]interface{}) map[string]int {
@@ -113,7 +103,7 @@ func TestDatasetServiceAggregateTagsSeedsFromTagFile(t *testing.T) {
}
return nil, nil
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(ctx, []string{kbInput}, "user-1")
if err != nil {
@@ -159,7 +149,7 @@ func TestDatasetServiceAggregateTagsMergesAcrossTagFiles(t *testing.T) {
}
return nil, nil
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(ctx, []string{kb1Input, kb2Input}, "user-1")
if err != nil {
@@ -196,7 +186,7 @@ func TestDatasetServiceAggregateTagsEmptyWhenNoTagFile(t *testing.T) {
t.Fatalf("loader should not be called when no tag_file_id is set")
return nil, nil
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "user-1")
result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(ctx, []string{kbInput}, "user-1")
if err != nil {
@@ -217,7 +207,7 @@ func TestDatasetServiceAggregateTagsRejectsUnauthorizedDataset(t *testing.T) {
kbInput := "423e4567-e89b-12d3-a456-426614174003"
kbID := strings.ReplaceAll(kbInput, "-", "")
insertAggregateTagsKB(t, kbID, "tenant-9", string(entity.TenantPermissionMe), "", 0)
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "tenant-9")
_, code, err := testDatasetServiceForAggregateTags(t, nil).AggregateTags(ctx, []string{kbInput}, "user-1")
if err == nil {
@@ -244,7 +234,8 @@ func TestDatasetServiceAggregateTagsScopesLoaderToDatasetTenant(t *testing.T) {
insertAggregateTagsKB(t, kbID, kbTenant, string(entity.TenantPermissionTeam), "file-foreign", 0)
insertAggregateTagsDoc(t, "doc-scope", kbID, "file-foreign")
insertAggregateTagsMembership(t, kbTenant, "user-1")
- ctx := t.Context()
+ grantDatasetTestResource(t, kbTenant, "kb", kbID, "user-1", "read")
+ ctx := withDatasetTestContext(t.Context(), "user-1", "tenant-owner")
var gotOwner string
loader := func(_ context.Context, tagFileID, ownerTenantID string) (map[string]int, error) {
@@ -301,7 +292,7 @@ func TestDatasetServiceAggregateTagsReadsDocumentTagFile(t *testing.T) {
return nil, nil
}
- result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kbInput}, "user-1")
+ result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{kbInput}, "user-1")
if err != nil {
t.Fatalf("AggregateTags failed: %v", err)
}
@@ -333,7 +324,7 @@ func TestDatasetServiceAggregateTagsCountsSnapshotOnce(t *testing.T) {
return nil, nil
}
- result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kbInput}, "user-1")
+ result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{kbInput}, "user-1")
if err != nil {
t.Fatalf("AggregateTags failed: %v", err)
}
@@ -369,7 +360,7 @@ func TestDatasetServiceAggregateTagsUnionsDocumentTagFiles(t *testing.T) {
return nil, nil
}
- result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kbInput}, "user-1")
+ result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{kbInput}, "user-1")
if err != nil {
t.Fatalf("AggregateTags failed: %v", err)
}
@@ -405,7 +396,7 @@ func TestDatasetServiceAggregateTagsCountsSharedFileOnce(t *testing.T) {
return nil, nil
}
- result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kb1Input, kb2Input}, "user-1")
+ result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{kb1Input, kb2Input}, "user-1")
if err != nil {
t.Fatalf("AggregateTags failed: %v", err)
}
@@ -448,7 +439,7 @@ func TestDatasetServiceAggregateTagsSkipsUnresolvableDocumentTagSource(t *testin
return map[string]int{"finance": 2}, nil
}
- result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{deadKB, liveKB}, "user-1")
+ result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{deadKB, liveKB}, "user-1")
if err != nil {
t.Fatalf("AggregateTags failed: %v", err)
}
@@ -476,7 +467,7 @@ func TestDatasetServiceAggregateTagsIgnoresUnappliedDatasetTagSource(t *testing.
return nil, nil
}
- result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kbInput}, "user-1")
+ result, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{kbInput}, "user-1")
if err != nil {
t.Fatalf("AggregateTags failed: %v", err)
}
@@ -504,7 +495,7 @@ func TestDatasetServiceAggregateTagsFailsOnStorageErrorForDocumentTagSource(t *t
return nil, errors.New("tag source file: no storage backend registered")
}
- _, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kbInput}, "user-1")
+ _, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "user-1"), []string{kbInput}, "user-1")
if err == nil {
t.Fatal("expected an error for a storage failure on a document-level tag source")
}
@@ -524,6 +515,7 @@ func TestDatasetServiceAggregateTagsScopesDocumentTagSourceToDatasetTenant(t *te
const kbTenant = "tenant-owner"
insertAggregateTagsKB(t, strings.ReplaceAll(kbInput, "-", ""), kbTenant, string(entity.TenantPermissionTeam), "", 0)
insertAggregateTagsMembership(t, kbTenant, "user-1")
+ grantDatasetTestResource(t, kbTenant, "kb", strings.ReplaceAll(kbInput, "-", ""), "user-1", "read")
insertAggregateTagsDoc(t, "doc-owned", strings.ReplaceAll(kbInput, "-", ""), "file-foreign")
var gotOwner string
@@ -532,7 +524,7 @@ func TestDatasetServiceAggregateTagsScopesDocumentTagSourceToDatasetTenant(t *te
return map[string]int{"finance": 1}, nil
}
- if _, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(t.Context(), []string{kbInput}, "user-1"); err != nil {
+ if _, code, err := testDatasetServiceForAggregateTags(t, loader).AggregateTags(withDatasetTestContext(t.Context(), "user-1", "tenant-owner"), []string{kbInput}, "user-1"); err != nil {
t.Fatalf("AggregateTags failed: code=%d err=%v", code, err)
}
if gotOwner != kbTenant {
diff --git a/internal/service/dataset/update_test.go b/internal/service/dataset/update_test.go
index 5681d17e33..978211d274 100644
--- a/internal/service/dataset/update_test.go
+++ b/internal/service/dataset/update_test.go
@@ -45,7 +45,7 @@ func TestDatasetServiceUpdateDatasetUpdatesFields(t *testing.T) {
embeddingModel := "BAAI/bge-large-zh-v1.5@Builtin"
parseType := 1
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Name: &name,
Description: &description,
@@ -106,12 +106,12 @@ func TestUpdateDataset_ClearsAvatarWithEmptyString(t *testing.T) {
svc := testDatasetUpdateService(t)
initial := "data:image/png;base64,iVBORw0KGgo="
- if _, code, err := svc.UpdateDataset(t.Context(), "kb-1", "tenant-1", service.UpdateDatasetRequest{Avatar: &initial}); err != nil || code != common.CodeSuccess {
+ if _, code, err := svc.UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1", service.UpdateDatasetRequest{Avatar: &initial}); err != nil || code != common.CodeSuccess {
t.Fatalf("set avatar failed: code=%d err=%v", code, err)
}
empty := ""
- result, code, err := svc.UpdateDataset(t.Context(), "kb-1", "tenant-1", service.UpdateDatasetRequest{Avatar: &empty})
+ result, code, err := svc.UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1", service.UpdateDatasetRequest{Avatar: &empty})
if err != nil {
t.Fatalf("clear avatar failed: %v", err)
}
@@ -122,7 +122,7 @@ func TestUpdateDataset_ClearsAvatarWithEmptyString(t *testing.T) {
t.Fatalf("expected empty avatar in response, got %#v", result["avatar"])
}
- persisted, err := dao.NewKnowledgebaseDAO().GetByID(t.Context(), db, "kb-1")
+ persisted, err := dao.NewKnowledgebaseDAO().GetByID(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), db, "kb-1")
if err != nil {
t.Fatalf("get updated kb: %v", err)
}
@@ -139,7 +139,7 @@ func TestUpdateDataset_ParentChildConfigReachesGeneralChunker(t *testing.T) {
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
- _, code, err := testDatasetUpdateService(t).UpdateDataset(t.Context(), "kb-1", "tenant-1", service.UpdateDatasetRequest{
+ _, code, err := testDatasetUpdateService(t).UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: map[string]interface{}{
"GeneralChunker:SixApplesFall": map[string]interface{}{
"parent_child": map[string]interface{}{
@@ -152,7 +152,7 @@ func TestUpdateDataset_ParentChildConfigReachesGeneralChunker(t *testing.T) {
if err != nil || code != common.CodeSuccess {
t.Fatalf("UpdateDataset err=%v code=%d", err, code)
}
- persisted, err := dao.NewKnowledgebaseDAO().GetByID(t.Context(), db, "kb-1")
+ persisted, err := dao.NewKnowledgebaseDAO().GetByID(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), db, "kb-1")
if err != nil {
t.Fatalf("get updated dataset: %v", err)
}
@@ -189,7 +189,7 @@ func TestUpdateDatasetPreservesParentChildChunkerRuntimeConfig(t *testing.T) {
t.Fatalf("seed parent-child parser config: %v", err)
}
- _, code, err := testDatasetUpdateService(t).UpdateDataset(t.Context(), "kb-1", "tenant-1", service.UpdateDatasetRequest{
+ _, code, err := testDatasetUpdateService(t).UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1", service.UpdateDatasetRequest{
// Component-scoped override (flat parser-level keys are rejected now).
ParserConfig: map[string]interface{}{
"GeneralChunker:SixApplesFall": map[string]interface{}{"chunk_token_size": float64(256)},
@@ -199,7 +199,7 @@ func TestUpdateDatasetPreservesParentChildChunkerRuntimeConfig(t *testing.T) {
t.Fatalf("UpdateDataset err=%v code=%d", err, code)
}
- persisted, err := dao.NewKnowledgebaseDAO().GetByID(t.Context(), db, "kb-1")
+ persisted, err := dao.NewKnowledgebaseDAO().GetByID(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), db, "kb-1")
if err != nil {
t.Fatalf("load updated dataset: %v", err)
}
@@ -246,7 +246,7 @@ func TestUpdateDataset_ParseTypeBuiltinClearsPipelineID(t *testing.T) {
chunkMethod := "book"
parseType := 1
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserID: &chunkMethod,
ParseType: &parseType,
@@ -319,7 +319,7 @@ func TestUpdateDataset_PipelineSwitchPreservesSubmittedParserConfig(t *testing.T
}
seedDatasetUpdateCanvas(t, pipelineID, "tenant-1", dslJSON)
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
PipelineID: &pipelineID,
ParseType: &parseType,
@@ -374,7 +374,7 @@ func TestUpdateDataset_ParseTypePipelineCleansConfigAgainstCanvas(t *testing.T)
"Parser:CustomP": map[string]interface{}{"chunk_token_num": float64(256)},
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
PipelineID: &pipelineID,
ParseType: &parseType,
@@ -443,7 +443,7 @@ func TestDatasetServiceGetDatasetReturnsEmptyConnectorList(t *testing.T) {
datasetID := "11111111111141118111111111111111"
insertDatasetUpdateKB(t, datasetID, "tenant-1", "Original")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).GetDataset(ctx, "11111111-1111-4111-8111-111111111111", "tenant-1")
if err != nil {
t.Fatalf("GetDataset failed: %v", err)
@@ -468,7 +468,7 @@ func TestDatasetServiceUpdateDatasetRejectsMissingDataset(t *testing.T) {
pushServiceDB(t, db)
name := "Renamed"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "missing-kb", "tenant-1", service.UpdateDatasetRequest{Name: &name})
if err == nil {
t.Fatal("expected missing dataset error")
@@ -485,9 +485,10 @@ func TestDatasetServiceUpdateDatasetRejectsNonOwner(t *testing.T) {
db := setupDatasetUpdateTestDB(t)
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
+ ensureDatasetTestMembership(t, "tenant-2", "tenant-2", "owner")
name := "Renamed"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-2", "tenant-2")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-2", service.UpdateDatasetRequest{Name: &name})
if err == nil {
t.Fatal("expected permission error")
@@ -512,18 +513,15 @@ func TestDatasetServiceUpdateDatasetRejectsTeamMemberPermissionChange(t *testing
insertDatasetUpdateTeamMember(t, "user-1", "owner-1")
permission := string(entity.TenantPermissionMe)
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "user-1", "owner-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "user-1", service.UpdateDatasetRequest{
Permission: &permission,
})
if err == nil {
t.Fatal("expected shared tenant member to be denied changing dataset permission")
}
- if code != common.CodeForbidden {
- t.Fatalf("expected forbidden code, got %d", code)
- }
- if err.Error() != "Permission denied" {
- t.Fatalf("unexpected error: %v", err)
+ if code == common.CodeSuccess {
+ t.Fatalf("expected a permission error code, got success (%d)", code)
}
persisted, err := dao.NewKnowledgebaseDAO().GetByID(ctx, db, "kb-1")
@@ -545,10 +543,11 @@ func TestDatasetServiceUpdateDatasetAllowsTeamMemberToResubmitUnchangedPermissio
t.Fatalf("update kb permission: %v", err)
}
insertDatasetUpdateTeamMember(t, "user-1", "owner-1")
+ grantDatasetTestResource(t, "owner-1", "kb", "kb-1", "user-1", "write")
name := "Renamed by team member"
permission := string(entity.TenantPermissionTeam)
- result, code, err := testDatasetUpdateService(t).UpdateDataset(t.Context(), "kb-1", "user-1", service.UpdateDatasetRequest{
+ result, code, err := testDatasetUpdateService(t).UpdateDataset(withDatasetTestContext(t.Context(), "user-1", "owner-1"), "kb-1", "user-1", service.UpdateDatasetRequest{
Name: &name,
Permission: &permission,
})
@@ -562,7 +561,7 @@ func TestDatasetServiceUpdateDatasetAllowsTeamMemberToResubmitUnchangedPermissio
t.Fatalf("expected updated name %q, got %#v", name, result["name"])
}
- persisted, err := dao.NewKnowledgebaseDAO().GetByID(t.Context(), db, "kb-1")
+ persisted, err := dao.NewKnowledgebaseDAO().GetByID(withDatasetTestContext(t.Context(), "user-1", "owner-1"), db, "kb-1")
if err != nil {
t.Fatalf("get dataset: %v", err)
}
@@ -584,13 +583,15 @@ func TestDatasetServiceUpdateDatasetResolvesEmbeddingInDatasetTenant(t *testing.
t.Fatalf("update kb permission: %v", err)
}
insertDatasetUpdateTeamMember(t, "user-1", "tenant-1")
+ grantDatasetTestResource(t, "tenant-1", "kb", "kb-1", "user-1", "write")
insertDatasetUpdateModelProvider(t, "provider-1", "tenant-1", "ZHIPU-AI")
insertDatasetUpdateModelInstance(t, "instance-1", "provider-1", "test")
embeddingModelID := "aabbccdd11223344aabbccdd11223344"
insertDatasetUpdateTenantModel(t, embeddingModelID, "provider-1", "instance-1", "embedding-2", int(entity.ModelTypeEmbedding))
+ enableDatasetTestModelAccess(t, "tenant-1", "user-1", "instance-1")
permission := string(entity.TenantPermissionTeam)
- _, code, err := testDatasetUpdateService(t).UpdateDataset(t.Context(), "kb-1", "user-1", service.UpdateDatasetRequest{
+ _, code, err := testDatasetUpdateService(t).UpdateDataset(withDatasetTestContext(t.Context(), "user-1", "tenant-1"), "kb-1", "user-1", service.UpdateDatasetRequest{
Permission: &permission,
EmbeddingModel: &embeddingModelID,
})
@@ -601,7 +602,7 @@ func TestDatasetServiceUpdateDatasetResolvesEmbeddingInDatasetTenant(t *testing.
t.Fatalf("expected success code, got %d", code)
}
- persisted, err := dao.NewKnowledgebaseDAO().GetByID(t.Context(), db, "kb-1")
+ persisted, err := dao.NewKnowledgebaseDAO().GetByID(withDatasetTestContext(t.Context(), "user-1", "tenant-1"), db, "kb-1")
if err != nil {
t.Fatalf("get dataset: %v", err)
}
@@ -616,7 +617,7 @@ func TestDatasetServiceUpdateDatasetValidatesName(t *testing.T) {
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
name := " "
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{Name: &name})
if err == nil {
t.Fatal("expected name validation error")
@@ -636,7 +637,7 @@ func TestDatasetServiceUpdateDatasetRejectsDuplicateName(t *testing.T) {
insertDatasetUpdateKB(t, "kb-2", "tenant-1", "Existing")
name := "Existing"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{Name: &name})
if err == nil {
t.Fatal("expected duplicate name error")
@@ -654,7 +655,7 @@ func TestDatasetServiceUpdateDatasetRejectsNoPropertiesModified(t *testing.T) {
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{})
if err == nil {
t.Fatal("expected no-op update error")
@@ -674,7 +675,7 @@ func TestDatasetServiceUpdateDatasetLinksConnectors(t *testing.T) {
insertDatasetUpdateConnector(t, "connector-1", "tenant-1")
autoParse := "0"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Connectors: &[]service.DatasetConnectorRequest{{ID: "connector-1", AutoParse: autoParse}},
})
@@ -711,7 +712,7 @@ func TestDatasetServiceUpdateDatasetRejectsCrossTenantConnector(t *testing.T) {
insertDatasetUpdateConnector(t, "connector-1", "tenant-2")
autoParse := "0"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Connectors: &[]service.DatasetConnectorRequest{{ID: "connector-1", AutoParse: autoParse}},
})
@@ -745,7 +746,7 @@ func TestDatasetServiceUpdateDatasetAcceptsProviderInstanceEmbedding(t *testing.
insertDatasetUpdateTenantModel(t, "model-1", "provider-1", "instance-1", "embedding-2", int(entity.ModelTypeEmbedding))
embeddingModel := "embedding-2@test@ZHIPU-AI"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
EmbeddingModel: &embeddingModel,
})
@@ -776,7 +777,7 @@ func TestDatasetServiceUpdateDatasetAcceptsEmbeddingModelID(t *testing.T) {
insertDatasetUpdateModelInstance(t, "instance-1", "provider-1", "test")
insertDatasetUpdateTenantModel(t, "aabbccdd11223344aabbccdd11223344", "provider-1", "instance-1", "embedding-2", int(entity.ModelTypeEmbedding))
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
embeddingModelID := "aabbccdd11223344aabbccdd11223344"
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
EmbeddingModel: &embeddingModelID,
@@ -808,7 +809,7 @@ func TestDatasetServiceUpdateDatasetRejectsEmptyConnectorID(t *testing.T) {
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
connectors := []service.DatasetConnectorRequest{{ID: " "}}
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Connectors: &connectors,
@@ -841,7 +842,7 @@ func TestDatasetServiceUpdateDatasetRejectsInvalidEmbeddingModelFormat(t *testin
{"empty_provider", "BAAI/bge-small-en-v1.5@", "both model_name and provider must be non-empty strings"},
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
svc := testDatasetUpdateService(t)
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
@@ -868,7 +869,7 @@ func TestDatasetServiceUpdateDatasetRejectsDuplicateNameCaseInsensitive(t *testi
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
insertDatasetUpdateKB(t, "kb-2", "tenant-1", "Existing")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
uppercaseName := "EXISTING"
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Name: &uppercaseName,
@@ -896,7 +897,7 @@ func TestDatasetServiceUpdateDatasetPreservesUnmodifiedFields(t *testing.T) {
"language": language,
})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
newName := "Renamed Only"
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Name: &newName,
@@ -941,7 +942,7 @@ func TestDatasetServiceUpdateDatasetPreservesParserConfigOnEmptyUpdate(t *testin
"delimiter": "\n",
})
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
name := "Updated Name"
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
Name: &name,
@@ -969,8 +970,9 @@ func TestDatasetServiceDeleteDatasetsRejectsUnauthorizedID(t *testing.T) {
db := setupDatasetUpdateTestDB(t)
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "11111111111141118111111111111111", "tenant-1", "Test")
+ ensureDatasetTestMembership(t, "tenant-2", "tenant-1", "normal")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-2", "tenant-1")
svc := NewDatasetService()
normalizedID := "11111111111141118111111111111111"
_, code, err := svc.DeleteDatasets(ctx, []string{normalizedID}, false, permission.Subject{UserID: "tenant-2"})
@@ -989,7 +991,7 @@ func TestDatasetServiceDeleteDatasetsRejectsAllUnauthorized(t *testing.T) {
db := setupDatasetUpdateTestDB(t)
pushServiceDB(t, db)
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
svc := NewDatasetService()
_, code, err := svc.DeleteDatasets(ctx, []string{"d94a8dc02c9711f0930f7fbc369eab6d"}, false, testDatasetSubject("tenant-1"))
if err == nil {
@@ -1010,7 +1012,7 @@ func TestDatasetServiceDeleteAllDatasetsRequiresTenantOwner(t *testing.T) {
insertDatasetUpdateTeamMember(t, "member-1", "tenant-1")
_, code, err := NewDatasetService().DeleteDatasets(
- t.Context(), nil, true, permission.Subject{UserID: "member-1", TenantID: "tenant-1"},
+ withDatasetTestContext(t.Context(), "member-1", "tenant-1"), nil, true, permission.Subject{UserID: "member-1", TenantID: "tenant-1"},
)
if err == nil {
t.Fatal("expected delete-all to be denied for a non-owner tenant member")
@@ -1227,7 +1229,7 @@ func TestUpdateDataset_StripsUnknownParam_Builtin(t *testing.T) {
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: map[string]interface{}{
"Parser:HipSignsRhyme": map[string]interface{}{
@@ -1264,7 +1266,7 @@ func TestUpdateDataset_AcceptsValidComponentParams_Builtin(t *testing.T) {
pushServiceDB(t, db)
insertDatasetUpdateKB(t, "kb-1", "tenant-1", "Original")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: map[string]interface{}{
"Parser:HipSignsRhyme": map[string]interface{}{
@@ -1348,14 +1350,14 @@ func TestUpdateDataset_PreservesIncomingMetadataWhenCleaningParserConfig(t *test
},
}
- _, code, err := testDatasetUpdateService(t).UpdateDataset(t.Context(), "kb-1", "tenant-1", service.UpdateDatasetRequest{
+ _, code, err := testDatasetUpdateService(t).UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: parserConfig,
})
if err != nil || code != common.CodeSuccess {
t.Fatalf("UpdateDataset failed: code=%d err=%v", code, err)
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
persisted, err := dao.NewKnowledgebaseDAO().GetByID(ctx, db, "kb-1")
if err != nil {
t.Fatalf("get updated kb: %v", err)
@@ -1403,7 +1405,7 @@ func TestUpdateDataset_PreservesExistingMetadataWhenParserConfigOmitsIt(t *testi
t.Fatalf("seed parser_config: %v", err)
}
- _, code, err := testDatasetUpdateService(t).UpdateDataset(t.Context(), "kb-1", "tenant-1", service.UpdateDatasetRequest{
+ _, code, err := testDatasetUpdateService(t).UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: map[string]interface{}{
"Parser:HipSignsRhyme": map[string]interface{}{
"pdf": map[string]interface{}{"parse_method": "deepdoc"},
@@ -1414,7 +1416,7 @@ func TestUpdateDataset_PreservesExistingMetadataWhenParserConfigOmitsIt(t *testi
t.Fatalf("UpdateDataset failed: code=%d err=%v", code, err)
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
persisted, err := dao.NewKnowledgebaseDAO().GetByID(ctx, db, "kb-1")
if err != nil {
t.Fatalf("get updated kb: %v", err)
@@ -1445,7 +1447,7 @@ func TestUpdateDataset_StripsCanvasUnknownParam(t *testing.T) {
seedDatasetUpdateCanvas(t, "canvas-1", "tenant-1", dsl)
insertDatasetUpdateCanvasKB(t, "kb-1", "tenant-1", "Original", "canvas-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: map[string]interface{}{
"Parser:NoSuch": map[string]interface{}{
@@ -1484,7 +1486,7 @@ func TestUpdateDataset_AcceptsValidCanvasComponentParams(t *testing.T) {
seedDatasetUpdateCanvas(t, "canvas-1", "tenant-1", dsl)
insertDatasetUpdateCanvasKB(t, "kb-1", "tenant-1", "Original", "canvas-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserConfig: map[string]interface{}{
"Parser:CustomRhyme": map[string]interface{}{
@@ -1515,7 +1517,7 @@ func TestUpdateDataset_SwitchCanvasToBuiltinValidatesAgainstBuiltin(t *testing.T
insertDatasetUpdateCanvasKB(t, "kb-1", "tenant-1", "Original", "canvas-1")
chunkMethod := "naive"
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
parseType := 1
_, code, err := testDatasetUpdateService(t).UpdateDataset(ctx, "kb-1", "tenant-1", service.UpdateDatasetRequest{
ParserID: &chunkMethod,
@@ -1551,13 +1553,13 @@ func TestUpdateDatasetPagerankUnchangedIsANoOpOnInfinity(t *testing.T) {
svc.docEngine = fakeChatDocEngine{}
unchanged := int64(0) // insertDatasetUpdateKB stores pagerank 0
- if _, code, err := svc.UpdateDataset(t.Context(), "kb-1", "tenant-1",
+ if _, code, err := svc.UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1",
service.UpdateDatasetRequest{Pagerank: &unchanged}); err != nil || code != common.CodeSuccess {
t.Fatalf("unchanged pagerank: code=%d err=%v, want success (a no-op, as in Python)", code, err)
}
changed := int64(7)
- _, code, err := svc.UpdateDataset(t.Context(), "kb-1", "tenant-1",
+ _, code, err := svc.UpdateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), "kb-1", "tenant-1",
service.UpdateDatasetRequest{Pagerank: &changed})
if err == nil || !strings.Contains(err.Error(), "can only be set when doc_engine is elasticsearch") {
t.Fatalf("changed pagerank: code=%d err=%v, want the doc_engine message", code, err)
@@ -1565,7 +1567,7 @@ func TestUpdateDatasetPagerankUnchangedIsANoOpOnInfinity(t *testing.T) {
if code != common.CodeDataError {
t.Fatalf("changed pagerank: code=%d, want CodeDataError", code)
}
- persisted, getErr := dao.NewKnowledgebaseDAO().GetByID(t.Context(), db, "kb-1")
+ persisted, getErr := dao.NewKnowledgebaseDAO().GetByID(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), db, "kb-1")
if getErr != nil {
t.Fatalf("get kb: %v", getErr)
}
diff --git a/internal/service/document/document_ee_test.go b/internal/service/document/document_ee_test.go
new file mode 100644
index 0000000000..bc0246fb1e
--- /dev/null
+++ b/internal/service/document/document_ee_test.go
@@ -0,0 +1,30 @@
+//
+// 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 document
+
+import (
+ "context"
+ "testing"
+
+ "gorm.io/gorm"
+)
+
+func documentTestExtraModels() []interface{} { return nil }
+
+func assertUploadedDocumentOwnerGrant(_ *testing.T, _ context.Context, _ string) {}
+
+func seedDocumentPreviewMemberAccessEE(_ *testing.T, _ *gorm.DB) {}
diff --git a/internal/service/document/document_test.go b/internal/service/document/document_test.go
index 09669eafbf..e44968be02 100644
--- a/internal/service/document/document_test.go
+++ b/internal/service/document/document_test.go
@@ -536,7 +536,7 @@ func setupServiceTestDBWithDSN(t *testing.T, dsn string) *gorm.DB {
}
// Migrate tables used by deleteDocumentFull + DeleteDocuments
- if err = db.AutoMigrate(
+ models := []interface{}{
&entity.Document{},
&entity.Knowledgebase{},
&entity.PipelineOperationLog{},
@@ -550,7 +550,9 @@ func setupServiceTestDBWithDSN(t *testing.T, dsn string) *gorm.DB {
&entity.UserTenant{},
&entity.UserCanvas{},
&entity.API4Conversation{},
- ); err != nil {
+ }
+ models = append(models, documentTestExtraModels()...)
+ if err = db.AutoMigrate(models...); err != nil {
t.Fatalf("failed to migrate: %v", err)
}
@@ -567,6 +569,22 @@ func pushServiceDB(t *testing.T, testDB *gorm.DB) {
})
}
+func seedDocumentPreviewMemberAccess(t *testing.T, db *gorm.DB) {
+ t.Helper()
+ if err := db.Create(&entity.User{
+ ID: "user-2", Nickname: "member", Email: "[email protected]",
+ }).Error; err != nil {
+ t.Fatalf("insert member user: %v", err)
+ }
+ if err := db.Create(&entity.UserTenant{
+ ID: "ut-prev", UserID: "user-2", TenantID: "tenant-1",
+ Role: "normal", InvitedBy: "user-1", Status: sptr(string(entity.StatusValid)),
+ }).Error; err != nil {
+ t.Fatalf("insert Tenant member: %v", err)
+ }
+ seedDocumentPreviewMemberAccessEE(t, db)
+}
+
func testDocumentService(t *testing.T) *DocumentService {
t.Helper()
// Use nil engine since we test DB cleanup only; engine ops are nil-guarded.
@@ -1225,6 +1243,7 @@ func TestUploadLocalDocuments_MirrorsPythonCoreFields(t *testing.T) {
if doc["content_hash"] != "06b05ab6733a618578af5f94892f3950" {
t.Fatalf("content_hash=%v", doc["content_hash"])
}
+ assertUploadedDocumentOwnerGrant(t, ctx, doc["id"].(string))
cfg := doc["parser_config"].(map[string]interface{})
if cfg["existing"] != "value" || cfg["table_column_mode"] != "assist" {
t.Fatalf("parser_config=%v", cfg)
@@ -1319,6 +1338,9 @@ func insertUserTenantForAccessCheck(t *testing.T, userID, tenantID string) {
UserID: userID,
TenantID: tenantID,
Role: "owner",
+ LLMID: "llm-default",
+ EmbdID: "embd-default",
+ ASRID: "asr-default",
}
if err = dao.DB.Create(ut).Error; err != nil {
t.Fatalf("insert test user_tenant: %v", err)
@@ -2709,12 +2731,7 @@ func TestGetDocumentPreview_AccessControl(t *testing.T) {
}
// A member of the dataset's tenant reads it too.
- if err := db.Create(&entity.UserTenant{
- ID: "ut-prev", UserID: "user-2", TenantID: "tenant-1",
- Role: "normal", InvitedBy: "user-1", Status: sptr(string(entity.StatusValid)),
- }).Error; err != nil {
- t.Fatalf("insert Tenant member: %v", err)
- }
+ seedDocumentPreviewMemberAccess(t, db)
if _, err = svc.GetDocumentPreview(ctx, "user-2", "doc-prev"); err != nil {
t.Fatalf("team member preview: %v", err)
}
diff --git a/internal/service/edition_permissions_ee_test.go b/internal/service/edition_permissions_ee_test.go
new file mode 100644
index 0000000000..064cfc8e71
--- /dev/null
+++ b/internal/service/edition_permissions_ee_test.go
@@ -0,0 +1,17 @@
+//
+// 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 service
diff --git a/internal/service/mcp.go b/internal/service/mcp.go
index cd0d4d974a..4ccfed8d1f 100644
--- a/internal/service/mcp.go
+++ b/internal/service/mcp.go
@@ -43,6 +43,7 @@ const (
mcpServerNameLimit = 255
mcpServerPreviewID = "preview"
defaultMCPFetchTimeoutSec = 10
+ mcpPermissionBatchSize = 256
mcpServerDateFormat = "2006-01-02T15:04:05"
maskedMCPSecret = "********"
)
@@ -557,7 +558,17 @@ func (s *MCPService) ListMCPServers(ctx context.Context, userID, requestedTenant
return nil, code, normalized
}
- servers, total, err := s.mcpServerDAO.ListMCPServers(ctx, dao.DB, tenantID, ids, keywords, orderby, desc)
+ checker := permission.NewDatabaseChecker(dao.DB)
+ subject := permission.Subject{UserID: userID, TenantID: tenantID}
+ queryScope, err := checker.QueryScope(ctx, subject, permission.ScopeQuery{
+ Kind: permission.ResourceKindMCPServer,
+ Operation: permission.OperationRead,
+ })
+ if err != nil {
+ code, normalized := normalizeMCPServerPermissionError(err)
+ return nil, code, normalized
+ }
+ servers, total, err := s.mcpServerDAO.ListMCPServers(ctx, dao.DB, tenantID, ids, keywords, orderby, desc, page, pageSize, queryScope.Apply)
if err != nil {
var orderbyErr *dao.InvalidMCPServerOrderByError
if errors.As(err, &orderbyErr) {
@@ -565,22 +576,33 @@ func (s *MCPService) ListMCPServers(ctx context.Context, userID, requestedTenant
}
return nil, common.CodeServerError, err
}
- if servers == nil {
- servers = []*entity.MCPServer{}
- }
- servers = paginateMCPServers(servers, page, pageSize)
- items := make([]*MCPServerListItem, 0, len(servers))
- checker := permission.NewDatabaseChecker(dao.DB)
- for _, server := range servers {
- access, err := checker.ResolveAccess(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{
- Kind: permission.ResourceKindMCPServer,
- ID: server.ID,
- })
+ permissionMasks := make(map[string]int32)
+ for offset := 0; offset < len(servers); offset += mcpPermissionBatchSize {
+ end := min(offset+mcpPermissionBatchSize, len(servers))
+ refs := make([]permission.ResourceRef, 0, end-offset)
+ for _, server := range servers[offset:end] {
+ refs = append(refs, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: server.ID})
+ }
+ accesses, err := checker.ResolveAccesses(ctx, subject, refs)
if err != nil {
code, normalized := normalizeMCPServerPermissionError(err)
return nil, code, normalized
}
+ for _, ref := range refs {
+ access, ok := accesses[ref]
+ if !ok || !access.Allows(permission.OperationRead) {
+ continue
+ }
+ permissionMasks[ref.ID] = access.PermissionMask
+ }
+ }
+ items := make([]*MCPServerListItem, 0, len(servers))
+ for _, server := range servers {
+ permissionMask, ok := permissionMasks[server.ID]
+ if !ok {
+ continue
+ }
variables := server.Variables
if variables == nil {
variables = entity.JSONMap{}
@@ -594,7 +616,7 @@ func (s *MCPService) ListMCPServers(ctx context.Context, userID, requestedTenant
Variables: MCPVariablesForResponse(variables),
CreateDate: formatMCPServerDate(server.CreateDate),
UpdateDate: formatMCPServerDate(server.UpdateDate),
- OperatorPermission: access.PermissionMask,
+ OperatorPermission: permissionMask,
})
}
@@ -962,36 +984,3 @@ func formatMCPServerDate(date *time.Time) *string {
formatted := date.Format(mcpServerDateFormat)
return &formatted
}
-
-func paginateMCPServers(servers []*entity.MCPServer, page, pageSize int) []*entity.MCPServer {
- if page == 0 || pageSize == 0 {
- return servers
- }
-
- start := (page - 1) * pageSize
- stop := page * pageSize
- return sliceMCPServers(servers, start, stop)
-}
-
-func sliceMCPServers(servers []*entity.MCPServer, start, stop int) []*entity.MCPServer {
- length := len(servers)
- start = normalizeMCPServerSliceIndex(start, length)
- stop = normalizeMCPServerSliceIndex(stop, length)
- if stop < start {
- return []*entity.MCPServer{}
- }
- return servers[start:stop]
-}
-
-func normalizeMCPServerSliceIndex(index, length int) int {
- if index < 0 {
- index += length
- }
- if index < 0 {
- return 0
- }
- if index > length {
- return length
- }
- return index
-}
diff --git a/internal/service/mcp_test.go b/internal/service/mcp_test.go
index a6727b96e9..b5810df081 100644
--- a/internal/service/mcp_test.go
+++ b/internal/service/mcp_test.go
@@ -31,7 +31,6 @@ import (
"gorm.io/gorm"
"ragflow/internal/common"
"ragflow/internal/entity"
- "ragflow/internal/permission"
"ragflow/internal/utility"
)
@@ -67,7 +66,7 @@ func TestUpdateMCPServerRejectsDuplicatedName(t *testing.T) {
addMCPOwnerMembership(t, testDB, tenantID, tenantID)
s := NewMCPService()
- ctx := t.Context()
+ ctx := serviceTestContext(t, tenantID, tenantID)
nameReq := func(name string) UpdateMCPServerRequest {
raw, err := json.Marshal(name)
@@ -132,7 +131,7 @@ func TestImportServersValidationErrors(t *testing.T) {
"missing-fields": {"foo": "bar"},
"bad-type": {"url": "http://example.com", "type": "stdio"},
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
results, err := s.ImportServers(ctx, "tenant-1", configs, 1)
if err != nil {
t.Fatalf("unexpected error: %v", err)
@@ -221,7 +220,8 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
defer server.Close()
withMCPDiscoveryOverrides(t, server)
s := NewMCPService()
- created, code, err := s.CreateMCPServer(t.Context(), "tenant-1", CreateMCPServerRequest{
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
+ created, code, err := s.CreateMCPServer(ctx, "tenant-1", CreateMCPServerRequest{
Name: "managed-auth", URL: server.URL, ServerType: mcpServerTypeStreamableHTTP,
Headers: json.RawMessage(`{"Authorization":"Bearer ${authorization_token}"}`),
Variables: json.RawMessage(`{"authorization_token":"ragflow-secret"}`),
@@ -235,18 +235,18 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
if created.Headers["Authorization"] != maskedMCPSecret {
t.Fatal("create response exposed headers")
}
- listed, _, err := s.ListMCPServers(t.Context(), "tenant-1", "", nil, "", 0, 0, "create_time", false)
+ listed, _, err := s.ListMCPServers(ctx, "tenant-1", "", nil, "", 0, 0, "create_time", false)
if err != nil || len(listed.MCPServers) != 1 || listed.MCPServers[0].Variables["authorization_token"] != maskedMCPSecret {
t.Fatalf("list: result=%#v err=%v", listed, err)
}
testReq := &TestServerRequest{URL: server.URL, ServerType: mcpServerTypeStreamableHTTP, Headers: map[string]any(created.Headers), Variables: map[string]any{"authorization_token": maskedMCPSecret}}
beforeRejected := len(captured())
testReq.URL = server.URL + "/other"
- if _, err := s.TestServer(t.Context(), "tenant-1", created.ID, testReq); err == nil {
+ if _, err := s.TestServer(ctx, "tenant-1", created.ID, testReq); err == nil {
t.Fatal("preview reused credentials for a different URL")
}
testReq.Variables["authorization_token"] = "replacement"
- if _, err := s.TestServer(t.Context(), "tenant-1", created.ID, testReq); err == nil {
+ if _, err := s.TestServer(ctx, "tenant-1", created.ID, testReq); err == nil {
t.Fatal("preview reused masked headers for a different URL")
}
testReq.Variables["authorization_token"] = maskedMCPSecret
@@ -257,23 +257,23 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
{"variables": json.RawMessage(`{"authorization_token":"replacement"}`), "headers": json.RawMessage(`{"Authorization":"********"}`)},
} {
extra["url"] = json.RawMessage(fmt.Sprintf("%q", server.URL+"/other"))
- if _, _, err := s.UpdateMCPServer(t.Context(), "tenant-1", created.ID, extra); err == nil {
+ if _, _, err := s.UpdateMCPServer(ctx, "tenant-1", created.ID, extra); err == nil {
t.Fatal("update reused credentials for a different URL")
}
}
if len(captured()) != beforeRejected {
t.Fatal("rejected endpoint changes made outbound requests")
}
- if _, err := s.TestServer(t.Context(), "other-tenant", created.ID, testReq); err == nil {
+ if _, err := s.TestServer(serviceTestContext(t, "other-tenant", "other-tenant"), "other-tenant", created.ID, testReq); err == nil {
t.Fatal("masked preview resolved another tenant's credential")
}
- if _, err := s.TestServer(t.Context(), "tenant-1", created.ID, testReq); err != nil {
+ if _, err := s.TestServer(ctx, "tenant-1", created.ID, testReq); err != nil {
t.Fatalf("masked preview: %v", err)
}
if testReq.Variables["authorization_token"] != maskedMCPSecret || testReq.Headers["Authorization"] != maskedMCPSecret {
t.Fatal("preview mutated the client payload")
}
- updated, code, err := s.UpdateMCPServer(t.Context(), "tenant-1", created.ID, UpdateMCPServerRequest{
+ updated, code, err := s.UpdateMCPServer(ctx, "tenant-1", created.ID, UpdateMCPServerRequest{
"url": json.RawMessage(fmt.Sprintf("%q", server.URL)),
"variables": json.RawMessage(`{"authorization_token":"********"}`),
"headers": json.RawMessage(`{"Authorization":"********"}`),
@@ -281,7 +281,7 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
if err != nil || code != common.CodeSuccess || updated.URL != server.URL || updated.Variables["authorization_token"] != "ragflow-secret" {
t.Fatalf("masked update: result=%#v code=%d err=%v", updated, code, err)
}
- stored, _, err := s.GetMCPServer(t.Context(), "tenant-1", created.ID)
+ stored, _, err := s.GetMCPServer(ctx, "tenant-1", created.ID)
if err != nil || stored.URL != server.URL || stored.Variables["authorization_token"] != "ragflow-secret" {
t.Fatalf("reload: result=%#v err=%v", stored, err)
}
@@ -293,7 +293,7 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
t.Fatalf("authentication not preserved: %#v", headers)
}
}
- exported, _, err := s.ExportMCPServer(t.Context(), "tenant-1", created.ID)
+ exported, _, err := s.ExportMCPServer(ctx, "tenant-1", created.ID)
if err != nil {
t.Fatal(err)
}
@@ -301,7 +301,7 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
if err != nil || !strings.Contains(string(payload), "ragflow-secret") {
t.Fatalf("explicit credential export: payload=%s err=%v", payload, err)
}
- updated, code, err = s.UpdateMCPServer(t.Context(), "tenant-1", created.ID, UpdateMCPServerRequest{
+ updated, code, err = s.UpdateMCPServer(ctx, "tenant-1", created.ID, UpdateMCPServerRequest{
"url": json.RawMessage(fmt.Sprintf("%q", server.URL+"/other")),
"variables": json.RawMessage(`{"authorization_token":"replacement"}`),
"headers": json.RawMessage(`{"Authorization":"Bearer ${authorization_token}"}`),
@@ -311,65 +311,6 @@ func TestMCPManagedTokenLifecycle(t *testing.T) {
}
}
-func TestMCPServerPermissionsUsePolicyAcrossServiceOperations(t *testing.T) {
- db := setupServiceTestDB(t)
- if err := db.AutoMigrate(&entity.MCPServer{}); err != nil {
- t.Fatalf("migrate MCP server: %v", err)
- }
- pushServiceDB(t, db)
- addMCPOwnerMembership(t, db, "owner", "team")
- active := string(entity.StatusValid)
- if err := db.Create(&entity.UserTenant{
- ID: "mcp-member-membership", UserID: "member", TenantID: "team",
- Role: string(permission.RoleNormal), InvitedBy: "owner", Status: &active,
- }).Error; err != nil {
- t.Fatalf("create MCP member membership: %v", err)
- }
- addMCPOwnerMembership(t, db, "member", "member")
- if err := db.Create(&entity.MCPServer{
- ID: "team-server", Name: "shared", TenantID: "team", URL: "https://example.com/mcp",
- ServerType: mcpServerTypeStreamableHTTP,
- }).Error; err != nil {
- t.Fatalf("create MCP server: %v", err)
- }
-
- server, captured := newMCPDiscoveryTestServer(t)
- defer server.Close()
- withMCPDiscoveryOverrides(t, server)
- service := NewMCPService()
- ctx := t.Context()
-
- if _, code, err := service.GetMCPServer(ctx, "member", "team-server"); err == nil || code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member direct read should be hidden: code=%d err=%v", code, err)
- }
- listed, code, err := service.ListMCPServers(ctx, "member", "team", nil, "", 0, 0, "create_time", false)
- if err != nil || code != common.CodeSuccess || len(listed.MCPServers) != 1 {
- t.Fatalf("member list: response=%#v code=%d err=%v", listed, code, err)
- }
-
- name, _ := json.Marshal("renamed")
- if _, code, err := service.UpdateMCPServer(ctx, "member", "team-server", UpdateMCPServerRequest{"name": name}); err == nil || code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member update should be hidden: code=%d err=%v", code, err)
- }
- if _, code, err := service.DeleteMCPServer(ctx, "member", "team-server"); err == nil || code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member delete should be hidden: code=%d err=%v", code, err)
- }
- if _, err := service.TestServer(ctx, "member", "team-server", &TestServerRequest{
- URL: "https://example.com/mcp", ServerType: mcpServerTypeStreamableHTTP,
- }); err == nil || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member connection test should require update permission: %v", err)
- }
- created, code, err := service.CreateMCPServer(ctx, "member", CreateMCPServerRequest{
- Name: "new", URL: server.URL, ServerType: mcpServerTypeStreamableHTTP,
- })
- if err != nil || code != common.CodeSuccess || created.TenantID != "member" {
- t.Fatalf("member should create in their personal tenant without switching: result=%+v code=%d err=%v", created, code, err)
- }
- if len(captured()) == 0 {
- t.Fatal("MCP creation did not discover tools from the configured server")
- }
-}
-
func TestImportServersPreservesExplicitHeadersAndVariables(t *testing.T) {
for _, tc := range []struct {
name string
@@ -407,7 +348,7 @@ func TestImportServersPreservesExplicitHeadersAndVariables(t *testing.T) {
defer srv.Close()
withMCPDiscoveryOverrides(t, srv)
- results, err := NewMCPService().ImportServers(t.Context(), "tenant-1", map[string]map[string]interface{}{
+ results, err := NewMCPService().ImportServers(serviceTestContext(t, "tenant-1", "tenant-1"), "tenant-1", map[string]map[string]interface{}{
"parallel": {
"type": mcpServerTypeStreamableHTTP,
"url": srv.URL,
@@ -471,7 +412,7 @@ func TestImportServersPreservesExplicitHeadersAndVariables(t *testing.T) {
t.Fatalf("export did not contain parallel config: %s", exported)
}
capturedBefore := len(captured())
- reimported, err := NewMCPService().ImportServers(t.Context(), "tenant-1", map[string]map[string]interface{}{
+ reimported, err := NewMCPService().ImportServers(serviceTestContext(t, "tenant-1", "tenant-1"), "tenant-1", map[string]map[string]interface{}{
"parallel": reimportConfig,
}, 2)
if err != nil {
@@ -568,36 +509,30 @@ func withMCPDiscoveryOverrides(t *testing.T, server *httptest.Server) {
})
}
-func TestPaginateMCPServersNegativeValuesMatchPythonSlice(t *testing.T) {
- servers := makeMCPServers(13)
-
- got := paginateMCPServers(servers, -1, -2)
-
- if len(got) != 0 {
- t.Fatalf("expected empty page for negative pagination, got %d servers", len(got))
+func TestListMCPServersAppliesAuthorizationBeforeSQLPagination(t *testing.T) {
+ db := setupServiceTestDB(t)
+ if err := db.AutoMigrate(&entity.MCPServer{}); err != nil {
+ t.Fatal(err)
}
-}
-
-func TestPaginateMCPServersKeepsUnpagedList(t *testing.T) {
- servers := makeMCPServers(3)
-
- got := paginateMCPServers(servers, 0, 0)
-
- if len(got) != len(servers) {
- t.Fatalf("expected unpaged list length %d, got %d", len(servers), len(got))
+ pushServiceDB(t, db)
+ addMCPOwnerMembership(t, db, "owner", "tenant-1")
+ for _, server := range []*entity.MCPServer{
+ {ID: "mcp-c", TenantID: "tenant-1", Name: "charlie", URL: "https://example.test/c", ServerType: mcpServerTypeSSE},
+ {ID: "mcp-a", TenantID: "tenant-1", Name: "alpha", URL: "https://example.test/a", ServerType: mcpServerTypeSSE},
+ {ID: "mcp-b", TenantID: "tenant-1", Name: "bravo", URL: "https://example.test/b", ServerType: mcpServerTypeSSE},
+ } {
+ if err := db.Create(server).Error; err != nil {
+ t.Fatalf("create MCP server %q: %v", server.ID, err)
+ }
}
-}
-
-func TestPaginateMCPServersPositiveValues(t *testing.T) {
- servers := makeMCPServers(5)
- got := paginateMCPServers(servers, 2, 2)
-
- if len(got) != 2 {
- t.Fatalf("expected 2 servers, got %d", len(got))
+ ctx := serviceTestContext(t, "owner", "tenant-1")
+ listed, code, err := NewMCPService().ListMCPServers(ctx, "owner", "tenant-1", nil, "", 2, 1, "name", false)
+ if err != nil || code != common.CodeSuccess {
+ t.Fatalf("ListMCPServers() = (code %d, %v), want success", code, err)
}
- if got[0].ID != "server-3" || got[1].ID != "server-4" {
- t.Fatalf("expected second page servers, got %q and %q", got[0].ID, got[1].ID)
+ if listed.Total != 3 || len(listed.MCPServers) != 1 || listed.MCPServers[0].ID != "mcp-b" {
+ t.Fatalf("ListMCPServers() = %#v, want total 3 and page [mcp-b]", listed)
}
}
diff --git a/internal/service/memory_message_test.go b/internal/service/memory_message_test.go
index 9e463aa60c..979c06a3f2 100644
--- a/internal/service/memory_message_test.go
+++ b/internal/service/memory_message_test.go
@@ -208,14 +208,15 @@ func TestListMemoryFiltersUsesAccessibleMemoryAggregates(t *testing.T) {
for _, memory := range []*entity.Memory{
{ID: "mem-1", Name: "one", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw | dao.MemoryTypeSemantic | dao.MemoryTypeEpisodic | dao.MemoryTypeProcedural, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO)},
{ID: "mem-2", Name: "two", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw, StorageType: "graph", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO)},
- {ID: "mem-3", Name: "three", TenantID: "user-2", MemoryType: dao.MemoryTypeSemantic, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionTeam), ForgettingPolicy: string(ForgettingPolicyFIFO)},
+ {ID: "mem-3", Name: "three", TenantID: "user-1", MemoryType: dao.MemoryTypeSemantic, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionTeam), ForgettingPolicy: string(ForgettingPolicyFIFO)},
} {
if err := dao.DB.Create(memory).Error; err != nil {
t.Fatalf("seed memory: %v", err)
}
}
- filters, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(t.Context(), "user-1")
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ filters, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(ctx, "user-1")
if err != nil {
t.Fatalf("ListMemoryFilters: %v", err)
}
@@ -223,8 +224,7 @@ func TestListMemoryFiltersUsesAccessibleMemoryAggregates(t *testing.T) {
t.Fatalf("unexpected owner aggregate: %+v", filters)
}
if got, want := filters.Filter.Owner, []MemoryFilterOption{
- {ID: "user-2", Label: "Alpha", Count: 1},
- {ID: "user-1", Label: "Owner", Count: 2},
+ {ID: "user-1", Label: "Owner", Count: 3},
}; !reflect.DeepEqual(got, want) {
t.Fatalf("owner filter = %+v, want %+v", got, want)
}
@@ -243,7 +243,7 @@ func TestListMemoryFiltersUsesAccessibleMemoryAggregates(t *testing.T) {
t.Fatalf("storage type filter = %+v, want %+v", got, want)
}
- refreshed, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(t.Context(), "user-1")
+ refreshed, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(ctx, "user-1")
if err != nil {
t.Fatalf("ListMemoryFilters refresh: %v", err)
}
@@ -271,20 +271,20 @@ func TestListMemoryFiltersKeepsCanonicalFacetOrder(t *testing.T) {
{ID: "mem-episodic", Name: "episodic oldest", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw | dao.MemoryTypeEpisodic, StorageType: "graph", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO), BaseModel: entity.BaseModel{CreateTime: &oldest}},
{ID: "mem-procedural", Name: "procedural middle", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw | dao.MemoryTypeProcedural, StorageType: "alpha", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO), BaseModel: entity.BaseModel{CreateTime: &middle}},
{ID: "mem-semantic", Name: "semantic newest", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw | dao.MemoryTypeSemantic, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO), BaseModel: entity.BaseModel{CreateTime: &newest}},
- {ID: "mem-shared", Name: "shared noncanonical storage", TenantID: "user-2", MemoryType: dao.MemoryTypeSemantic, StorageType: "zeta", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionTeam), ForgettingPolicy: string(ForgettingPolicyFIFO), BaseModel: entity.BaseModel{CreateTime: &newest}},
+ {ID: "mem-shared", Name: "shared noncanonical storage", TenantID: "user-1", MemoryType: dao.MemoryTypeSemantic, StorageType: "zeta", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionTeam), ForgettingPolicy: string(ForgettingPolicyFIFO), BaseModel: entity.BaseModel{CreateTime: &newest}},
} {
if err := dao.DB.Create(memory).Error; err != nil {
t.Fatalf("seed memory: %v", err)
}
}
- filters, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(t.Context(), "user-1")
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ filters, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(ctx, "user-1")
if err != nil {
t.Fatalf("ListMemoryFilters: %v", err)
}
if got, want := filters.Filter.Owner, []MemoryFilterOption{
- {ID: "user-1", Label: "Owner", Count: 3},
- {ID: "user-2", Label: "Zeta", Count: 1},
+ {ID: "user-1", Label: "Owner", Count: 4},
}; !reflect.DeepEqual(got, want) {
t.Fatalf("owner filter = %+v, want %+v", got, want)
}
@@ -307,7 +307,7 @@ func TestListMemoryFiltersKeepsCanonicalFacetOrder(t *testing.T) {
if err := dao.DB.Model(&entity.Memory{ID: "mem-semantic"}).Update("update_time", bumped).Error; err != nil {
t.Fatalf("bump update_time: %v", err)
}
- refreshed, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(t.Context(), "user-1")
+ refreshed, err := NewMemoryService(dao.DB, engine.Get()).ListMemoryFilters(ctx, "user-1")
if err != nil {
t.Fatalf("ListMemoryFilters refresh: %v", err)
}
@@ -358,7 +358,7 @@ func TestForgetMessageKeepsCompanionFieldForNonOceanBaseEngines(t *testing.T) {
service := NewMemoryService(dao.DB, engine.Get())
service.docEngine = docEngine
- if err := service.ForgetMessage(t.Context(), "user-1", "memory-1", 42); err != nil {
+ if err := service.ForgetMessage(serviceTestContext(t, "user-1", "user-1"), "user-1", "memory-1", 42); err != nil {
t.Fatalf("ForgetMessage() error = %v", err)
}
if docEngine.updateCond["id"] != "memory-1_42" {
@@ -412,10 +412,12 @@ func TestUpdateMemoryTeamMemberCannotChangePermissions(t *testing.T) {
}).Error; err != nil {
t.Fatalf("seed user tenant: %v", err)
}
+ ctx := serviceTestContext(t, "member-1", "owner-1", "owner-1")
+ grantServiceTestResource(t, "owner-1", "memory", "mem-team", "member-1", testResourcePermissionRead|testResourcePermissionWrite)
svc := NewMemoryService(dao.DB, engine.Get())
samePermission := " TEAM "
- if _, err := svc.UpdateMemory(t.Context(), "member-1", "mem-team", &UpdateMemoryRequest{
+ if _, err := svc.UpdateMemory(ctx, "member-1", "mem-team", &UpdateMemoryRequest{
Description: sptr("member edit"),
Permissions: &samePermission,
}); err != nil {
@@ -423,7 +425,7 @@ func TestUpdateMemoryTeamMemberCannotChangePermissions(t *testing.T) {
}
nextPermission := "me"
- if _, err := svc.UpdateMemory(t.Context(), "member-1", "mem-team", &UpdateMemoryRequest{
+ if _, err := svc.UpdateMemory(ctx, "member-1", "mem-team", &UpdateMemoryRequest{
Permissions: &nextPermission,
}); err == nil {
t.Fatal("UpdateMemory permission change error = nil, want error")
@@ -457,6 +459,8 @@ func TestUpdateMemoryTeamMemberResolvesModelsAgainstOwnerTenant(t *testing.T) {
}).Error; err != nil {
t.Fatalf("seed user tenant: %v", err)
}
+ ctx := serviceTestContext(t, "member-1", "owner-1", "owner-1")
+ grantServiceTestResource(t, "owner-1", "memory", "mem-model", "member-1", testResourcePermissionRead|testResourcePermissionWrite)
for _, row := range []struct {
providerID string
@@ -496,7 +500,7 @@ func TestUpdateMemoryTeamMemberResolvesModelsAgainstOwnerTenant(t *testing.T) {
}
llmID := "gpt-4o@default@OpenAI"
- if _, err := NewMemoryService(dao.DB, engine.Get()).UpdateMemory(t.Context(), "member-1", "mem-model", &UpdateMemoryRequest{
+ if _, err := NewMemoryService(dao.DB, engine.Get()).UpdateMemory(ctx, "member-1", "mem-model", &UpdateMemoryRequest{
LLMID: &llmID,
}); err != nil {
t.Fatalf("UpdateMemory model error = %v", err)
@@ -571,7 +575,7 @@ func TestListMemoriesUsesTenantModelIDForDisplayName(t *testing.T) {
t.Fatalf("seed memory: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(ctx, "user-1", []string{"user-1"}, nil, "", "", 1, 10, "")
if err != nil {
t.Fatalf("ListMemories: %v", err)
@@ -608,7 +612,7 @@ func TestListMemoriesFallsBackToRawModelIDWithoutTenantModelID(t *testing.T) {
t.Fatalf("seed memory: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
resp, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(ctx, "user-1", []string{"user-1"}, nil, "", "", 1, 10, "")
if err != nil {
t.Fatalf("ListMemories: %v", err)
@@ -655,7 +659,7 @@ func TestListMemoriesRejectsUnjoinedTenantFilter(t *testing.T) {
t.Fatalf("seed memory: %v", err)
}
- resp, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(t.Context(), "user-1", []string{"tenant-2"}, nil, "", "", 1, 10, "")
+ resp, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(serviceTestContext(t, "user-1", "user-1"), "user-1", []string{"tenant-2"}, nil, "", "", 1, 10, "")
if err != nil {
t.Fatalf("ListMemories: %v", err)
}
@@ -716,7 +720,8 @@ func TestListMemoriesKeepsJoinedTenantFilter(t *testing.T) {
}
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-2", "tenant-2")
+ grantServiceTestResource(t, "tenant-2", "memory", "mem-joined-team", "user-1", testResourcePermissionRead)
resp, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(ctx, "user-1", []string{"tenant-2"}, nil, "", "", 1, 10, "")
if err != nil {
@@ -758,11 +763,15 @@ func TestListMemoriesForCanvasUsesCallerOwnerIntersection(t *testing.T) {
canvas := entity.UserCanvas{
ID: "canvas-1",
UserID: "canvas-owner",
+ TenantID: sptr("canvas-owner"),
Permission: string(TenantPermissionTeam),
}
if err := dao.DB.Create(&canvas).Error; err != nil {
t.Fatalf("seed canvas: %v", err)
}
+ ctx := serviceTestContext(t, "caller", "canvas-owner", "canvas-owner")
+ grantServiceTestResource(t, "canvas-owner", "canvas", "canvas-1", "caller", testResourcePermissionRead)
+ grantServiceTestResource(t, "canvas-owner", "memory", "memory-shared", "caller", testResourcePermissionRead)
for _, memory := range []*entity.Memory{
{ID: "memory-shared", Name: "Shared", TenantID: "canvas-owner", EmbdID: "embd", LLMID: "llm", Permissions: string(TenantPermissionTeam)},
{ID: "memory-caller-only", Name: "Caller only", TenantID: "caller", EmbdID: "embd", LLMID: "llm", Permissions: string(TenantPermissionMe)},
@@ -773,7 +782,7 @@ func TestListMemoriesForCanvasUsesCallerOwnerIntersection(t *testing.T) {
}
}
- response, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(t.Context(), "caller", nil, nil, "", "", 1, 30, canvas.ID)
+ response, err := NewMemoryService(dao.DB, engine.Get()).ListMemories(ctx, "caller", nil, nil, "", "", 1, 30, canvas.ID)
if err != nil {
t.Fatalf("ListMemories(canvas): %v", err)
}
@@ -846,7 +855,7 @@ func TestSaveAgentMessageChecksMemoryAccess(t *testing.T) {
t.Fatalf("AddMessage with empty current user = (%v, %q, %v), want unauthenticated error", ok, detail, err)
}
- ok, detail, err = svc.saveAgentMessage(t.Context(), "user-2", []string{"mem-owned"}, msg)
+ ok, detail, err = svc.saveAgentMessage(serviceTestContext(t, "user-2", "user-2"), "user-2", []string{"mem-owned"}, msg)
if err != nil {
t.Fatalf("saveAgentMessage as outsider: %v", err)
}
@@ -854,7 +863,7 @@ func TestSaveAgentMessageChecksMemoryAccess(t *testing.T) {
t.Fatalf("saveAgentMessage as outsider = (%v, %q), want hidden memory not found", ok, detail)
}
- ok, detail, err = svc.saveAgentMessage(t.Context(), "user-1", []string{"mem-owned"}, msg)
+ ok, detail, err = svc.saveAgentMessage(serviceTestContext(t, "user-1", "user-1"), "user-1", []string{"mem-owned"}, msg)
if err != nil {
t.Fatalf("saveAgentMessage as owner: %v", err)
}
@@ -892,7 +901,7 @@ func TestGetMessagesFiltersAccessibleMemoryAndBuildsRecentSearch(t *testing.T) {
}
svc := &MemoryService{memoryDAO: dao.NewMemoryDAO(), db: dao.DB, docEngine: docEngine}
- got, code, err := svc.GetMessages(t.Context(), []string{"mem-owned", "mem-other"}, "user-1", "agent-1", "session-1", 3)
+ got, code, err := svc.GetMessages(serviceTestContext(t, "user-1", "user-1"), []string{"mem-owned", "mem-other"}, "user-1", "agent-1", "session-1", 3)
if err != nil {
t.Fatalf("GetMessages error: %v", err)
}
@@ -974,7 +983,7 @@ func TestSearchMessageFiltersAccessibleMemoryAndDefaultsStatus(t *testing.T) {
"top_n": 5,
}
- got, code, err := svc.SearchMessage(t.Context(), "user-1", filter, params)
+ got, code, err := svc.SearchMessage(serviceTestContext(t, "user-1", "user-1"), "user-1", filter, params)
if err != nil {
t.Fatalf("SearchMessage error: %v", err)
}
@@ -1013,7 +1022,7 @@ func TestUpdateMessageUpdatesStatusByMessageDocID(t *testing.T) {
docEngine := &memoryMessageDocEngine{}
svc := &MemoryService{memoryDAO: dao.NewMemoryDAO(), db: dao.DB, docEngine: docEngine}
- ok, err := svc.UpdateMessage(t.Context(), "user-1", "mem-owned", 42, true)
+ ok, err := svc.UpdateMessage(serviceTestContext(t, "user-1", "user-1"), "user-1", "mem-owned", 42, true)
if err != nil {
t.Fatalf("UpdateMessage error: %v", err)
}
diff --git a/internal/service/memory_saver_adapter_test.go b/internal/service/memory_saver_adapter_test.go
index f1992c1112..d71f7a6f5c 100644
--- a/internal/service/memory_saver_adapter_test.go
+++ b/internal/service/memory_saver_adapter_test.go
@@ -69,7 +69,7 @@ func TestMemorySaverAuthorizesWithAuthenticatedCanvasCaller(t *testing.T) {
state := runtime.NewCanvasState("run-1", "session-1")
state.Sys["canvas_id"] = canvas.ID
state.Sys["user_id"] = "caller"
- ctx := runtime.WithState(t.Context(), state)
+ ctx := runtime.WithState(serviceTestContext(t, "caller", "canvas-owner"), state)
// 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 caller
diff --git a/internal/service/model_factory.go b/internal/service/model_factory.go
index a9af3a4ea2..7ca8f53b10 100644
--- a/internal/service/model_factory.go
+++ b/internal/service/model_factory.go
@@ -59,7 +59,7 @@ type ModelAccess struct {
// ModelFactory resolves model references, checks access, and constructs typed
// model instances. Provider and instance details stay inside this boundary.
type ModelFactory struct {
- tenantDAO *dao.TenantDAO
+ userTenantDAO *dao.UserTenantDAO
modelProviderDAO *dao.TenantModelProviderDAO
modelInstanceDAO *dao.TenantModelInstanceDAO
modelDAO *dao.TenantModelDAO
@@ -68,7 +68,7 @@ type ModelFactory struct {
// NewModelFactory creates a factory backed by the standard model DAOs.
func NewModelFactory() *ModelFactory {
return &ModelFactory{
- tenantDAO: dao.NewTenantDAO(),
+ userTenantDAO: dao.NewUserTenantDAO(),
modelProviderDAO: dao.NewTenantModelProviderDAO(),
modelInstanceDAO: dao.NewTenantModelInstanceDAO(),
modelDAO: dao.NewTenantModelDAO(),
@@ -460,24 +460,19 @@ func (f *ModelFactory) resolveDefaultConfig(ctx context.Context, access ModelAcc
if modelType == entity.ModelTypeOCR {
return nil, fmt.Errorf("OCR model name is required")
}
- if f.tenantDAO == nil {
- return nil, fmt.Errorf("%w: tenant DAO is not initialized", errModelConfigUnavailable)
+ if f.userTenantDAO == nil {
+ return nil, fmt.Errorf("%w: user Tenant DAO is not initialized", errModelConfigUnavailable)
}
-
- if _, err := f.tenantDAO.GetByID(ctx, dao.DB, access.TenantID); err != nil {
- return nil, fmt.Errorf("failed to get tenant: %s type %s: %w", access.TenantID, modelType, err)
- }
- membershipDAO := dao.NewUserTenantDAO()
var membership *entity.UserTenant
var err error
if access.UserID != "" {
- membership, err = membershipDAO.FilterByUserIDAndTenantID(ctx, dao.DB, access.UserID, access.TenantID)
+ membership, err = f.userTenantDAO.FilterByUserIDAndTenantID(ctx, dao.DB, access.UserID, access.TenantID)
if err != nil && (access.UserID != access.TenantID || !errors.Is(err, gorm.ErrRecordNotFound)) {
return nil, fmt.Errorf("failed to get user tenant model settings: %s type %s: %w", access.TenantID, modelType, err)
}
}
if membership == nil {
- membership, err = membershipDAO.GetOwnerByTenantID(ctx, dao.DB, access.TenantID)
+ membership, err = f.userTenantDAO.GetOwnerByTenantID(ctx, dao.DB, access.TenantID)
if err != nil {
return nil, fmt.Errorf("failed to get tenant owner model settings: %s type %s: %w", access.TenantID, modelType, err)
}
diff --git a/internal/service/model_service_test.go b/internal/service/model_service_test.go
index 6a05c12707..9ca788654f 100644
--- a/internal/service/model_service_test.go
+++ b/internal/service/model_service_test.go
@@ -218,7 +218,7 @@ func TestVerifyProviderModelValidatesRemoteEmbeddingMetadata(t *testing.T) {
}},
}
- result, err := verifyProviderModel(t.Context(), driver, nil, &modelModule.APIConfig{}, nil)
+ result, err := verifyProviderModel(serviceTestContext(t, "user-1", "tenant-1"), driver, nil, &modelModule.APIConfig{}, nil)
if err == nil {
t.Fatal("verifyProviderModel() error = nil, want validation error")
}
@@ -358,7 +358,7 @@ func TestBedrockAPIKeyInstancePersistsDiscoveredModelsWithoutRuntimeVerification
apiKey := `{"auth_mode":"bedrock_api_key","bedrock_api_key":"test-key","bedrock_region":"us-east-1"}`
code, err := NewModelProviderService().CreateProviderInstance(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-bedrock"),
"Bedrock",
"api-key-instance",
apiKey,
@@ -389,7 +389,7 @@ func TestBedrockAPIKeyInstancePersistsDiscoveredModelsWithoutRuntimeVerification
t.Fatalf("models = %#v, want persisted Bedrock model", models)
}
code, err = NewModelProviderService().AlterProviderInstance(
- t.Context(),
+ serviceTestContext(t, "user-1", "tenant-bedrock"),
"user-1",
"Bedrock",
"api-key-instance",
@@ -424,7 +424,7 @@ func TestCreateProviderInstanceRollsBackInstanceWhenModelCreationFails(t *testin
// the instance row has already been committed.
duplicated := CreateInstanceModelInfo{ModelName: "gpt-duplicate", ModelTypes: []string{"chat"}, MaxTokens: 8192}
code, err := NewModelProviderService().CreateProviderInstance(
- t.Context(),
+ serviceTestContext(t, "user-1", "user-1"),
"OpenAI",
"broken-instance",
"sk-rollback",
@@ -459,7 +459,7 @@ func TestModelProviderServiceAlterModelStatusByID(t *testing.T) {
useModelProviderServiceTestDB(t, db)
seedModelProviderServiceScope(t, db)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
code, err := NewModelProviderService().AlterModel(ctx, "OpenAI", "default", "", "user-1", "model-1", map[string]interface{}{"status": "inactive"})
if err != nil {
t.Fatalf("AlterModel() error = %v", err)
@@ -477,61 +477,6 @@ func TestModelProviderServiceAlterModelStatusByID(t *testing.T) {
}
}
-func TestModelPermissionsAllowMemberUseButHideInstanceConfiguration(t *testing.T) {
- db := setupModelProviderServiceTestDB(t)
- useModelProviderServiceTestDB(t, db)
- seedModelProviderServiceScope(t, db)
- activeStatus := "1"
- if err := db.Create(&entity.UserTenant{
- ID: "user-tenant-member",
- UserID: "member-1",
- TenantID: "user-1",
- Role: string(permission.RoleNormal),
- InvitedBy: "user-1",
- Status: &activeStatus,
- }).Error; err != nil {
- t.Fatalf("seed tenant member: %v", err)
- }
- if err := db.Create(&entity.UserTenant{
- ID: "member-1-owner", UserID: "member-1", TenantID: "member-1",
- Role: string(permission.RoleOwner), InvitedBy: "member-1", Status: &activeStatus,
- }).Error; err != nil {
- t.Fatalf("seed member's personal tenant: %v", err)
- }
-
- ctx := t.Context()
- service := NewModelProviderService()
- providers, code, err := service.ListProvidersOfTenant(ctx, "member-1")
- if err != nil || code != common.CodeSuccess || len(providers) != 0 {
- t.Fatalf("ListProvidersOfTenant() = (%v, %v, %d providers), want success and no providers for a non-owner", code, err, len(providers))
- }
-
- if _, code, err = service.ShowProviderInstance(ctx, "OpenAI", "instance-1", "member-1"); err == nil || code != common.CodeNotFound {
- t.Fatalf("ShowProviderInstance() = (%v, %v), want hidden instance denial", code, err)
- }
-
- factory := NewModelFactory()
- access := ModelAccess{UserID: "member-1", TenantID: "user-1"}
- if _, err = factory.resolveConfig(ctx, access, entity.ModelTypeChat, "model-1"); err != nil {
- t.Fatalf("member should be able to use the tenant model: %v", err)
- }
- if _, err = factory.resolveConfig(ctx, access, entity.ModelTypeChat, "gpt-test@default@OpenAI"); err != nil {
- t.Fatalf("member should be able to use the composite model reference: %v", err)
- }
-
- code, err = service.AlterModel(ctx, "OpenAI", "default", "gpt-test", "member-1", "", map[string]interface{}{"status": "inactive"})
- if err == nil || code != common.CodeNotFound {
- t.Fatalf("AlterModel() = (%v, %v), want hidden model update denial", code, err)
- }
- var model entity.TenantModel
- if err := db.Where("id = ?", "model-1").First(&model).Error; err != nil {
- t.Fatalf("reload tenant model: %v", err)
- }
- if model.Status != "active" {
- t.Fatalf("denied update changed model status to %q", model.Status)
- }
-}
-
func TestListProvidersOfTenantExcludesOtherTenants(t *testing.T) {
db := setupModelProviderServiceTestDB(t)
useModelProviderServiceTestDB(t, db)
@@ -548,7 +493,7 @@ func TestListProvidersOfTenantExcludesOtherTenants(t *testing.T) {
}
}
- providers, code, err := NewModelProviderService().ListProvidersOfTenant(t.Context(), "user-1")
+ providers, code, err := NewModelProviderService().ListProvidersOfTenant(serviceTestContext(t, "user-1", "user-1"), "user-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListProvidersOfTenant() = (%v, %v), want success", code, err)
}
@@ -575,7 +520,7 @@ func TestListProviderInstancesUsesOwnedTenantProvider(t *testing.T) {
}
service := NewModelProviderService()
- instances, code, err := service.ListProviderInstances(t.Context(), "OpenAI", "user-1")
+ instances, code, err := service.ListProviderInstances(serviceTestContext(t, "user-1", "user-1"), "OpenAI", "user-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListProviderInstances() = (%v, %v), want success", code, err)
}
@@ -583,7 +528,7 @@ func TestListProviderInstancesUsesOwnedTenantProvider(t *testing.T) {
t.Fatalf("ListProviderInstances() = %v, want only the instance from user-1's own tenant", instances)
}
- if instances, code, err = service.ListProviderInstances(t.Context(), "provider-2", "user-1"); err == nil || len(instances) != 0 {
+ if instances, code, err = service.ListProviderInstances(serviceTestContext(t, "user-1", "user-1"), "provider-2", "user-1"); err == nil || len(instances) != 0 {
t.Fatalf("ListProviderInstances() for another tenant's provider = (%v, %v, %v), want it hidden", instances, code, err)
}
}
@@ -607,7 +552,7 @@ func TestProviderModelListingUsesOwnedTenant(t *testing.T) {
}
service := NewModelProviderService()
- models, err := service.ListInstanceModels(t.Context(), "OpenAI", "default", "user-1")
+ models, err := service.ListInstanceModels(serviceTestContext(t, "user-1", "user-1"), "OpenAI", "default", "user-1")
if err != nil {
t.Fatalf("ListInstanceModels() error = %v, want success", err)
}
@@ -615,10 +560,10 @@ func TestProviderModelListingUsesOwnedTenant(t *testing.T) {
t.Fatalf("ListInstanceModels() = %v, want only user-1's own-tenant model", models)
}
- if _, err = service.ListInstanceModels(t.Context(), "provider-2", "default", "user-1"); !errors.Is(err, gorm.ErrRecordNotFound) {
+ if _, err = service.ListInstanceModels(serviceTestContext(t, "user-1", "user-1"), "provider-2", "default", "user-1"); !errors.Is(err, gorm.ErrRecordNotFound) {
t.Fatalf("ListInstanceModels() for another tenant's provider error = %v, want record not found", err)
}
- if _, err = service.ListSupportedModels(t.Context(), "provider-2", "default", "user-1"); !errors.Is(err, gorm.ErrRecordNotFound) {
+ if _, err = service.ListSupportedModels(serviceTestContext(t, "user-1", "user-1"), "provider-2", "default", "user-1"); !errors.Is(err, gorm.ErrRecordNotFound) {
t.Fatalf("ListSupportedModels() for another tenant's provider error = %v, want record not found", err)
}
}
@@ -641,7 +586,8 @@ func TestShowProviderInstanceUsesOwnedTenantProvider(t *testing.T) {
}
service := NewModelProviderService()
- instance, code, err := service.ShowProviderInstance(t.Context(), "OpenAI", "instance-1", "user-1")
+ ctx := serviceTestContext(t, "user-1", "user-1")
+ instance, code, err := service.ShowProviderInstance(ctx, "OpenAI", "instance-1", "user-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ShowProviderInstance() = (%v, %v), want success", code, err)
}
@@ -652,7 +598,7 @@ func TestShowProviderInstanceUsesOwnedTenantProvider(t *testing.T) {
t.Fatalf("ShowProviderInstance() api_key = %v, want owner credential", instance["api_key"])
}
- if _, code, err = service.ShowProviderInstance(t.Context(), "provider-2", "instance-2", "user-1"); err == nil || code != common.CodeNotFound {
+ if _, code, err = service.ShowProviderInstance(ctx, "provider-2", "instance-2", "user-1"); err == nil || code != common.CodeNotFound {
t.Fatalf("ShowProviderInstance() for another tenant's provider = (%v, %v), want hidden provider", code, err)
}
}
@@ -682,7 +628,7 @@ func TestCheckConnectionDeniesBeforeCallingProvider(t *testing.T) {
provider.ModelDriver = probe
t.Cleanup(func() { provider.ModelDriver = originalDriver })
- code, err := NewModelProviderService().CheckConnection(t.Context(), "OpenAI", "sk-test", "default", "", "instance-1", "member-1", nil)
+ code, err := NewModelProviderService().CheckConnection(serviceTestContext(t, "member-1", "tenant-1", "user-1"), "OpenAI", "sk-test", "default", "", "instance-1", "member-1", nil)
if err == nil || code != common.CodeNotFound {
t.Fatalf("CheckConnection() = (%v, %v), want hidden update denial", code, err)
}
@@ -696,7 +642,7 @@ func TestModelFactoryResolveModelConfigByID(t *testing.T) {
useModelProviderServiceTestDB(t, db)
seedModelProviderServiceScope(t, db)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
target, err := NewModelFactory().resolveConfig(ctx, ModelAccess{TenantID: "user-1", UserID: "user-1"}, entity.ModelTypeChat, "model-1")
if err != nil {
t.Fatalf("resolveConfig() error = %v", err)
@@ -730,7 +676,7 @@ func TestModelProviderServiceMissingProviderAndInstancePreserveLookupError(t *te
} {
t.Run(modelRef, func(t *testing.T) {
_, err := NewModelFactory().resolveConfig(
- t.Context(), ModelAccess{TenantID: "tenant-1"}, entity.ModelTypeEmbedding, modelRef,
+ serviceTestContext(t, "user-1", "tenant-1"), ModelAccess{TenantID: "tenant-1"}, entity.ModelTypeEmbedding, modelRef,
)
if !errors.Is(err, errModelConfigUnavailable) || !errors.Is(err, gorm.ErrRecordNotFound) {
t.Fatalf("resolveConfig() error = %v, want unavailable record-not-found error", err)
@@ -757,13 +703,13 @@ func TestModelProviderServiceDecodesCompatibleInstanceExtra(t *testing.T) {
{
name: "model ID",
resolve: func() (*modelTarget, error) {
- return solver.resolveConfig(t.Context(), ModelAccess{TenantID: "user-1", UserID: "user-1"}, entity.ModelTypeChat, "model-1")
+ return solver.resolveConfig(serviceTestContext(t, "user-1", "user-1"), ModelAccess{TenantID: "user-1", UserID: "user-1"}, entity.ModelTypeChat, "model-1")
},
},
{
name: "provider instance",
resolve: func() (*modelTarget, error) {
- return solver.resolveConfig(t.Context(), ModelAccess{TenantID: "user-1"}, entity.ModelTypeChat, "gpt-test@default@OpenAI")
+ return solver.resolveConfig(serviceTestContext(t, "user-1", "user-1"), ModelAccess{TenantID: "user-1"}, entity.ModelTypeChat, "gpt-test@default@OpenAI")
},
},
}
@@ -821,7 +767,7 @@ func TestModelInfoSeparatesContextLengthAndMaxOutput(t *testing.T) {
}
func TestModelProviderServiceAlterModelRejectsInvalidStatus(t *testing.T) {
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
code, err := NewModelProviderService().AlterModel(ctx, "OpenAI", "default", "", "user-1", "model-1", map[string]interface{}{"status": "disabled"})
if err == nil {
t.Fatalf("AlterModel() error = nil, want invalid status error")
@@ -835,7 +781,7 @@ func TestModelProviderServiceAlterModelRejectsInvalidStatus(t *testing.T) {
}
func TestModelProviderServiceAlterModelRejectsMissingModelSelector(t *testing.T) {
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
code, err := NewModelProviderService().AlterModel(ctx, "OpenAI", "default", "", "user-1", "", map[string]interface{}{"status": "active"})
if err == nil {
t.Fatalf("AlterModel() error = nil, want missing model selector error")
@@ -856,7 +802,7 @@ func TestModelProviderServiceAlterModelRejectsWrongScopedModelID(t *testing.T) {
t.Fatalf("failed to seed second instance: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
code, err := NewModelProviderService().AlterModel(ctx, "OpenAI", "other", "", "user-1", "model-1", map[string]interface{}{"status": "inactive"})
if err == nil {
t.Fatalf("AlterModel() error = nil, want not found error")
@@ -1035,7 +981,7 @@ func TestModelFactoryResolveModelConfigReportsToolSupport(t *testing.T) {
}
solver := NewModelFactory()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
// A reference that passes validation still reads the persisted flag.
target, err := solver.resolveConfig(ctx, ModelAccess{TenantID: "tenant-1"}, entity.ModelTypeChat, "model-active")
@@ -1110,7 +1056,7 @@ func TestModelFactoryResolveModelConfigPrefersTenantToolFlag(t *testing.T) {
}
solver := NewModelFactory()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
target, err := solver.resolveConfig(ctx, ModelAccess{TenantID: "tenant-1"}, entity.ModelTypeChat, toolsOn+"@default@OpenAI")
if err != nil {
@@ -1153,7 +1099,7 @@ func TestModelFactoryResolveModelConfigPropagatesLookupFailure(t *testing.T) {
}
solver := NewModelFactory()
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "tenant-1")
if target, err := solver.resolveConfig(ctx, ModelAccess{TenantID: "tenant-1"}, entity.ModelTypeChat, "model-1"); err != nil || target == nil || !target.SupportsTools {
t.Fatalf("baseline = (%v, %v), want tool support", target, err)
}
@@ -1203,7 +1149,7 @@ func TestDropProviderInstancesRollsBackWhenInstanceDeleteFails(t *testing.T) {
_ = db.Callback().Delete().Remove("test:fail_tenant_model_instance_delete")
})
- code, err := NewModelProviderService().DropProviderInstances(t.Context(), "provider-1", "user-1", []string{"instance-1"})
+ code, err := NewModelProviderService().DropProviderInstances(serviceTestContext(t, "user-1", "user-1"), "provider-1", "user-1", []string{"instance-1"})
if err == nil {
t.Fatalf("DropProviderInstances() error = nil, want forced instance delete failure")
}
diff --git a/internal/service/model_service_tts_test.go b/internal/service/model_service_tts_test.go
index a52cb44c1e..aaf77019b7 100644
--- a/internal/service/model_service_tts_test.go
+++ b/internal/service/model_service_tts_test.go
@@ -25,7 +25,7 @@ import (
"ragflow/internal/entity"
)
-// insertTTSTestTenant inserts a tenant row; ttsID may be nil (no default
+// insertTTSTestTenant inserts a tenant and owner membership; ttsID may be nil (no default
// TTS model configured).
func insertTTSTestTenant(t *testing.T, id string, ttsID *string) {
t.Helper()
diff --git a/internal/service/model_stored_provider_name_test.go b/internal/service/model_stored_provider_name_test.go
index abfcd9f157..a5e5f7933c 100644
--- a/internal/service/model_stored_provider_name_test.go
+++ b/internal/service/model_stored_provider_name_test.go
@@ -69,7 +69,7 @@ func TestModelFactoryResolvesStoredMistralOCRProvider(t *testing.T) {
{name: "catalog composite", modelRef: "mistral-ocr-2512@default@Mistral OCR", wantModel: "mistral-ocr-2512"},
} {
t.Run(tc.name, func(t *testing.T) {
- target, err := NewModelFactory().resolveConfig(t.Context(), access, entity.ModelTypeOCR, tc.modelRef)
+ target, err := NewModelFactory().resolveConfig(serviceTestContext(t, "user-1", "user-1"), access, entity.ModelTypeOCR, tc.modelRef)
if err != nil {
t.Fatalf("resolveConfig(%q): %v", tc.modelRef, err)
}
@@ -96,7 +96,7 @@ func TestModelFactoryResolveModelTypeForStoredMistralOCRProvider(t *testing.T) {
useModelProviderServiceTestDB(t, db)
seedStoredMistralOCRProvider(t, db)
- types, err := NewModelFactory().ResolveModelType(t.Context(), ModelAccess{TenantID: "user-1", UserID: "user-1"}, "mistral-ocr-2512@default@Mistral OCR")
+ types, err := NewModelFactory().ResolveModelType(serviceTestContext(t, "user-1", "user-1"), ModelAccess{TenantID: "user-1", UserID: "user-1"}, "mistral-ocr-2512@default@Mistral OCR")
if err != nil {
t.Fatalf("ResolveModelType: %v", err)
}
@@ -125,7 +125,7 @@ func TestModelCallServiceResolvesStoredMistralOCRProvider(t *testing.T) {
svc := NewModelCallService()
for _, modelRef := range []string{"model-mistral-ocr", "mistral-ocr-latest@default@Mistral OCR"} {
t.Run(modelRef, func(t *testing.T) {
- info, err := svc.resolveModelInfo(t.Context(), modelRef, "user-1")
+ info, err := svc.resolveModelInfo(serviceTestContext(t, "user-1", "user-1"), modelRef, "user-1")
if err != nil {
t.Fatalf("resolveModelInfo(%q): %v", modelRef, err)
}
@@ -152,7 +152,7 @@ func TestListProvidersOfTenantSkipsStoredMistralOCRProvider(t *testing.T) {
t.Fatalf("create provider: %v", err)
}
- providers, code, err := NewModelProviderService().ListProvidersOfTenant(t.Context(), "user-1")
+ providers, code, err := NewModelProviderService().ListProvidersOfTenant(serviceTestContext(t, "user-1", "user-1"), "user-1")
if err != nil || code != common.CodeSuccess {
t.Fatalf("ListProvidersOfTenant = (%v, %v)", code, err)
}
diff --git a/internal/service/search.go b/internal/service/search.go
index 863b5b8ac9..9385aef75e 100644
--- a/internal/service/search.go
+++ b/internal/service/search.go
@@ -327,7 +327,7 @@ func (s *SearchService) PrepareCompletion(ctx context.Context, userID, searchID
tenantSvc = NewTenantService()
}
var defaultModelName string
- defaultModelName, err = tenantSvc.GetDefaultModelName(ctx, userID, entity.ModelTypeChat)
+ defaultModelName, err = tenantSvc.GetDefaultModelNameForUser(ctx, userID, entity.ModelTypeChat)
if err == nil {
modelID = strings.TrimSpace(defaultModelName)
}
diff --git a/internal/service/search_share_detail_test.go b/internal/service/search_share_detail_test.go
index 772b038182..b1f899cac7 100644
--- a/internal/service/search_share_detail_test.go
+++ b/internal/service/search_share_detail_test.go
@@ -78,7 +78,7 @@ func TestSearchServiceGetSearchShareDetail(t *testing.T) {
t.Fatalf("failed to create search: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
detail, err := NewSearchService().GetSearchShareDetail(ctx, "tenant-1", "search-1")
if err != nil {
t.Fatalf("GetSearchShareDetail failed: %v", err)
@@ -146,7 +146,7 @@ func TestSearchServiceGetSearchShareDetailRejectsUnauthorizedUser(t *testing.T)
t.Fatalf("failed to create search: %v", err)
}
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-2", "tenant-1", "tenant-1")
_, err := NewSearchService().GetSearchShareDetail(ctx, "user-2", "search-1")
if err == nil {
t.Fatal("expected permission error")
diff --git a/internal/service/search_test.go b/internal/service/search_test.go
index c76f0a8263..fbab4745b2 100644
--- a/internal/service/search_test.go
+++ b/internal/service/search_test.go
@@ -56,7 +56,7 @@ func createSearchServiceTestSearch(t *testing.T, id, tenantID, name string) {
func TestSearchServiceCreateRejectsEmptyName(t *testing.T) {
setupSearchServiceTestDB(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
_, err := NewSearchService().CreateSearch(ctx, "tenant-1", " ", nil)
if err == nil {
t.Fatal("expected empty name validation error")
@@ -69,7 +69,7 @@ func TestSearchServiceCreateRejectsEmptyName(t *testing.T) {
func TestSearchServiceUpdateRejectsUnauthorizedSearchID(t *testing.T) {
setupSearchServiceTestDB(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-2", "user-2")
req := &UpdateSearchRequest{
Name: "New Name",
SearchConfig: map[string]interface{}{},
@@ -85,7 +85,7 @@ func TestSearchServiceUpdateRejectsUnauthorizedSearchID(t *testing.T) {
func TestSearchServiceCreateAndUpdateRoundTrip(t *testing.T) {
setupSearchServiceTestDB(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1", "user-2")
created, err := NewSearchService().CreateSearch(ctx, "tenant-1", "My Search", nil)
if err != nil {
t.Fatalf("CreateSearch failed: %v", err)
@@ -99,7 +99,7 @@ func TestSearchServiceCreateAndUpdateRoundTrip(t *testing.T) {
Name: "Hijacked Name",
SearchConfig: map[string]interface{}{},
}
- _, err = NewSearchService().UpdateSearch(ctx, "user-2", created.SearchID, req)
+ _, err = NewSearchService().UpdateSearch(serviceTestContext(t, "user-2", "tenant-1", "tenant-1"), "user-2", created.SearchID, req)
if !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("expected permission denied, got %v", err)
}
@@ -164,7 +164,7 @@ func TestSearchServiceListSearchesReturnsOwnerDisplayFields(t *testing.T) {
}
createSearchServiceTestSearch(t, "search-1", "user-1", "Search One")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := NewSearchService().ListSearches(ctx, "user-1", "", 0, 0, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil)
if err != nil {
t.Fatalf("ListSearches failed: %v", err)
@@ -182,7 +182,7 @@ func TestSearchServiceListSearchesNicknameFallsBackToTenantID(t *testing.T) {
createSearchServiceTestSearch(t, "search-1", "user-1", "Search One")
- ctx := t.Context()
+ ctx := serviceTestContext(t, "user-1", "user-1")
result, err := NewSearchService().ListSearches(ctx, "user-1", "", 0, 0, []dao.OrderTerm{{Column: "create_time", Desc: true}}, nil)
if err != nil {
t.Fatalf("ListSearches failed: %v", err)
@@ -200,7 +200,7 @@ func TestSearchServiceListSearchesUsesPermissionScope(t *testing.T) {
valid := string(entity.StatusValid)
for _, row := range []entity.Search{
{ID: "team-search", TenantID: "team-tenant", CreatedBy: "team-owner", Name: "Team Search", SearchConfig: entity.JSONMap{}, Status: &valid},
- {ID: "member-search", TenantID: "member-1", CreatedBy: "member-1", Name: "Member Search", SearchConfig: entity.JSONMap{}, Status: &valid},
+ {ID: "member-search", TenantID: "team-tenant", CreatedBy: "member-1", Name: "Member Search", SearchConfig: entity.JSONMap{}, Status: &valid},
{ID: "unshared-search", TenantID: "other-tenant", CreatedBy: "other-owner", Name: "Unshared Search", SearchConfig: entity.JSONMap{}, Status: &valid},
} {
search := row
@@ -218,7 +218,8 @@ func TestSearchServiceListSearchesUsesPermissionScope(t *testing.T) {
}
}
- result, err := NewSearchService().ListSearches(t.Context(), "member-1", "", 0, 0, nil, nil)
+ ctx := serviceTestContext(t, "member-1", "team-tenant", "team-owner")
+ result, err := NewSearchService().ListSearches(ctx, "member-1", "", 0, 0, nil, nil)
if err != nil {
t.Fatalf("ListSearches failed: %v", err)
}
@@ -260,10 +261,11 @@ func TestSearchServiceSeparatesSearchReadFromRunPermission(t *testing.T) {
}
service := NewSearchService()
- if _, err := service.GetSearchDetail(t.Context(), "member-1", search.ID); !errors.Is(err, permission.ErrPermissionDenied) {
+ ctx := serviceTestContext(t, "member-1", "team-tenant", "team-owner")
+ if _, err := service.GetSearchDetail(ctx, "member-1", search.ID); !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("tenant member should not be able to read another user's Search App metadata, got %v", err)
}
- if _, err := service.GetDetail(t.Context(), "member-1", search.ID); !errors.Is(err, permission.ErrPermissionDenied) {
+ if _, err := service.GetDetail(ctx, "member-1", search.ID); !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("tenant member should not be able to run another user's Search App, got %v", err)
}
}
@@ -272,7 +274,7 @@ func TestSearchServiceSeparatesSearchReadFromRunPermission(t *testing.T) {
// filtering and pagination happen in SQL while total counts all matching rows.
func TestSearchServiceListSearchesPaginatesOwnerFilter(t *testing.T) {
setupSearchServiceTestDB(t)
- ctx := t.Context()
+ ctx := serviceTestContext(t, "tenant-1", "tenant-1")
for i := 1; i <= 5; i++ {
createTime := int64(i * 100)
diff --git a/internal/service/skill_space_permission_test.go b/internal/service/skill_space_permission_test.go
deleted file mode 100644
index 0d2540cf0e..0000000000
--- a/internal/service/skill_space_permission_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// 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 service
-
-import (
- "errors"
- "testing"
-
- "ragflow/internal/common"
- "ragflow/internal/entity"
- "ragflow/internal/permission"
-)
-
-func TestSkillSpacePermissionsUsePolicyAcrossServiceOperations(t *testing.T) {
- db := setupServiceTestDB(t)
- if err := db.AutoMigrate(&entity.SkillSpace{}); err != nil {
- t.Fatalf("migrate skill spaces: %v", err)
- }
- pushServiceDB(t, db)
-
- active := string(entity.StatusValid)
- for _, membership := range []entity.UserTenant{
- {ID: "skill-owner-membership", UserID: "owner", TenantID: "team", Role: string(permission.RoleOwner), Status: &active},
- {ID: "skill-member-membership", UserID: "member", TenantID: "team", Role: string(permission.RoleNormal), InvitedBy: "owner", Status: &active},
- {ID: "skill-member-personal-owner", UserID: "member", TenantID: "member", Role: string(permission.RoleOwner), InvitedBy: "member", Status: &active},
- {ID: "skill-outsider-membership", UserID: "outsider", TenantID: "other", Role: string(permission.RoleOwner), Status: &active},
- } {
- if err := db.Create(&membership).Error; err != nil {
- t.Fatalf("create membership %q: %v", membership.ID, err)
- }
- }
- folder := entity.File{
- ID: "skill-folder", ParentID: "root", TenantID: "team", CreatedBy: "owner",
- Name: "shared", Type: "folder", SourceType: "skill_space",
- }
- if err := db.Create(&folder).Error; err != nil {
- t.Fatalf("create skill folder: %v", err)
- }
- space := entity.SkillSpace{
- ID: "shared-space", TenantID: "team", Name: "shared", FolderID: folder.ID,
- Status: entity.SpaceStatusActive,
- }
- if err := db.Create(&space).Error; err != nil {
- t.Fatalf("create skill space: %v", err)
- }
-
- service := NewSkillSpaceService(nil)
- ctx := t.Context()
-
- listed, code, err := service.ListSpaces(ctx, "member")
- if err != nil || code != common.CodeSuccess {
- t.Fatalf("member list: code=%d err=%v", code, err)
- }
- spaces, ok := listed["spaces"].([]map[string]interface{})
- if !ok || len(spaces) != 1 || spaces[0]["id"] != space.ID {
- t.Fatalf("member list result = %#v, want only %q", listed["spaces"], space.ID)
- }
-
- if _, code, err := service.GetSpace(ctx, "member", space.ID); err != nil || code != common.CodeSuccess {
- t.Fatalf("member read: code=%d err=%v", code, err)
- }
- if _, code, err := service.UpdateSpace(ctx, "member", space.ID, &UpdateSpaceRequest{Description: "forbidden"}); err == nil || code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member update should be hidden: code=%d err=%v", code, err)
- }
- if code, err := service.DeleteSpace(ctx, "member", space.ID, nil); err == nil || code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member delete should be hidden: code=%d err=%v", code, err)
- }
- if _, code, err := service.GetSpace(ctx, "outsider", space.ID); err == nil || code != common.CodeNotFound || !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("outsider read should be hidden: code=%d err=%v", code, err)
- }
-
- created, code, err := service.CreateSpace(ctx, "member", &CreateSpaceRequest{Name: "personal"})
- if err != nil || code != common.CodeSuccess || created["tenant_id"] != "member" {
- t.Fatalf("member should create a personal skill space without switching tenants: result=%#v code=%d err=%v", created, code, err)
- }
- if tenantID, err := resolveSkillSpaceTenantID(ctx, "owner", "default", permission.OperationUse); err != nil || tenantID != "owner" {
- t.Fatalf("default skill space tenant = %q, err=%v; want owner's personal tenant", tenantID, err)
- }
-
- updated, code, err := service.UpdateSpace(ctx, "owner", space.ID, &UpdateSpaceRequest{Description: "updated"})
- if err != nil || code != common.CodeSuccess || updated["description"] != "updated" {
- t.Fatalf("owner update: result=%#v code=%d err=%v", updated, code, err)
- }
-
- indexer := NewSkillIndexerService()
- if err := indexer.BatchIndexSkills(ctx, "member", space.ID, nil, nil, ""); !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member indexing should be denied before engine access, got %v", err)
- }
- if err := indexer.DeleteSkillIndex(ctx, "member", space.ID, "skill", nil); !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member index deletion should be denied before engine access, got %v", err)
- }
- if _, _, err := NewSkillSearchService().UpdateConfig(ctx, "member", &UpdateConfigRequest{
- SpaceID: space.ID, EmbdID: "model", VectorSimilarityWeight: 0.5,
- SimilarityThreshold: 0.2, TopK: 10,
- }); !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("member config update should be denied, got %v", err)
- }
- if _, _, err := NewSkillSearchService().Search(ctx, "outsider", &SearchRequest{SpaceID: space.ID}, nil); !errors.Is(err, permission.ErrPermissionDenied) {
- t.Fatalf("outsider search should be denied before engine access, got %v", err)
- }
-}
diff --git a/internal/service/tenant.go b/internal/service/tenant.go
index c45e7ebc01..55fcc9a611 100644
--- a/internal/service/tenant.go
+++ b/internal/service/tenant.go
@@ -408,7 +408,7 @@ func (s *TenantService) GetDefaultModelName(ctx context.Context, tenantID string
return s.GetDefaultModelNameForTenant(ctx, tenantID, modelType)
}
-// GetDefaultModelNameForUser returns a user's setting in their personal tenant.
+// GetDefaultModelNameForUser returns the user's setting in the current Tenant.
func (s *TenantService) GetDefaultModelNameForUser(ctx context.Context, userID string, modelType entity.ModelType) (string, error) {
membership, _, err := s.currentUserTenant(ctx, userID)
if err != nil {
@@ -474,14 +474,6 @@ func isDefaultModelType(modelType entity.ModelType) bool {
}
}
-func (s *TenantService) currentUserTenant(ctx context.Context, userID string) (*entity.UserTenant, string, error) {
- membership, err := s.userTenantDAO.GetOwnerByUserID(ctx, dao.DB, userID)
- if err != nil {
- return nil, "", err
- }
- return membership, membership.TenantID, nil
-}
-
func (s *TenantService) defaultModelMembership(ctx context.Context, userID, tenantID string) (*entity.UserTenant, error) {
if strings.TrimSpace(userID) == "" {
return s.userTenantDAO.GetOwnerByTenantID(ctx, dao.DB, tenantID)
@@ -771,6 +763,21 @@ func (s *TenantService) SetTenantDefaultModels(ctx context.Context, userID, mode
}).Error
}
+func (s *TenantService) currentUserTenant(ctx context.Context, userID string) (*entity.UserTenant, string, error) {
+ membership, handled, err := resolveCurrentUserTenantEE(ctx, userID)
+ if err != nil {
+ return nil, "", err
+ }
+ if handled {
+ return membership, membership.TenantID, nil
+ }
+ membership, err = s.userTenantDAO.GetOwnerByUserID(ctx, dao.DB, userID)
+ if err != nil {
+ return nil, "", err
+ }
+ return membership, membership.TenantID, nil
+}
+
// Tenant member role constants.
const (
TenantRoleOwner = "owner"
diff --git a/internal/service/tenant_permission_ee.go b/internal/service/tenant_permission_ee.go
index 252f59daf7..cb022a7b34 100644
--- a/internal/service/tenant_permission_ee.go
+++ b/internal/service/tenant_permission_ee.go
@@ -15,8 +15,16 @@
package service
-import "context"
+import (
+ "context"
+
+ "ragflow/internal/entity"
+)
func resolveDefaultTenantIDEE(context.Context, string) (string, bool, error) {
return "", false, nil
}
+
+func resolveCurrentUserTenantEE(context.Context, string) (*entity.UserTenant, bool, error) {
+ return nil, false, nil
+}
diff --git a/internal/service/tenant_test.go b/internal/service/tenant_test.go
index 1b97d127cb..851714a744 100644
--- a/internal/service/tenant_test.go
+++ b/internal/service/tenant_test.go
@@ -306,7 +306,7 @@ func TestSetTenantDefaultModels_WithModelID(t *testing.T) {
// 4. Run SetTenantDefaultModels
s := NewTenantService()
// Set chat model using modelID, explicitly passing "default" as instance name to bypass pre-existing checkModelAvailable panic
- ctx := t.Context()
+ ctx := serviceTestContext(t, userID, tenantID)
err = s.SetTenantDefaultModels(ctx, userID, "", "default", "", "chat", modelID)
if err != nil {
t.Fatalf("SetTenantDefaultModels failed: %v", err)
diff --git a/internal/service/test_helpers_ee_test.go b/internal/service/test_helpers_ee_test.go
new file mode 100644
index 0000000000..fe8c431ec8
--- /dev/null
+++ b/internal/service/test_helpers_ee_test.go
@@ -0,0 +1,25 @@
+//
+// 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 service
+
+import "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.go
index 0e860d53d8..d91e481340 100644
--- a/internal/service/test_helpers_test.go
+++ b/internal/service/test_helpers_test.go
@@ -27,6 +27,14 @@ import (
"ragflow/internal/dao"
"ragflow/internal/engine/types"
"ragflow/internal/entity"
+ "ragflow/internal/permission"
+)
+
+const (
+ testResourcePermissionRead int32 = 1
+ testResourcePermissionWrite int32 = 2
+ testRoleActionEnable int32 = 1
+ testRoleActionRead int32 = 2
)
// sptr returns a pointer to the given string.
@@ -79,6 +87,42 @@ func pushServiceDB(t *testing.T, testDB *gorm.DB) {
})
}
+func serviceTestContext(t *testing.T, userID, tenantID string, additionalMemberIDs ...string) context.Context {
+ t.Helper()
+ if dao.DB != nil {
+ sqlDB, err := dao.DB.DB()
+ if err == nil && sqlDB.Ping() == nil {
+ memberIDs := append([]string{userID}, additionalMemberIDs...)
+ if dao.DB.Migrator().HasTable(&entity.UserTenant{}) {
+ for _, memberID := range memberIDs {
+ if memberID == "" {
+ continue
+ }
+ var count int64
+ if err := dao.DB.Model(&entity.UserTenant{}).Where("user_id = ? AND tenant_id = ?", memberID, tenantID).Count(&count).Error; err != nil {
+ t.Fatalf("check test tenant membership: %v", err)
+ }
+ if count != 0 {
+ continue
+ }
+ role := string(permission.RoleNormal)
+ if memberID == tenantID {
+ role = string(permission.RoleOwner)
+ }
+ status := entity.TenantMembershipStatusJoined
+ if err := dao.DB.Create(&entity.UserTenant{
+ ID: common.GenerateToken(), UserID: memberID, TenantID: tenantID, Role: role, Status: &status,
+ }).Error; err != nil {
+ t.Fatalf("create test tenant membership: %v", err)
+ }
+ }
+ }
+ prepareServiceTestContextEE(t, tenantID, memberIDs...)
+ }
+ }
+ return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})
+}
+
func getAPIConversationForTest(t *testing.T, db *gorm.DB, id string) *entity.API4Conversation {
t.Helper()
conversation, err := dao.NewAPI4ConversationDAO().GetByID(t.Context(), db, id)
diff --git a/internal/service/user.go b/internal/service/user.go
index 77208a5e08..aade845600 100644
--- a/internal/service/user.go
+++ b/internal/service/user.go
@@ -750,7 +750,7 @@ type SetTenantInfoRequest struct {
Raw map[string]interface{} `json:"-"`
}
-// SetTenantInfo updates default models on the caller's owner membership.
+// SetTenantInfo updates default models on the caller's current Tenant membership.
func (s *UserService) SetTenantInfo(ctx context.Context, userID string, req *SetTenantInfoRequest) (common.ErrorCode, error) {
if req == nil {
return common.CodeArgumentError, fmt.Errorf("model settings are required")
@@ -759,13 +759,17 @@ func (s *UserService) SetTenantInfo(ctx context.Context, userID string, req *Set
if err != nil {
return common.CodeArgumentError, err
}
- membershipDAO := dao.NewUserTenantDAO()
- membership, err := membershipDAO.GetOwnerByUserID(ctx, dao.DB, userID)
+ tenantID, err := requireCurrentTenantID(ctx, userID)
if err != nil {
return common.CodeForbidden, err
}
- if req.TenantID != nil && strings.TrimSpace(*req.TenantID) != "" && strings.TrimSpace(*req.TenantID) != membership.TenantID {
- return common.CodeForbidden, fmt.Errorf("tenant_id must match the user's tenant")
+ if req.TenantID != nil && strings.TrimSpace(*req.TenantID) != "" && strings.TrimSpace(*req.TenantID) != tenantID {
+ return common.CodeForbidden, fmt.Errorf("tenant_id must match the active Tenant context")
+ }
+ userTenantDAO := dao.NewUserTenantDAO()
+ membership, err := userTenantDAO.FilterByUserIDAndTenantID(ctx, dao.DB, userID, tenantID)
+ if err != nil {
+ return common.CodeForbidden, err
}
if len(updates) > 0 {
if err := dao.DB.WithContext(ctx).Model(&entity.UserTenant{}).Where("id = ?", membership.ID).Updates(updates).Error; err != nil {