Skip to content

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

feat(permission): align resource and agent ownership (#21350)

buua4360b46ece31b86
diff --git a/internal/dao/user_canvas.go b/internal/dao/user_canvas.go
index 61cdfe2d49..c350573cf8 100644
--- a/internal/dao/user_canvas.go
+++ b/internal/dao/user_canvas.go
@@ -77,6 +77,10 @@ func NewUserCanvasDAO() *UserCanvasDAO {
// Create user canvas
func (dao *UserCanvasDAO) Create(ctx context.Context, db *gorm.DB, userCanvas *entity.UserCanvas) error {
+ if userCanvas != nil && (userCanvas.TenantID == nil || strings.TrimSpace(*userCanvas.TenantID) == "") {
+ tenantID := strings.TrimSpace(userCanvas.UserID)
+ userCanvas.TenantID = &tenantID
+ }
return db.WithContext(ctx).Create(userCanvas).Error
}
@@ -182,20 +186,21 @@ func (dao *UserCanvasDAO) GetList(ctx context.Context, db *gorm.DB, tenantID str
// UserCanvasListItem is the joined row returned by ListByIDs.
type UserCanvasListItem struct {
- ID string `gorm:"column:id"`
- Avatar *string `gorm:"column:avatar"`
- Title *string `gorm:"column:title"`
- Description *string `gorm:"column:description"`
- Permission string `gorm:"column:permission"`
- UserID string `gorm:"column:user_id"`
- TenantID string `gorm:"column:tenant_id"`
- Nickname *string `gorm:"column:nickname"`
- TenantAvatar *string `gorm:"column:tenant_avatar"`
- CanvasType *string `gorm:"column:canvas_type"`
- CanvasCategory string `gorm:"column:canvas_category"`
- Tags string `gorm:"column:tags"`
- CreateTime *int64 `gorm:"column:create_time"`
- UpdateTime *int64 `gorm:"column:update_time"`
+ ID string `gorm:"column:id"`
+ Avatar *string `gorm:"column:avatar"`
+ Title *string `gorm:"column:title"`
+ Description *string `gorm:"column:description"`
+ Permission string `gorm:"column:permission"`
+ UserID string `gorm:"column:user_id"`
+ TenantID string `gorm:"column:tenant_id"`
+ Nickname *string `gorm:"column:nickname"`
+ TenantAvatar *string `gorm:"column:tenant_avatar"`
+ CanvasType *string `gorm:"column:canvas_type"`
+ CanvasCategory string `gorm:"column:canvas_category"`
+ OperatorPermission int32 `gorm:"-"`
+ Tags string `gorm:"column:tags"`
+ CreateTime *int64 `gorm:"column:create_time"`
+ UpdateTime *int64 `gorm:"column:update_time"`
}
// ListByIDs lists permission-filtered canvases with optional metadata filters.
@@ -211,7 +216,7 @@ func (dao *UserCanvasDAO) ListByIDs(ctx context.Context, db *gorm.DB, canvasIDs,
user_canvas.description,
user_canvas.permission,
user_canvas.user_id,
- user_canvas.user_id AS tenant_id,
+ COALESCE(NULLIF(user_canvas.tenant_id, ''), user_canvas.user_id) AS tenant_id,
user.nickname,
user.avatar AS tenant_avatar,
user_canvas.canvas_type,
diff --git a/internal/dao/user_canvas_test.go b/internal/dao/user_canvas_test.go
index 0dd1b24381..e0c152df4b 100644
--- a/internal/dao/user_canvas_test.go
+++ b/internal/dao/user_canvas_test.go
@@ -135,6 +135,70 @@ func TestUserCanvasDAOUpdateDSLNoMatch(t *testing.T) {
}
}
+func TestUserCanvasDAOCreatePersistsOwnerAndTenant(t *testing.T) {
+ db := setupUserCanvasTestDB(t)
+ dao := NewUserCanvasDAO()
+ ctx := t.Context()
+
+ ownerID := "canvas-owner"
+ tenantID := "tenant-team"
+ canvases := []*entity.UserCanvas{
+ {ID: "canvas-with-tenant", UserID: ownerID, TenantID: &tenantID},
+ {ID: "canvas-default-tenant", UserID: ownerID},
+ }
+ for _, canvas := range canvases {
+ if err := dao.Create(ctx, db, canvas); err != nil {
+ t.Fatalf("create canvas %q: %v", canvas.ID, err)
+ }
+ }
+
+ for _, test := range []struct {
+ id string
+ wantOwnerID string
+ wantTenantID string
+ }{
+ {id: "canvas-with-tenant", wantOwnerID: ownerID, wantTenantID: tenantID},
+ {id: "canvas-default-tenant", wantOwnerID: ownerID, wantTenantID: ownerID},
+ } {
+ persisted, err := dao.GetByID(ctx, db, test.id)
+ if err != nil {
+ t.Fatalf("load canvas %q: %v", test.id, err)
+ }
+ if persisted.UserID != test.wantOwnerID {
+ t.Errorf("canvas %q user_id = %q, want %q", test.id, persisted.UserID, test.wantOwnerID)
+ }
+ if got := persisted.EffectiveTenantID(); got != test.wantTenantID {
+ t.Errorf("canvas %q tenant_id = %q, want %q", test.id, got, test.wantTenantID)
+ }
+ }
+}
+
+func TestUserCanvasDAOListByIDsReturnsStoredTenantID(t *testing.T) {
+ db := setupUserCanvasTestDB(t)
+ ctx := t.Context()
+ if err := db.AutoMigrate(&entity.User{}); err != nil {
+ t.Fatalf("migrate user table: %v", err)
+ }
+ if err := db.Create(&entity.User{ID: "canvas-owner", Email: "[email protected]", Nickname: "Owner"}).Error; err != nil {
+ t.Fatalf("create canvas owner: %v", err)
+ }
+ tenantID := "tenant-team"
+ if err := db.Create(&entity.UserCanvas{ID: "canvas-1", UserID: "canvas-owner", TenantID: &tenantID}).Error; err != nil {
+ t.Fatalf("create canvas: %v", err)
+ }
+
+ items, _, err := NewUserCanvasDAO().ListByIDs(ctx, db, []string{"canvas-1"}, nil, 1, 10, nil, "", nil, "", nil)
+ if err != nil {
+ t.Fatalf("list canvas: %v", err)
+ }
+ if len(items) != 1 {
+ t.Fatalf("canvas list length = %d, want 1", len(items))
+ }
+ if items[0].UserID != "canvas-owner" || items[0].TenantID != tenantID {
+ t.Fatalf("listed owner/tenant = %q/%q, want canvas-owner/%q", items[0].UserID, items[0].TenantID, tenantID)
+ }
+}
+
func TestUserCanvasDAOListTagsIncludesPipelineWhenCategoryIsEmpty(t *testing.T) {
db := setupUserCanvasTestDB(t)
pushDB(t, db)
diff --git a/internal/entity/canvas.go b/internal/entity/canvas.go
index 464ee00616..fe333306b9 100644
--- a/internal/entity/canvas.go
+++ b/internal/entity/canvas.go
@@ -16,20 +16,23 @@
package entity
+import "strings"
+
// UserCanvas user canvas model
type UserCanvas struct {
- ID string `gorm:"column:id;primaryKey;size:32" json:"id"`
- Avatar *string `gorm:"column:avatar;type:longtext" json:"avatar,omitempty"`
- UserID string `gorm:"column:user_id;size:255;not null;index" json:"user_id"`
- TenantID *string `gorm:"column:tenant_id;size:32" json:"tenant_id,omitempty"`
- Tags string `gorm:"column:tags;size:512;not null;default:'';index" json:"tags"`
- Title *string `gorm:"column:title;size:255" json:"title,omitempty"`
- Permission string `gorm:"column:permission;size:16;not null;default:me;index" json:"permission"`
- Release bool `gorm:"column:release;not null;default:false;index" json:"release"`
- Description *string `gorm:"column:description;type:longtext" json:"description,omitempty"`
- CanvasType *string `gorm:"column:canvas_type;size:32;index" json:"canvas_type,omitempty"`
- CanvasCategory string `gorm:"column:canvas_category;size:32;not null;default:agent_canvas;index" json:"canvas_category"`
- DSL JSONMap `gorm:"column:dsl;type:longtext" json:"dsl,omitempty"`
+ ID string `gorm:"column:id;primaryKey;size:32" json:"id"`
+ Avatar *string `gorm:"column:avatar;type:longtext" json:"avatar,omitempty"`
+ UserID string `gorm:"column:user_id;size:255;not null;index" json:"user_id"`
+ TenantID *string `gorm:"column:tenant_id;size:32" json:"tenant_id,omitempty"`
+ Tags string `gorm:"column:tags;size:512;not null;default:'';index" json:"tags"`
+ Title *string `gorm:"column:title;size:255" json:"title,omitempty"`
+ Permission string `gorm:"column:permission;size:16;not null;default:me;index" json:"permission"`
+ Release bool `gorm:"column:release;not null;default:false;index" json:"release"`
+ Description *string `gorm:"column:description;type:longtext" json:"description,omitempty"`
+ CanvasType *string `gorm:"column:canvas_type;size:32;index" json:"canvas_type,omitempty"`
+ CanvasCategory string `gorm:"column:canvas_category;size:32;not null;default:agent_canvas;index" json:"canvas_category"`
+ DSL JSONMap `gorm:"column:dsl;type:longtext" json:"dsl,omitempty"`
+ OperatorPermission int32 `gorm:"-" json:"operator_permission,omitempty"`
BaseModel
}
@@ -38,6 +41,20 @@ func (UserCanvas) TableName() string {
return "user_canvas"
}
+// EffectiveTenantID returns the canvas tenant, falling back to its creator for
+// rows written before tenant_id was populated.
+func (canvas *UserCanvas) EffectiveTenantID() string {
+ if canvas == nil {
+ return ""
+ }
+ if canvas.TenantID != nil {
+ if tenantID := strings.TrimSpace(*canvas.TenantID); tenantID != "" {
+ return tenantID
+ }
+ }
+ return strings.TrimSpace(canvas.UserID)
+}
+
// CanvasTemplate canvas template model
type CanvasTemplate struct {
ID string `gorm:"column:id;primaryKey;size:32" json:"id"`
diff --git a/internal/entity/user_tenant.go b/internal/entity/user_tenant.go
index b7db6d0191..b1df27aaea 100644
--- a/internal/entity/user_tenant.go
+++ b/internal/entity/user_tenant.go
@@ -16,6 +16,15 @@
package entity
+const (
+ TenantMembershipStatusRemoved = "0"
+ TenantMembershipStatusJoined = "1"
+ TenantMembershipStatusInvited = "2"
+ TenantMembershipStatusRejected = "3"
+ TenantMembershipStatusRequested = "4"
+ TenantMembershipStatusLeft = "5"
+)
+
// UserTenant user tenant relationship model
type UserTenant struct {
ID string `gorm:"column:id;primaryKey;size:32" json:"id"`
diff --git a/internal/handler/agent.go b/internal/handler/agent.go
index 6073ad9a51..094c6c9115 100644
--- a/internal/handler/agent.go
+++ b/internal/handler/agent.go
@@ -346,7 +346,7 @@ func (h *AgentHandler) GetAgent(c *gin.Context) {
}
tenantID := ""
if row != nil {
- tenantID = row.UserID
+ tenantID = row.EffectiveTenantID()
}
common.SuccessWithData(c, &agentDetailResponse{
UserCanvas: row,
@@ -355,9 +355,7 @@ func (h *AgentHandler) GetAgent(c *gin.Context) {
}, "success")
}
-// agentDetailResponse adds the canvas owner's tenant scope and publish time.
-// user_canvas stores the owner identity in user_id, so that value is exposed
-// as tenant_id for resource-scoped selectors.
+// agentDetailResponse adds the canvas tenant scope and publish time.
type agentDetailResponse struct {
*entity.UserCanvas
TenantID string `json:"tenant_id"`
diff --git a/internal/handler/agent_test.go b/internal/handler/agent_test.go
index 13b8066b3a..5233c25917 100644
--- a/internal/handler/agent_test.go
+++ b/internal/handler/agent_test.go
@@ -35,6 +35,7 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
+ "ragflow/internal/permission"
"ragflow/internal/service"
"ragflow/internal/tokenizer"
)
@@ -317,6 +318,7 @@ func TestCreateAgentUsesAuthenticatedUserID(t *testing.T) {
"title":"Agent",
"dsl":{}
}`))
+ seedAgentCreationContext(t, c, db)
h := NewAgentHandler(t.Context(), service.NewAgentService(), nil)
h.CreateAgent(c)
@@ -331,6 +333,51 @@ func TestCreateAgentUsesAuthenticatedUserID(t *testing.T) {
if created.UserID != "user-1" {
t.Fatalf("created agent owner = %q, want authenticated user user-1", created.UserID)
}
+ if created.EffectiveTenantID() == "" {
+ t.Fatal("created agent has no tenant_id")
+ }
+}
+
+func seedAgentCreationContext(t *testing.T, c *gin.Context, db *gorm.DB) {
+ t.Helper()
+ if err := db.AutoMigrate(&entity.Tenant{}); err != nil {
+ t.Fatalf("migrate tenant table: %v", err)
+ }
+ active := string(entity.StatusValid)
+ if err := db.Create(&entity.User{ID: "user-1", Email: "[email protected]", Nickname: "user-1"}).Error; err != nil {
+ t.Fatalf("create authenticated user: %v", err)
+ }
+ if err := db.Create(&entity.Tenant{ID: "tenant-1", Status: &active}).Error; err != nil {
+ t.Fatalf("create active tenant: %v", err)
+ }
+ if err := db.Create(&entity.UserTenant{
+ ID: "membership-1", UserID: "user-1", TenantID: "tenant-1", Role: string(permission.RoleOwner), Status: &active,
+ }).Error; err != nil {
+ t.Fatalf("create active tenant membership: %v", err)
+ }
+ for _, statement := range []string{
+ `CREATE TABLE permission (
+ id TEXT PRIMARY KEY, member_id TEXT, group_id TEXT, tenant_id TEXT NOT NULL,
+ resource_type TEXT NOT NULL, resource_id TEXT, permission INTEGER NOT NULL DEFAULT 0,
+ status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME
+ )`,
+ `CREATE TABLE permission_change_log (
+ id TEXT PRIMARY KEY, tenant_id TEXT NOT NULL, operator_id TEXT NOT NULL,
+ target_type TEXT NOT NULL, target_id TEXT NOT NULL, resource_type TEXT NOT NULL,
+ resource_id TEXT NOT NULL, old_permission INTEGER NOT NULL DEFAULT 0,
+ new_permission INTEGER NOT NULL DEFAULT 0, action_type TEXT NOT NULL, reason TEXT,
+ event_type TEXT NOT NULL DEFAULT '', actor_user_id TEXT,
+ scope_type TEXT NOT NULL DEFAULT 'tenant', before_data TEXT, after_data TEXT,
+ status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME
+ )`,
+ } {
+ if err := db.Exec(statement).Error; err != nil {
+ t.Fatalf("create Agent permission test table: %v", err)
+ }
+ }
+ c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{
+ UserID: "user-1", TenantID: "tenant-1",
+ }))
}
// sptr returns a pointer to the given string.
diff --git a/internal/permission/chat_channel_database_test.go b/internal/permission/chat_channel_database_test.go
index 858793049d..3b98f556dd 100644
--- a/internal/permission/chat_channel_database_test.go
+++ b/internal/permission/chat_channel_database_test.go
@@ -40,7 +40,7 @@ func TestDatabaseCheckerScopesChatChannelsToTenantMembers(t *testing.T) {
t.Fatalf("create tenant membership: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
member := Subject{UserID: "member-a"}
for _, operation := range []Operation{OperationRead, OperationUpdate, OperationDelete, OperationUse} {
if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindChatChannel, ID: "team-channel"}, operation); err != nil {
diff --git a/internal/permission/database_source.go b/internal/permission/database_source.go
index 96b733931f..7816b6da69 100644
--- a/internal/permission/database_source.go
+++ b/internal/permission/database_source.go
@@ -77,7 +77,7 @@ func (s *databaseSource) GetMembership(ctx context.Context, userID, tenantID str
func (s *databaseSource) resolveMembershipRole(ctx context.Context, tenantID, roleValue string) (TenantRole, bool, error) {
role := TenantRole(strings.TrimSpace(roleValue))
switch role {
- case RoleOwner, RoleAdmin, RoleNormal, RoleInvite:
+ case RoleOwner, RoleAdmin, RoleNormal:
return role, true, nil
}
valid, err := isTenantRoleID(ctx, s.db, tenantID, string(role))
@@ -121,7 +121,7 @@ func (s *databaseSource) activeTenantIDsForUser(ctx context.Context, userID stri
if result.err != nil {
return nil, result.err
}
- if result.valid && result.role != RoleInvite {
+ if result.valid {
tenantIDs = append(tenantIDs, membership.TenantID)
}
}
@@ -134,6 +134,7 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (
}
refs = uniqueRefs(refs)
datasetIDs := make([]string, 0, len(refs))
+ documentIDs := make([]string, 0, len(refs))
canvasIDs := make([]string, 0, len(refs))
agentSessionIDs := make([]string, 0, len(refs))
memoryIDs := make([]string, 0, len(refs))
@@ -153,6 +154,8 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (
switch ref.Kind {
case ResourceKindDataset:
datasetIDs = append(datasetIDs, ref.ID)
+ case ResourceKindDocument:
+ documentIDs = append(documentIDs, ref.ID)
case ResourceKindCanvas:
canvasIDs = append(canvasIDs, ref.ID)
case ResourceKindAgentSession:
@@ -201,6 +204,14 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (
for _, session := range chatSessionsByID {
chatIDs = append(chatIDs, session.DialogID)
}
+ documentsByID, err := s.loadDocuments(ctx, documentIDs)
+ if err != nil {
+ return nil, err
+ }
+ for _, document := range documentsByID {
+ datasetIDs = append(datasetIDs, document.KbID)
+ }
+ datasetIDs = uniqueStringValues(datasetIDs)
var datasetsByID map[string]*entity.Knowledgebase
var ownerIDsByTenant map[string]string
if len(datasetIDs) > 0 {
@@ -235,6 +246,20 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (
if err != nil {
return nil, err
}
+ fileTenantIDs := make([]string, 0, len(filesByID))
+ for _, file := range filesByID {
+ fileTenantIDs = append(fileTenantIDs, file.TenantID)
+ }
+ fileOwnerIDsByTenant, err := s.loadTenantOwnerIDs(ctx, fileTenantIDs)
+ if err != nil {
+ return nil, err
+ }
+ if linkedOwnerIDsByTenant == nil {
+ linkedOwnerIDsByTenant = make(map[string]string, len(fileOwnerIDsByTenant))
+ }
+ for tenantID, ownerUserID := range fileOwnerIDsByTenant {
+ linkedOwnerIDsByTenant[tenantID] = ownerUserID
+ }
searchAppsByID, err := s.loadSearchApps(ctx, searchAppIDs)
if err != nil {
return nil, err
@@ -315,6 +340,12 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (
if dataset, ok := datasetsByID[ref.ID]; ok {
resources = append(resources, datasetResource(dataset, ownerIDsByTenant))
}
+ case ResourceKindDocument:
+ if document, documentExists := documentsByID[ref.ID]; documentExists {
+ if dataset, datasetExists := datasetsByID[document.KbID]; datasetExists {
+ resources = append(resources, documentResource(document, dataset, ownerIDsByTenant))
+ }
+ }
case ResourceKindCanvas:
if canvas, ok := canvasesByID[ref.ID]; ok {
resources = append(resources, canvasResource(canvas))
@@ -468,6 +499,15 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
if err != nil {
return nil, err
}
+ case ResourceKindDocument:
+ if parent.Kind != ResourceKindDataset || strings.TrimSpace(parent.ID) == "" {
+ return nil, fmt.Errorf("%w: documents require a dataset parent scope", ErrInvalidPermission)
+ }
+ if err := s.db.WithContext(ctx).Model(&entity.Document{}).
+ Where("kb_id = ? AND status = ?", parent.ID, string(entity.StatusValid)).
+ Pluck("id", &ids).Error; err != nil {
+ return nil, err
+ }
case ResourceKindCanvas:
if parent.ID != "" || parent.Kind != "" {
return nil, fmt.Errorf("%w: canvases cannot have a parent scope", ErrInvalidPermission)
@@ -478,7 +518,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
}
ownerIDs := append(append(make([]string, 0, len(tenantIDs)+1), tenantIDs...), subject.UserID)
if err := s.db.WithContext(ctx).Model(&entity.UserCanvas{}).
- Where("user_id IN ?", ownerIDs).
+ Where("user_id IN ? OR tenant_id IN ?", ownerIDs, tenantIDs).
Pluck("id", &ids).Error; err != nil {
return nil, err
}
@@ -950,6 +990,26 @@ func (s *databaseSource) loadMemories(ctx context.Context, ids []string) (map[st
return memoriesByID, nil
}
+func (s *databaseSource) loadDocuments(ctx context.Context, ids []string) (map[string]*entity.Document, error) {
+ documentsByID := make(map[string]*entity.Document)
+ if len(ids) == 0 {
+ return documentsByID, nil
+ }
+ query := s.db.WithContext(ctx).Model(&entity.Document{}).
+ Where("id IN ? AND status = ?", ids, string(entity.StatusValid))
+ if s.lockRows {
+ query = query.Clauses(clause.Locking{Strength: "UPDATE"})
+ }
+ var documents []*entity.Document
+ if err := query.Find(&documents).Error; err != nil {
+ return nil, err
+ }
+ for _, document := range documents {
+ documentsByID[document.ID] = document
+ }
+ return documentsByID, nil
+}
+
func (s *databaseSource) loadDatasets(ctx context.Context, ids []string) (map[string]*entity.Knowledgebase, map[string]string, error) {
datasetsByID := make(map[string]*entity.Knowledgebase)
if len(ids) == 0 {
@@ -1009,14 +1069,31 @@ func datasetResource(dataset *entity.Knowledgebase, ownerIDsByTenant map[string]
}
}
+func documentResource(document *entity.Document, dataset *entity.Knowledgebase, ownerIDsByTenant map[string]string) Resource {
+ datasetAccess := datasetResource(dataset, ownerIDsByTenant)
+ return Resource{
+ Ref: ResourceRef{Kind: ResourceKindDocument, ID: document.ID},
+ TenantID: datasetAccess.TenantID,
+ CreatedBy: document.CreatedBy,
+ OwnerUserID: document.CreatedBy,
+ Visibility: datasetAccess.Visibility,
+ TenantRequirement: datasetAccess.TenantRequirement,
+ OwnerOperations: datasetAccess.OwnerOperations,
+ TenantOperations: datasetAccess.TenantOperations,
+ CreatorOperations: datasetAccess.CreatorOperations,
+ Active: datasetAccess.Active && document.Status != nil && *document.Status == string(entity.StatusValid),
+ }
+}
+
func canvasResource(canvas *entity.UserCanvas) Resource {
+ tenantID := canvas.EffectiveTenantID()
visibility := VisibilityPrivate
if canvas.Permission == string(entity.TenantPermissionTeam) {
visibility = VisibilityTenant
}
return Resource{
Ref: ResourceRef{Kind: ResourceKindCanvas, ID: canvas.ID},
- TenantID: canvas.UserID,
+ TenantID: tenantID,
CreatedBy: canvas.UserID,
OwnerUserID: canvas.UserID,
Visibility: visibility,
@@ -1028,9 +1105,10 @@ func canvasResource(canvas *entity.UserCanvas) Resource {
}
func agentSessionResource(session *entity.API4Conversation, canvas *entity.UserCanvas) Resource {
+ tenantID := canvas.EffectiveTenantID()
return Resource{
Ref: ResourceRef{Kind: ResourceKindAgentSession, ID: session.ID},
- TenantID: canvas.UserID,
+ TenantID: tenantID,
CreatedBy: session.UserID,
OwnerUserID: session.UserID,
Visibility: VisibilityPrivate,
@@ -1163,11 +1241,18 @@ func fileResource(kind ResourceKind, file *entity.File, datasetIDs []string, dat
if len(sharedWithUserIDs) > 0 || len(sharedWithTenantIDs) > 0 {
visibility = VisibilityShared
}
+ ownerUserID := strings.TrimSpace(file.CreatedBy)
+ if ownerUserID == "" {
+ ownerUserID = strings.TrimSpace(ownerIDsByTenant[file.TenantID])
+ }
+ if ownerUserID == "" {
+ ownerUserID = strings.TrimSpace(file.TenantID)
+ }
return Resource{
Ref: ResourceRef{Kind: kind, ID: file.ID},
TenantID: file.TenantID,
CreatedBy: file.CreatedBy,
- OwnerUserID: file.TenantID,
+ OwnerUserID: ownerUserID,
Visibility: visibility,
OwnerOperations: []Operation{OperationRead, OperationCreate, OperationUpdate, OperationDelete, OperationShare, OperationRun, OperationUse},
SharedWithUserIDs: sharedWithUserIDs,
diff --git a/internal/permission/database_source_test.go b/internal/permission/database_source_test.go
index c64225a3dd..ed00d340f5 100644
--- a/internal/permission/database_source_test.go
+++ b/internal/permission/database_source_test.go
@@ -15,6 +15,10 @@ import (
"gorm.io/gorm"
)
+func newCommunityDatabaseChecker(db *gorm.DB) *Checker {
+ return &Checker{policy: &communityPolicy{source: &databaseSource{db: db}}}
+}
+
func TestDatabaseCheckerAuthorizesDatasetFromPersistedRows(t *testing.T) {
db, err := gorm.Open(sqlite.Open("file:"+url.QueryEscape(t.Name())+"?mode=memory&cache=shared"), &gorm.Config{})
if err != nil {
@@ -47,7 +51,7 @@ func TestDatabaseCheckerAuthorizesDatasetFromPersistedRows(t *testing.T) {
t.Fatalf("create owner membership: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
subject := Subject{UserID: membership.UserID}
resources, err := (&databaseSource{db: db}).GetResources(context.Background(), []ResourceRef{{
Kind: ResourceKindDataset,
@@ -116,19 +120,20 @@ func TestDatabaseCheckerValidatesTenantRoleIDsAndLegacyMembershipRoles(t *testin
}
valid := string(entity.StatusValid)
+ invited := entity.TenantMembershipStatusInvited
memberships := []entity.UserTenant{
{ID: "role-member", UserID: "role-user", TenantID: "tenant-1", Role: "17", Status: &valid},
{ID: "wrong-tenant-role", UserID: "foreign-role-user", TenantID: "tenant-2", Role: "17", Status: &valid},
{ID: "unknown-role", UserID: "unknown-role-user", TenantID: "tenant-1", Role: "not-a-role", Status: &valid},
{ID: "admin", UserID: "admin-user", TenantID: "tenant-1", Role: string(RoleAdmin), Status: &valid},
{ID: "normal", UserID: "normal-user", TenantID: "tenant-1", Role: string(RoleNormal), Status: &valid},
- {ID: "invite", UserID: "invite-user", TenantID: "tenant-1", Role: string(RoleInvite), Status: &valid},
+ {ID: "invite", UserID: "invite-user", TenantID: "tenant-1", Status: &invited},
}
if err := db.Create(&memberships).Error; err != nil {
t.Fatalf("create memberships: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
if err := checker.CheckTenant(t.Context(), Subject{UserID: "role-user"}, "tenant-1", TenantMember); err != nil {
t.Fatalf("valid Tenant role ID should be normalized to an ordinary member: %v", err)
}
@@ -192,7 +197,7 @@ func TestDatabaseCheckerRejectsPrivateDatasetForOtherTenantMember(t *testing.T)
t.Fatalf("create owner membership: %v", err)
}
- err = NewDatabaseChecker(db).CheckResource(context.Background(), Subject{UserID: membership.UserID}, ResourceRef{
+ err = newCommunityDatabaseChecker(db).CheckResource(context.Background(), Subject{UserID: membership.UserID}, ResourceRef{
Kind: ResourceKindDataset,
ID: dataset.ID,
}, OperationRead)
@@ -233,7 +238,7 @@ func TestDatabaseCheckerScopesDatasetsToMembershipAndVisibility(t *testing.T) {
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
scope, err := checker.Scope(context.Background(), Subject{UserID: "member-user"}, ScopeQuery{
Kind: ResourceKindDataset, Operation: OperationRead,
})
@@ -360,7 +365,7 @@ func TestDatabaseCheckerSharedCanvasRestrictsOwnerOperations(t *testing.T) {
if err := db.Create(&adminMembership).Error; err != nil {
t.Fatalf("create admin membership: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
teamCanvas := ResourceRef{Kind: ResourceKindCanvas, ID: "team-canvas"}
privateCanvas := ResourceRef{Kind: ResourceKindCanvas, ID: "private-canvas"}
@@ -400,6 +405,45 @@ func TestDatabaseCheckerSharedCanvasRestrictsOwnerOperations(t *testing.T) {
}
}
+func TestDatabaseCheckerListsTenantCanvasCreatedByAnotherMember(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.UserCanvas{}, &entity.UserTenant{}); err != nil {
+ t.Fatalf("migrate permission tables: %v", err)
+ }
+
+ valid := string(entity.StatusValid)
+ tenantID := "tenant-1"
+ otherTenantID := "tenant-2"
+ membership := entity.UserTenant{
+ ID: "member-tenant-1", UserID: "member-1", TenantID: tenantID,
+ Role: string(RoleNormal), Status: &valid,
+ }
+ if err := db.Create(&membership).Error; err != nil {
+ t.Fatalf("create tenant membership: %v", err)
+ }
+ canvases := []entity.UserCanvas{
+ {ID: "shared-canvas", UserID: "creator-1", TenantID: &tenantID, Permission: string(entity.TenantPermissionTeam)},
+ {ID: "private-canvas", UserID: "creator-1", TenantID: &tenantID, Permission: string(entity.TenantPermissionMe)},
+ {ID: "other-tenant-canvas", UserID: "creator-2", TenantID: &otherTenantID, Permission: string(entity.TenantPermissionTeam)},
+ }
+ if err := db.Create(&canvases).Error; err != nil {
+ t.Fatalf("create canvases: %v", err)
+ }
+
+ scope, err := newCommunityDatabaseChecker(db).Scope(context.Background(), Subject{UserID: membership.UserID}, ScopeQuery{
+ Kind: ResourceKindCanvas, Operation: OperationRead,
+ })
+ if err != nil {
+ t.Fatalf("Scope(canvases) error = %v", err)
+ }
+ if scope.Mode != ScopeIDs || len(scope.ResourceIDs) != 1 || scope.ResourceIDs[0] != "shared-canvas" {
+ t.Fatalf("Scope(canvases) = %+v, want only shared-canvas", scope)
+ }
+}
+
func TestDatabaseCheckerRestrictsAgentSessionRunToCreator(t *testing.T) {
db, err := gorm.Open(sqlite.Open("file:"+url.QueryEscape(t.Name())+"?mode=memory&cache=shared"), &gorm.Config{})
if err != nil {
@@ -414,7 +458,7 @@ func TestDatabaseCheckerRestrictsAgentSessionRunToCreator(t *testing.T) {
if err := db.Create(&entity.API4Conversation{ID: "session-1", DialogID: "canvas-1", UserID: "session-owner"}).Error; err != nil {
t.Fatalf("create session: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
session := ResourceRef{Kind: ResourceKindAgentSession, ID: "session-1"}
if err := checker.CheckResource(context.Background(), Subject{UserID: "session-owner"}, session, OperationRun); err != nil {
t.Fatalf("session owner CheckResource(run) error = %v, want nil", err)
@@ -464,7 +508,7 @@ func TestDatabaseCheckerAuthorizesMemoryFromPersistedRows(t *testing.T) {
t.Fatalf("create membership: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
teamRef := ResourceRef{Kind: ResourceKindMemory, ID: "team-memory"}
privateRef := ResourceRef{Kind: ResourceKindMemory, ID: "private-memory"}
resources, err := (&databaseSource{db: db}).GetResources(context.Background(), []ResourceRef{teamRef, privateRef})
@@ -530,7 +574,7 @@ func TestDatabaseCheckerScopesMemoriesToOwnerAndTeamMembership(t *testing.T) {
}
}
- scope, err := NewDatabaseChecker(db).Scope(context.Background(), Subject{UserID: "member-1"}, ScopeQuery{
+ scope, err := newCommunityDatabaseChecker(db).Scope(context.Background(), Subject{UserID: "member-1"}, ScopeQuery{
Kind: ResourceKindMemory, Operation: OperationRead,
})
if err != nil {
@@ -611,7 +655,7 @@ func TestDatabaseCheckerAuthorizesFilesThroughLinkedDatasetAccess(t *testing.T)
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
teamFile := ResourceRef{Kind: ResourceKindFile, ID: "team-file"}
if err := checker.CheckResource(context.Background(), Subject{UserID: "team-member"}, teamFile, OperationRead); err != nil {
t.Errorf("team member CheckResource(file read) error = %v, want nil", err)
@@ -637,8 +681,8 @@ func TestDatabaseCheckerAuthorizesFilesThroughLinkedDatasetAccess(t *testing.T)
t.Fatalf("loaded %d file resources, want 1", len(resources))
}
resource := resources[0]
- if resource.TenantID != "file-owner" || resource.OwnerUserID != "file-owner" || resource.CreatedBy != "file-creator" {
- t.Errorf("file authorization facts = %+v, want tenant/owner file-owner and creator file-creator", resource)
+ if resource.TenantID != "file-owner" || resource.OwnerUserID != "file-creator" || resource.CreatedBy != "file-creator" {
+ t.Errorf("file authorization facts = %+v, want tenant file-owner and creator/owner file-creator", resource)
}
if resource.Visibility != VisibilityShared || len(resource.SharedWithTenantIDs) != 1 || resource.SharedWithTenantIDs[0] != "team-tenant" || len(resource.SharedWithUserIDs) != 1 || resource.SharedWithUserIDs[0] != "team-owner" {
t.Errorf("file sharing facts = %+v, want team tenant and its owner", resource)
@@ -665,7 +709,7 @@ func TestDatabaseCheckerScopesFilesAndFoldersToOwnedFolder(t *testing.T) {
t.Fatalf("create file %q: %v", files[i].ID, err)
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
parent := ResourceRef{Kind: ResourceKindFolder, ID: "root"}
for _, test := range []struct {
kind ResourceKind
@@ -698,6 +742,47 @@ func TestDatabaseCheckerScopesFilesAndFoldersToOwnedFolder(t *testing.T) {
}
}
+func TestFileResourceFallsBackToTenantOwnerWhenCreatorIsMissing(t *testing.T) {
+ resource := fileResource(ResourceKindFile, &entity.File{
+ ID: "legacy-file",
+ TenantID: "owner-user",
+ }, nil, nil, nil)
+ if resource.OwnerUserID != "owner-user" {
+ t.Fatalf("legacy file owner = %q, want tenant owner %q", resource.OwnerUserID, "owner-user")
+ }
+}
+
+func TestDatabaseSourceResolvesFileOwnerFromItsTenant(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.File{}, &entity.File2Document{}, &entity.Document{}, &entity.Knowledgebase{}, &entity.UserTenant{}); err != nil {
+ t.Fatalf("migrate permission tables: %v", err)
+ }
+
+ valid := string(entity.StatusValid)
+ if err := db.Create(&entity.UserTenant{
+ ID: "tenant-owner-membership", UserID: "tenant-owner", TenantID: "tenant-1",
+ Role: string(RoleOwner), Status: &valid,
+ }).Error; err != nil {
+ t.Fatalf("create tenant owner membership: %v", err)
+ }
+ if err := db.Create(&entity.File{
+ ID: "legacy-file", TenantID: "tenant-1", CreatedBy: "", Name: "legacy.pdf", Type: "pdf",
+ }).Error; err != nil {
+ t.Fatalf("create legacy file: %v", err)
+ }
+
+ resources, err := (&databaseSource{db: db}).GetResources(context.Background(), []ResourceRef{{Kind: ResourceKindFile, ID: "legacy-file"}})
+ if err != nil {
+ t.Fatalf("load file authorization facts: %v", err)
+ }
+ if len(resources) != 1 || resources[0].TenantID != "tenant-1" || resources[0].OwnerUserID != "tenant-owner" {
+ t.Fatalf("file authorization facts = %+v, want tenant tenant-1 and owner tenant-owner", resources)
+ }
+}
+
func TestDatabaseCheckerKeepsChatsPrivateToTheirOwner(t *testing.T) {
db, err := gorm.Open(sqlite.Open("file:"+url.QueryEscape(t.Name())+"?mode=memory&cache=shared"), &gorm.Config{})
if err != nil {
@@ -708,6 +793,7 @@ func TestDatabaseCheckerKeepsChatsPrivateToTheirOwner(t *testing.T) {
}
valid := string(entity.StatusValid)
invalid := string(entity.StatusInvalid)
+ invited := entity.TenantMembershipStatusInvited
chats := []entity.Chat{
{ID: "team-chat", TenantID: "team-tenant", LLMSetting: entity.JSONMap{}, PromptConfig: entity.JSONMap{}, KBIDs: entity.JSONSlice{}, DoRefer: "1", Status: &valid},
{ID: "inactive-chat", TenantID: "team-tenant", LLMSetting: entity.JSONMap{}, PromptConfig: entity.JSONMap{}, KBIDs: entity.JSONSlice{}, DoRefer: "1", Status: &invalid},
@@ -725,13 +811,13 @@ func TestDatabaseCheckerKeepsChatsPrivateToTheirOwner(t *testing.T) {
t.Fatalf("create membership: %v", err)
}
inviteMembership := entity.UserTenant{
- ID: "invite-team", UserID: "invite-1", TenantID: "team-tenant", Role: string(RoleInvite), Status: &valid,
+ ID: "invite-team", UserID: "invite-1", TenantID: "team-tenant", Status: &invited,
}
if err := db.Create(&inviteMembership).Error; err != nil {
t.Fatalf("create invite membership: %v", err)
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
teamChat := ResourceRef{Kind: ResourceKindChat, ID: "team-chat"}
member := Subject{UserID: membership.UserID}
for _, operation := range []Operation{OperationRead, OperationCreate, OperationRun, OperationUse} {
@@ -801,7 +887,7 @@ func TestDatabaseCheckerScopesChatSessionsAndRestrictsMutations(t *testing.T) {
t.Fatalf("create membership %q: %v", memberships[i].ID, err)
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
creatorSession := ResourceRef{Kind: ResourceKindChatSession, ID: "creator-session"}
reader := Subject{UserID: "team-reader"}
if err := checker.CheckResource(context.Background(), reader, creatorSession, OperationRead); err != nil {
@@ -851,6 +937,7 @@ func TestDatabaseCheckerKeepsSearchAppsPrivateToTheirCreator(t *testing.T) {
}
valid := string(entity.StatusValid)
invalid := string(entity.StatusInvalid)
+ invited := entity.TenantMembershipStatusInvited
searchApps := []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: "Personal search", SearchConfig: entity.JSONMap{}, Status: &valid},
@@ -865,7 +952,7 @@ func TestDatabaseCheckerKeepsSearchAppsPrivateToTheirCreator(t *testing.T) {
memberships := []entity.UserTenant{
{ID: "member-team", UserID: "member-1", TenantID: "team-tenant", Role: string(RoleNormal), Status: &valid},
{ID: "owner-team", UserID: "team-owner", TenantID: "team-tenant", Role: string(RoleOwner), Status: &valid},
- {ID: "invite-team", UserID: "invite-1", TenantID: "team-tenant", Role: string(RoleInvite), Status: &valid},
+ {ID: "invite-team", UserID: "invite-1", TenantID: "team-tenant", Status: &invited},
}
for i := range memberships {
if err := db.Create(&memberships[i]).Error; err != nil {
@@ -873,7 +960,7 @@ func TestDatabaseCheckerKeepsSearchAppsPrivateToTheirCreator(t *testing.T) {
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
teamSearch := ResourceRef{Kind: ResourceKindSearchApp, ID: "team-search"}
member := Subject{UserID: "member-1"}
if err := checker.CheckResource(context.Background(), member, teamSearch, OperationRead); !errors.Is(err, ErrPermissionDenied) {
@@ -936,6 +1023,7 @@ func TestDatabaseCheckerAuthorizesConnectorsAndSyncTasks(t *testing.T) {
}
valid := string(entity.StatusValid)
+ invited := entity.TenantMembershipStatusInvited
connectors := []entity.Connector{
{ID: "personal-connector", TenantID: "team-member", Name: "Personal", Source: "rest", InputType: "poll", Config: entity.JSONMap{}, Status: "5"},
{ID: "team-connector", TenantID: "team-tenant", Name: "Team", Source: "rest", InputType: "poll", Config: entity.JSONMap{}, Status: "5"},
@@ -975,7 +1063,7 @@ func TestDatabaseCheckerAuthorizesConnectorsAndSyncTasks(t *testing.T) {
memberships := []entity.UserTenant{
{ID: "member-link", UserID: "team-member", TenantID: "team-tenant", Role: string(RoleNormal), Status: &valid},
{ID: "owner-link", UserID: "team-owner", TenantID: "team-tenant", Role: string(RoleOwner), Status: &valid},
- {ID: "invite-link", UserID: "invited-user", TenantID: "team-tenant", Role: string(RoleInvite), Status: &valid},
+ {ID: "invite-link", UserID: "invited-user", TenantID: "team-tenant", Status: &invited},
}
for i := range memberships {
if err := db.Create(&memberships[i]).Error; err != nil {
@@ -983,7 +1071,7 @@ func TestDatabaseCheckerAuthorizesConnectorsAndSyncTasks(t *testing.T) {
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
member := Subject{UserID: "team-member"}
teamConnector := ResourceRef{Kind: ResourceKindConnector, ID: "team-connector"}
for _, operation := range []Operation{OperationRun, OperationUse} {
@@ -1088,10 +1176,11 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
}
}
valid := string(entity.StatusValid)
+ invited := entity.TenantMembershipStatusInvited
memberships := []entity.UserTenant{
{ID: "team-owner-membership", UserID: "team-owner", TenantID: "team-tenant", Role: string(RoleOwner), Status: &valid},
{ID: "team-member-membership", UserID: "team-member", TenantID: "team-tenant", Role: string(RoleNormal), Status: &valid},
- {ID: "team-invite-membership", UserID: "team-invite", TenantID: "team-tenant", Role: string(RoleInvite), Status: &valid},
+ {ID: "team-invite-membership", UserID: "team-invite", TenantID: "team-tenant", Status: &invited},
{ID: "other-owner-membership", UserID: "other-owner", TenantID: "other-tenant", Role: string(RoleOwner), Status: &valid},
}
for i := range memberships {
@@ -1100,7 +1189,7 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
member := Subject{UserID: "team-member"}
providerRef := ResourceRef{Kind: ResourceKindModelProvider, ID: "team-provider"}
instanceRef := ResourceRef{Kind: ResourceKindModelInstance, ID: "team-instance"}
@@ -1193,10 +1282,11 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
}
valid := string(entity.StatusValid)
+ invited := entity.TenantMembershipStatusInvited
memberships := []entity.UserTenant{
{ID: "team-owner-membership", UserID: "team-owner", TenantID: "team-tenant", Role: string(RoleOwner), Status: &valid},
{ID: "team-member-membership", UserID: "team-member", TenantID: "team-tenant", Role: string(RoleNormal), Status: &valid},
- {ID: "team-invite-membership", UserID: "team-invite", TenantID: "team-tenant", Role: string(RoleInvite), Status: &valid},
+ {ID: "team-invite-membership", UserID: "team-invite", TenantID: "team-tenant", Status: &invited},
{ID: "other-owner-membership", UserID: "other-owner", TenantID: "other-tenant", Role: string(RoleOwner), Status: &valid},
}
for i := range memberships {
@@ -1241,7 +1331,7 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
}
}
- checker := NewDatabaseChecker(db)
+ checker := newCommunityDatabaseChecker(db)
member := Subject{UserID: "team-member"}
owner := Subject{UserID: "team-owner"}
outsider := Subject{UserID: "outsider"}
diff --git a/internal/permission/policy_ce.go b/internal/permission/policy_ce.go
index 4bb47a3d3c..bb27074b9c 100644
--- a/internal/permission/policy_ce.go
+++ b/internal/permission/policy_ce.go
@@ -13,8 +13,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//go:build !enterprise
-
package permission
import (
@@ -45,6 +43,9 @@ type evaluation struct {
}
func newPolicy(source Source) policy {
+ if activePolicy, handled := newPolicyEE(source); handled {
+ return activePolicy
+ }
return &communityPolicy{source: source}
}
@@ -475,7 +476,7 @@ func (e *evaluation) getMembership(ctx context.Context, userID, tenantID string)
membership, err := e.source.GetMembership(ctx, userID, tenantID)
if err != nil {
err = fmt.Errorf("permission: load tenant membership: %w", err)
- } else if membership == nil || !membership.Active || membership.UserID != userID || membership.TenantID != tenantID || membership.Role == RoleInvite {
+ } else if membership == nil || !membership.Active || membership.UserID != userID || membership.TenantID != tenantID {
membership = nil
err = ErrMembershipNotFound
}
@@ -526,7 +527,7 @@ func validTenantRequirement(requirement TenantRequirement) bool {
}
func membershipSatisfies(membership *Membership, requirement TenantRequirement) bool {
- if membership == nil || !membership.Active || membership.Role == RoleInvite {
+ if membership == nil || !membership.Active {
return false
}
switch requirement {
@@ -557,11 +558,26 @@ func resourceAccess(resource Resource, source AccessSource) Access {
}
func resourceAccessWithOperations(resource Resource, source AccessSource, operations []Operation) Access {
+ permissionMask := int32(0)
+ for _, operation := range operations {
+ switch operation {
+ case OperationRead, OperationRun, OperationUse:
+ permissionMask |= ResourcePermissionRead
+ case OperationCreate, OperationUpdate, OperationDeleteContent:
+ permissionMask |= ResourcePermissionWrite
+ case OperationDelete, OperationShare:
+ permissionMask |= ResourcePermissionManage
+ }
+ }
+ if source == AccessSourceOwner {
+ permissionMask = ResourcePermissionOwner
+ }
return Access{
- Resource: resource.Ref,
- TenantID: resource.TenantID,
- Source: source,
- Operations: append([]Operation(nil), operations...),
+ Resource: resource.Ref,
+ TenantID: resource.TenantID,
+ Source: source,
+ PermissionMask: permissionMask,
+ Operations: append([]Operation(nil), operations...),
}
}
diff --git a/internal/permission/policy_ce_test.go b/internal/permission/policy_ce_test.go
index 4e9344d2a8..3c1d143bde 100644
--- a/internal/permission/policy_ce_test.go
+++ b/internal/permission/policy_ce_test.go
@@ -64,6 +64,9 @@ func TestCommunityPolicyResolvesResourceTenant(t *testing.T) {
if access.Source != AccessSourceTenant || !access.Allows(OperationRead) {
t.Fatalf("ResolveAccess() = %#v, want tenant read access", access)
}
+ if access.PermissionMask != ResourcePermissionRead {
+ t.Fatalf("ResolveAccess() permission mask = %d, want read mask %d", access.PermissionMask, ResourcePermissionRead)
+ }
}
func TestCommunityPolicyUsesResourceTenantInsteadOfSubjectTenant(t *testing.T) {
diff --git a/internal/permission/policy_ee.go b/internal/permission/policy_ee.go
new file mode 100644
index 0000000000..3c039347fb
--- /dev/null
+++ b/internal/permission/policy_ee.go
@@ -0,0 +1,22 @@
+//
+// 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 permission
+
+// Community Edition has no alternate permission policy.
+func newPolicyEE(Source) (policy, bool) {
+ return nil, false
+}
diff --git a/internal/permission/query_scope.go b/internal/permission/query_scope.go
index e00d6e5b8e..611270c04b 100644
--- a/internal/permission/query_scope.go
+++ b/internal/permission/query_scope.go
@@ -67,6 +67,8 @@ func resourceTable(kind ResourceKind) (string, bool) {
switch kind {
case ResourceKindDataset:
return "knowledgebase", true
+ case ResourceKindDocument:
+ return "document", true
case ResourceKindCanvas:
return "user_canvas", true
case ResourceKindAgentSession:
diff --git a/internal/permission/types.go b/internal/permission/types.go
index 04069ff239..7bd09fa424 100644
--- a/internal/permission/types.go
+++ b/internal/permission/types.go
@@ -21,6 +21,8 @@ import (
"errors"
)
+type subjectContextKey struct{}
+
var (
ErrUnauthenticated = errors.New("permission: user is required")
ErrInvalidSubject = errors.New("permission: tenant is required")
@@ -39,11 +41,46 @@ type Subject struct {
TenantID string
}
+// WithSubject attaches the authenticated user and active Tenant to a request
+// context so shared service helpers can use the same authorization subject.
+func WithSubject(ctx context.Context, subject Subject) context.Context {
+ return context.WithValue(ctx, subjectContextKey{}, subject)
+}
+
+// SubjectFromContext returns the authenticated permission subject attached to
+// the request context, if one is present.
+func SubjectFromContext(ctx context.Context) (Subject, bool) {
+ if ctx == nil {
+ return Subject{}, false
+ }
+ subject, ok := ctx.Value(subjectContextKey{}).(Subject)
+ return subject, ok
+}
+
+func resolveSubject(ctx context.Context, subject Subject) (Subject, error) {
+ requestSubject, ok := SubjectFromContext(ctx)
+ if !ok {
+ return subject, nil
+ }
+ if subject.UserID == "" {
+ subject.UserID = requestSubject.UserID
+ } else if requestSubject.UserID != "" && subject.UserID != requestSubject.UserID {
+ return Subject{}, ErrInvalidSubject
+ }
+ if subject.TenantID == "" {
+ subject.TenantID = requestSubject.TenantID
+ } else if requestSubject.TenantID != "" && subject.TenantID != requestSubject.TenantID {
+ return Subject{}, ErrInvalidSubject
+ }
+ return subject, nil
+}
+
// ResourceKind identifies a resource family without coupling this package to business entities.
type ResourceKind string
const (
ResourceKindDataset ResourceKind = "dataset"
+ ResourceKindDocument ResourceKind = "document"
ResourceKindCanvas ResourceKind = "canvas"
ResourceKindAgentSession ResourceKind = "agent_session"
ResourceKindMemory ResourceKind = "memory"
@@ -84,6 +121,16 @@ const (
// Operation identifies an operation on a concrete resource.
type Operation string
+// Resource permission masks describe direct resource grants independently of
+// feature-role limits. The permission UI uses the same bit layout as the
+// resource grant table.
+const (
+ ResourcePermissionRead int32 = 1 << iota
+ ResourcePermissionWrite
+ ResourcePermissionManage
+ ResourcePermissionOwner
+)
+
const (
OperationRead Operation = "read"
OperationCreate Operation = "create"
@@ -112,7 +159,6 @@ const (
RoleOwner TenantRole = "owner"
RoleAdmin TenantRole = "admin"
RoleNormal TenantRole = "normal"
- RoleInvite TenantRole = "invite"
)
// Membership is the normalized active membership fact returned by Source.
@@ -166,10 +212,11 @@ const (
// Access describes the operations a subject can perform on a resource.
type Access struct {
- Resource ResourceRef
- TenantID string
- Source AccessSource
- Operations []Operation
+ Resource ResourceRef
+ TenantID string
+ Source AccessSource
+ PermissionMask int32
+ Operations []Operation
}
func (a Access) Allows(operation Operation) bool {
@@ -233,6 +280,10 @@ type queryScopePolicy interface {
QueryScope(context.Context, Subject, ScopeQuery) (QueryScope, bool, error)
}
+type resourceOwnerGranter interface {
+ GrantResourceOwner(context.Context, Subject, ResourceRef) error
+}
+
// Checker exposes edition-independent permission methods.
type Checker struct {
policy policy
@@ -246,11 +297,33 @@ func NewChecker(source Source) *Checker {
return &Checker{policy: newPolicy(source)}
}
+// GrantResourceOwner assigns the creator's owner grant for policies that use
+// explicit resource permissions. Policies without grant rows keep their own
+// ownership model.
+func (c *Checker) GrantResourceOwner(ctx context.Context, subject Subject, resource ResourceRef) error {
+ if c == nil || c.policy == nil {
+ return ErrSourceUnavailable
+ }
+ granter, ok := c.policy.(resourceOwnerGranter)
+ if !ok {
+ return nil
+ }
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return err
+ }
+ return granter.GrantResourceOwner(ctx, subject, resource)
+}
+
// CheckFeature checks feature access under the active edition's policy.
func (c *Checker) CheckFeature(ctx context.Context, subject Subject, feature Feature, action Action) error {
if c == nil || c.policy == nil {
return ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return err
+ }
return c.policy.CheckFeature(ctx, subject, feature, action)
}
@@ -259,6 +332,10 @@ func (c *Checker) CheckTenant(ctx context.Context, subject Subject, tenantID str
if c == nil || c.policy == nil {
return ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return err
+ }
return c.policy.CheckTenant(ctx, subject, tenantID, requirement)
}
@@ -267,6 +344,10 @@ func (c *Checker) CheckResource(ctx context.Context, subject Subject, resource R
if c == nil || c.policy == nil {
return ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return err
+ }
return c.policy.CheckResource(ctx, subject, resource, operation)
}
@@ -275,6 +356,10 @@ func (c *Checker) CheckDependency(ctx context.Context, subject Subject, entry, d
if c == nil || c.policy == nil {
return ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return err
+ }
return c.policy.CheckDependency(ctx, subject, entry, dependency, entryOperation, dependencyOperation)
}
@@ -283,6 +368,10 @@ func (c *Checker) ResolveAccess(ctx context.Context, subject Subject, resource R
if c == nil || c.policy == nil {
return Access{}, ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return Access{}, err
+ }
return c.policy.ResolveAccess(ctx, subject, resource)
}
@@ -291,6 +380,10 @@ func (c *Checker) Scope(ctx context.Context, subject Subject, query ScopeQuery)
if c == nil || c.policy == nil {
return Scope{}, ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return Scope{}, err
+ }
return c.policy.Scope(ctx, subject, query)
}
@@ -302,6 +395,10 @@ func (c *Checker) QueryScope(ctx context.Context, subject Subject, query ScopeQu
if c == nil || c.policy == nil {
return QueryScope{}, ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return QueryScope{}, err
+ }
if queryPolicy, ok := c.policy.(queryScopePolicy); ok {
queryScope, supported, err := queryPolicy.QueryScope(ctx, subject, query)
if err != nil {
@@ -324,5 +421,9 @@ func (c *Checker) FilterResources(ctx context.Context, subject Subject, resource
if c == nil || c.policy == nil {
return nil, ErrSourceUnavailable
}
+ var err error
+ if subject, err = resolveSubject(ctx, subject); err != nil {
+ return nil, err
+ }
return c.policy.FilterResources(ctx, subject, resources, operation)
}
diff --git a/internal/service/agent.go b/internal/service/agent.go
index adbc0f0484..81f72ecad7 100644
--- a/internal/service/agent.go
+++ b/internal/service/agent.go
@@ -429,21 +429,22 @@ func (s *AgentService) ListTemplates(ctx context.Context) ([]*entity.CanvasTempl
// AgentItem is one entry in the list response.
type AgentItem struct {
- ID string `json:"id"`
- Avatar *string `json:"avatar,omitempty"`
- Title *string `json:"title,omitempty"`
- Description *string `json:"description,omitempty"`
- Permission string `json:"permission"`
- UserID string `json:"user_id"`
- TenantID string `json:"tenant_id"`
- Nickname string `json:"nickname"`
- TenantAvatar *string `json:"tenant_avatar,omitempty"`
- Tags string `json:"tags"`
- CanvasType *string `json:"canvas_type,omitempty"`
- CanvasCategory string `json:"canvas_category"`
- CreateTime *int64 `json:"create_time,omitempty"`
- UpdateTime *int64 `json:"update_time,omitempty"`
- ReleaseTime *int64 `json:"release_time,omitempty"`
+ ID string `json:"id"`
+ Avatar *string `json:"avatar,omitempty"`
+ Title *string `json:"title,omitempty"`
+ Description *string `json:"description,omitempty"`
+ Permission string `json:"permission"`
+ UserID string `json:"user_id"`
+ TenantID string `json:"tenant_id"`
+ Nickname string `json:"nickname"`
+ TenantAvatar *string `json:"tenant_avatar,omitempty"`
+ Tags string `json:"tags"`
+ CanvasType *string `json:"canvas_type,omitempty"`
+ CanvasCategory string `json:"canvas_category"`
+ OperatorPermission int32 `json:"operator_permission,omitempty"`
+ CreateTime *int64 `json:"create_time,omitempty"`
+ UpdateTime *int64 `json:"update_time,omitempty"`
+ ReleaseTime *int64 `json:"release_time,omitempty"`
// Type discriminates agent vs compilation-template-group items in the merged
// /agents response. It is set only for merged items (agent => "agent").
Type string `json:"type,omitempty"`
@@ -576,20 +577,21 @@ func toAgentItem(c *dao.UserCanvasListItem) *AgentItem {
nickname = c.TenantID
}
return &AgentItem{
- ID: c.ID,
- Avatar: c.Avatar,
- Title: c.Title,
- Description: c.Description,
- Permission: c.Permission,
- UserID: c.UserID,
- TenantID: c.TenantID,
- Nickname: nickname,
- TenantAvatar: c.TenantAvatar,
- CanvasType: c.CanvasType,
- CanvasCategory: c.CanvasCategory,
- Tags: c.Tags,
- CreateTime: c.CreateTime,
- UpdateTime: c.UpdateTime,
+ ID: c.ID,
+ Avatar: c.Avatar,
+ Title: c.Title,
+ Description: c.Description,
+ Permission: c.Permission,
+ UserID: c.UserID,
+ TenantID: c.TenantID,
+ Nickname: nickname,
+ TenantAvatar: c.TenantAvatar,
+ CanvasType: c.CanvasType,
+ CanvasCategory: c.CanvasCategory,
+ OperatorPermission: c.OperatorPermission,
+ Tags: c.Tags,
+ CreateTime: c.CreateTime,
+ UpdateTime: c.UpdateTime,
}
}
@@ -664,6 +666,14 @@ func (s *AgentService) ListAgents(ctx context.Context, userID string, keywords s
agentItems := make([]*AgentItem, len(canvases))
for i, c := range canvases {
+ access, accessErr := checker.ResolveAccess(ctx, subject, permission.ResourceRef{
+ Kind: permission.ResourceKindCanvas,
+ ID: c.ID,
+ })
+ if accessErr != nil {
+ return nil, common.CodeServerError, fmt.Errorf("resolve agent permissions: %w", accessErr)
+ }
+ c.OperatorPermission = access.PermissionMask
agentItems[i] = toAgentItem(c)
}
s.attachReleaseTimes(ctx, agentItems)
@@ -925,6 +935,11 @@ func (s *AgentService) CreateAgent(ctx context.Context, userID string, req *Crea
code, permissionErr := permissionresponse.Normalize(permission.ErrUnauthenticated)
return nil, code, permissionErr
}
+ tenantID, err := prepareAgentCreation(ctx, userID)
+ if err != nil {
+ code, normalized := permissionresponse.Normalize(err)
+ return nil, code, normalized
+ }
if req == nil {
return nil, common.CodeArgumentError, errors.New("create agent: nil request")
}
@@ -966,6 +981,7 @@ func (s *AgentService) CreateAgent(ctx context.Context, userID string, req *Crea
row := &entity.UserCanvas{
ID: common.GenerateUUID(),
UserID: userID,
+ TenantID: &tenantID,
Title: req.Title,
Description: req.Description,
Permission: req.Permission,
@@ -973,7 +989,14 @@ func (s *AgentService) CreateAgent(ctx context.Context, userID string, req *Crea
CanvasCategory: req.CanvasCategory,
DSL: req.DSL,
}
- if err := s.canvasDAO.Create(ctx, dao.DB, row); err != nil {
+ if err := dao.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+ if err := s.canvasDAO.Create(ctx, tx, row); err != nil {
+ return err
+ }
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{
+ UserID: userID, TenantID: tenantID,
+ }, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: row.ID})
+ }); err != nil {
if dao.IsDuplicateKeyErr(err) {
return nil, common.CodeDataError, agentTitleAlreadyExistsError(title)
}
@@ -1057,7 +1080,19 @@ func (s *AgentService) loadCanvasForUser(ctx context.Context, userID, canvasID s
// Returns dao.ErrUserCanvasNotFound (not 403) when the canvas is missing
// or belongs to another user.
func (s *AgentService) GetAgent(ctx context.Context, userID, canvasID string) (*entity.UserCanvas, error) {
- return s.loadCanvasForUser(ctx, userID, canvasID, permission.OperationRead)
+ canvasInstance, err := s.loadCanvasForUser(ctx, userID, canvasID, permission.OperationRead)
+ if err != nil {
+ return nil, err
+ }
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ Kind: permission.ResourceKindCanvas,
+ ID: canvasID,
+ })
+ if err != nil {
+ return nil, err
+ }
+ canvasInstance.OperatorPermission = access.PermissionMask
+ return canvasInstance, nil
}
// GetLastPublishTime returns the update_time of the most recently updated
@@ -1162,7 +1197,7 @@ func (s *AgentService) UpdateAgent(ctx context.Context, userID, canvasID string,
if err := component.ValidateDynamicEntries(dslMap); err != nil {
return fmt.Errorf("update agent %s: %w", canvasID, err)
}
- if err := validateAgentChatModels(ctx, userID, ownerUserID, dslMap); err != nil {
+ if err := validateAgentChatModels(ctx, userID, canvasInstance.EffectiveTenantID(), dslMap); err != nil {
return err
}
updates["dsl"] = entity.JSONMap(dslpkg.NormalizeForCanvas(dslMap))
@@ -1460,7 +1495,7 @@ func (s *AgentService) RunAgent(ctx context.Context, userID, canvasID, sessionID
if err != nil {
return nil, err
}
- agentTenantID := canvasRow.UserID
+ agentTenantID := canvasRow.EffectiveTenantID()
newSession := sessionID == ""
if sessionID == "" {
sessionID = common.GenerateToken()
@@ -1796,10 +1831,8 @@ func (s *AgentService) RunAgent(ctx context.Context, userID, canvasID, sessionID
if payload, ok := ctx.Value(webhookPayloadKey{}).(map[string]any); ok && payload != nil {
root["webhook_payload"] = payload
}
- // Runtime model and resource lookup uses the tenant that owns the canvas.
- // For user_canvas, that tenant ID is stored in user_id (and exposed as
- // tenant_id by the Agent API). Keep the actual runner separately in
- // root["user_id"] for caller-scoped permission checks and conversation data.
+ // Runtime resources use the canvas tenant; root["user_id"] retains the
+ // authenticated runner for caller-scoped permission checks and conversation data.
root["tenant_id"] = agentTenantID
// Preserve the historical RunTracker tenant dimension separately from
diff --git a/internal/service/agent_creation_ee.go b/internal/service/agent_creation_ee.go
new file mode 100644
index 0000000000..c3ba4520fa
--- /dev/null
+++ b/internal/service/agent_creation_ee.go
@@ -0,0 +1,21 @@
+// 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 "context"
+
+func prepareAgentCreation(_ context.Context, userID string) (string, error) {
+ return userID, nil
+}
diff --git a/internal/service/agent_sessions.go b/internal/service/agent_sessions.go
index 684856b4b8..7a9abe9904 100644
--- a/internal/service/agent_sessions.go
+++ b/internal/service/agent_sessions.go
@@ -694,7 +694,7 @@ func (s *AgentService) CreateAgentSession(ctx context.Context, req *CreateAgentS
if len(dsl) == 0 {
dsl = canvas.DSL
}
- if err := validateAgentChatModels(ctx, req.UserID, canvas.UserID, dsl); err != nil {
+ if err := validateAgentChatModels(ctx, req.UserID, canvas.EffectiveTenantID(), dsl); err != nil {
if errors.Is(err, ErrAgentStorageError) {
return nil, common.CodeServerError, errors.New("Internal storage error while accessing the agent.")
}
diff --git a/internal/service/agent_test.go b/internal/service/agent_test.go
index 0951230e23..16e798a214 100644
--- a/internal/service/agent_test.go
+++ b/internal/service/agent_test.go
@@ -17,6 +17,7 @@
package service
import (
+ "context"
"encoding/json"
"errors"
"net/netip"
@@ -1147,6 +1148,88 @@ func TestCreateAgentSessionNoVersionLeavesTitleNil(t *testing.T) {
}
}
+func TestAgentModelValidationUsesCanvasTenant(t *testing.T) {
+ setupAgentSessionServiceTest(t)
+ if err := dao.DB.AutoMigrate(
+ &entity.TenantModelProvider{},
+ &entity.TenantModelInstance{},
+ &entity.TenantModel{},
+ ); err != nil {
+ t.Fatalf("migrate model tables: %v", err)
+ }
+ for _, statement := range []string{
+ `CREATE TABLE permission (
+ id TEXT PRIMARY KEY, member_id TEXT, group_id TEXT, tenant_id TEXT NOT NULL,
+ resource_type TEXT NOT NULL, resource_id TEXT, permission INTEGER NOT NULL DEFAULT 0,
+ status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME
+ )`,
+ `CREATE TABLE group_member (id TEXT PRIMARY KEY, member_id TEXT, group_id TEXT, status TEXT)`,
+ `CREATE TABLE group_info (id TEXT PRIMARY KEY, tenant_id TEXT, status TEXT)`,
+ } {
+ if err := dao.DB.Exec(statement).Error; err != nil {
+ t.Fatalf("create permission test table: %v", err)
+ }
+ }
+
+ const tenantID = "tenant-scope"
+ const creatorID = "creator-user"
+ const tenantOwnerID = "tenant-owner"
+ valid := string(entity.StatusValid)
+ if err := dao.DB.Exec("INSERT INTO user (id, email, nickname) VALUES (?, ?, ?)", tenantOwnerID, "[email protected]", "Tenant owner").Error; err != nil {
+ t.Fatalf("create tenant owner: %v", err)
+ }
+ membership := entity.UserTenant{
+ ID: "tenant-owner-membership", UserID: tenantOwnerID, TenantID: tenantID,
+ Role: string(permission.RoleOwner), Status: &valid,
+ }
+ if err := dao.DB.Create(&membership).Error; err != nil {
+ t.Fatalf("create tenant owner membership: %v", err)
+ }
+ modelRows := []any{
+ &entity.TenantModelProvider{ID: "tenant-provider", UserID: tenantOwnerID, TenantID: tenantID, ProviderName: "OpenAI"},
+ &entity.TenantModelInstance{ID: "tenant-instance", ProviderID: "tenant-provider", InstanceName: "default", APIKey: "test-key", Status: "active", Extra: "{}"},
+ &entity.TenantModel{ID: "tenant-model", ProviderID: "tenant-provider", InstanceID: "tenant-instance", ModelName: "gpt-test", ModelType: int(entity.ModelTypeChat), Status: "active", Extra: "{}"},
+ }
+ for _, row := range modelRows {
+ if err := dao.DB.Create(row).Error; err != nil {
+ t.Fatalf("create tenant model row %T: %v", row, err)
+ }
+ }
+ dsl := entity.JSONMap{
+ "components": map[string]any{
+ "agent_1": map[string]any{
+ "obj": map[string]any{
+ "component_name": "Agent",
+ "params": map[string]any{"model_id": "tenant-model"},
+ },
+ },
+ },
+ }
+ tenantIDValue := tenantID
+ canvasRow := entity.UserCanvas{
+ ID: "shared-canvas", UserID: creatorID, TenantID: &tenantIDValue,
+ Permission: string(entity.TenantPermissionTeam), DSL: dsl,
+ }
+ if err := dao.DB.Create(&canvasRow).Error; err != nil {
+ t.Fatalf("create shared canvas: %v", err)
+ }
+ if err := dao.DB.Exec(
+ "INSERT INTO permission (id, member_id, tenant_id, resource_type, resource_id, permission, status) VALUES (?, ?, ?, ?, ?, ?, ?)",
+ "canvas-read-write", membership.ID, tenantID, "canvas", canvasRow.ID, 3, valid,
+ ).Error; err != nil {
+ t.Fatalf("grant canvas access: %v", err)
+ }
+
+ ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: tenantOwnerID, TenantID: tenantID})
+ svc := NewAgentService()
+ if _, code, err := svc.CreateAgentSession(ctx, &CreateAgentSessionRequest{UserID: tenantOwnerID, AgentID: canvasRow.ID}); err != nil || code != common.CodeSuccess {
+ t.Fatalf("CreateAgentSession with tenant model = (%d, %v), want success", code, err)
+ }
+ if err := svc.UpdateAgent(ctx, tenantOwnerID, canvasRow.ID, map[string]any{"dsl": dsl}); err != nil {
+ t.Fatalf("UpdateAgent with tenant model: %v", err)
+ }
+}
+
func TestCreateAgentSessionVersionLookupErrorReturnsServerError(t *testing.T) {
setupAgentSessionServiceTest(t)
@@ -1931,7 +2014,7 @@ func TestUpdateAgentAllowsCaseOnlyTitleChange(t *testing.T) {
func TestCreateAgentDedupesDuplicateTitle(t *testing.T) {
setupAgentSessionServiceTest(t)
- ctx := t.Context()
+ ctx := seedAgentServiceCreateContext(t)
if err := dao.DB.WithContext(ctx).Create(&entity.UserCanvas{
ID: "canvas-dup-title",
@@ -1963,6 +2046,40 @@ func TestCreateAgentDedupesDuplicateTitle(t *testing.T) {
}
}
+func seedAgentServiceCreateContext(t *testing.T) context.Context {
+ t.Helper()
+ active := string(entity.StatusValid)
+ if err := dao.DB.Create(&entity.User{ID: "user-1", Email: "[email protected]", Nickname: "user-1"}).Error; err != nil {
+ t.Fatalf("create agent owner: %v", err)
+ }
+ if err := dao.DB.Create(&entity.UserTenant{
+ ID: "agent-owner-link", UserID: "user-1", TenantID: "tenant-agent", Role: string(permission.RoleOwner), Status: &active,
+ }).Error; err != nil {
+ t.Fatalf("create agent owner membership: %v", err)
+ }
+ for _, statement := range []string{
+ `CREATE TABLE permission (
+ id TEXT PRIMARY KEY, member_id TEXT, group_id TEXT, tenant_id TEXT NOT NULL,
+ resource_type TEXT NOT NULL, resource_id TEXT, permission INTEGER NOT NULL DEFAULT 0,
+ status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME
+ )`,
+ `CREATE TABLE permission_change_log (
+ id TEXT PRIMARY KEY, tenant_id TEXT NOT NULL, operator_id TEXT NOT NULL,
+ target_type TEXT NOT NULL, target_id TEXT NOT NULL, resource_type TEXT NOT NULL,
+ resource_id TEXT NOT NULL, old_permission INTEGER NOT NULL DEFAULT 0,
+ new_permission INTEGER NOT NULL DEFAULT 0, action_type TEXT NOT NULL, reason TEXT,
+ event_type TEXT NOT NULL DEFAULT '', actor_user_id TEXT,
+ scope_type TEXT NOT NULL DEFAULT 'tenant', before_data TEXT, after_data TEXT,
+ status TEXT, create_time INTEGER, create_date DATETIME, update_time INTEGER, update_date DATETIME
+ )`,
+ } {
+ if err := dao.DB.Exec(statement).Error; err != nil {
+ t.Fatalf("create Agent permission test table: %v", err)
+ }
+ }
+ return permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "tenant-agent"})
+}
+
func TestCreateAgentRequiresAuthenticatedUserID(t *testing.T) {
row, code, err := NewAgentService().CreateAgent(t.Context(), " ", &CreateAgentRequest{
Title: sptr("Agent"),
diff --git a/internal/service/file/file_folder_test.go b/internal/service/file/file_folder_test.go
index f1572dd324..f0715a970e 100644
--- a/internal/service/file/file_folder_test.go
+++ b/internal/service/file/file_folder_test.go
@@ -204,7 +204,7 @@ func insertFolderTestFile(t *testing.T, id, parentID, name string) {
ID: id,
ParentID: parentID,
TenantID: "tenant-1",
- CreatedBy: "user-1",
+ CreatedBy: "tenant-1",
Name: name,
Location: sptr(name),
Type: "pdf",