Skip to content

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

refa: derive permission identity from context (#21892)

buua43642fc0bac451d
diff --git a/internal/agent/component/agent_mcp.go b/internal/agent/component/agent_mcp.go
index d83869b9ba..b9fb4a6a53 100644
--- a/internal/agent/component/agent_mcp.go
+++ b/internal/agent/component/agent_mcp.go
@@ -52,10 +52,21 @@ func buildAgentMCPTools(ctx context.Context, db *gorm.DB, raw any, timeout time.
return nil, fmt.Errorf("MCP server %q: missing runtime user or canvas", selection.ID)
}
tenantID, _ := state.GetSysString("tenant_id")
+ tenantID = strings.TrimSpace(tenantID)
+ contextUserID := permission.UserIDFromContext(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if contextUserID != "" && contextUserID != userID {
+ return nil, permission.ErrIdentityMismatch
+ }
+ if contextTenantID != "" && tenantID != "" && contextTenantID != tenantID {
+ return nil, permission.ErrIdentityMismatch
+ }
+ if contextUserID == "" || contextTenantID == "" {
+ ctx = permission.WithIdentity(ctx, userID, tenantID)
+ }
checker := permission.NewDatabaseChecker(db)
err = checker.CheckDependency(
ctx,
- permission.Subject{UserID: userID, TenantID: tenantID},
permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID},
permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: selection.ID},
permission.OperationRun,
diff --git a/internal/agent/component/agent_mcp_test.go b/internal/agent/component/agent_mcp_test.go
index da9c7504c6..65db719a79 100644
--- a/internal/agent/component/agent_mcp_test.go
+++ b/internal/agent/component/agent_mcp_test.go
@@ -91,7 +91,7 @@ func TestAgentMCPModelDispatch(t *testing.T) {
state.Sys["tenant_id"] = "tenant"
state.Sys["user_id"] = "tenant"
state.Sys["canvas_id"] = "canvas"
- ctx := permission.WithSubject(withStateForTest(t.Context(), state), permission.Subject{UserID: "tenant", TenantID: "tenant"})
+ ctx := permission.WithIdentity(withStateForTest(t.Context(), state), "tenant", "tenant")
p := mergeAgentParam(AgentParam{}, map[string]any{"mcp": []any{map[string]any{"mcp_id": "mcp", "tools": map[string]any{"route": map[string]any{"name": "route", "inputSchema": map[string]any{"type": "object", "properties": map[string]any{"origin": map[string]any{"type": "string"}}, "required": []string{"origin"}}}}}}})
tools, err := buildAgentTools(ctx, p)
if err != nil {
@@ -168,7 +168,7 @@ func TestAgentMCPModelDispatch(t *testing.T) {
}
state.Sys["user_id"] = "outsider"
state.Sys["tenant_id"] = "other-tenant"
- ctx = permission.WithSubject(withStateForTest(t.Context(), state), permission.Subject{UserID: "outsider", TenantID: "other-tenant"})
+ ctx = permission.WithIdentity(withStateForTest(t.Context(), state), "outsider", "other-tenant")
if _, err := buildAgentTools(ctx, p); err == nil {
t.Fatal("MCP dependency access without canvas permission was allowed")
}
@@ -190,7 +190,7 @@ func TestAgentMCPToolNamesDoNotCollide(t *testing.T) {
state.Sys["tenant_id"] = "tenant"
state.Sys["user_id"] = "tenant"
state.Sys["canvas_id"] = "canvas"
- ctx := permission.WithSubject(withStateForTest(t.Context(), state), permission.Subject{UserID: "tenant", TenantID: "tenant"})
+ ctx := permission.WithIdentity(withStateForTest(t.Context(), state), "tenant", "tenant")
p := AgentParam{Tools: nil, MCP: []any{
map[string]any{"mcp_id": "first", "tools": map[string]any{"search": map[string]any{"name": "web_search"}}},
map[string]any{"mcp_id": "second", "tools": map[string]any{"search": map[string]any{"name": "web_search"}}},
diff --git a/internal/agent/component/production_chain_fixes_test.go b/internal/agent/component/production_chain_fixes_test.go
index 7752c3001c..5a34a9a40b 100644
--- a/internal/agent/component/production_chain_fixes_test.go
+++ b/internal/agent/component/production_chain_fixes_test.go
@@ -276,7 +276,7 @@ func TestRetrieval_LegacyQueryStringNormalized(t *testing.T) {
state := runtime.NewCanvasState("run-1", "task-1")
state.Sys["user_id"] = "user-1"
state.Sys["tenant_id"] = "tenant-1"
- ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(runtime.WithState(t.Context(), state), "user-1", "tenant-1")
normalizeLegacyRetrievalInputs(ctx, db, merged)
if got, _ := merged["query"].(string); got != "diamond necklace" {
@@ -347,7 +347,7 @@ func TestRetrieval_StructuredUserFillInputNormalized(t *testing.T) {
state := runtime.NewCanvasState("run-1", "task-1")
state.Sys["user_id"] = "user-1"
state.Sys["tenant_id"] = "tenant-1"
- ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(runtime.WithState(t.Context(), state), "user-1", "tenant-1")
normalizeLegacyRetrievalInputs(ctx, db, merged)
if got, _ := merged["query"].(string); got != "合同" {
@@ -391,7 +391,7 @@ func TestRetrieval_ResolveDatasetIDByTenantName(t *testing.T) {
state := runtime.NewCanvasState("run-1", "task-1")
state.Sys["user_id"] = "tenant-1"
state.Sys["tenant_id"] = "tenant-1"
- ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "tenant-1", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(runtime.WithState(t.Context(), state), "tenant-1", "tenant-1")
if err := testsupport.PrepareEnterprisePermissionFixture(db, "tenant-1", "tenant-1"); err != nil {
t.Fatalf("prepare permission fixture: %v", err)
}
@@ -447,7 +447,7 @@ func TestRetrieval_ResolveDatasetIDByUserPermission(t *testing.T) {
state := runtime.NewCanvasState("run-1", "task-1")
state.Sys["user_id"] = "member"
- ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "member", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(runtime.WithState(t.Context(), state), "member", "tenant-1")
if got := resolveRetrievalDatasetID(ctx, db, "named-dataset"); got != tc.wantID {
t.Fatalf("resolveRetrievalDatasetID = %q, want %q", got, tc.wantID)
}
diff --git a/internal/agent/component/retrieval_permission_test.go b/internal/agent/component/retrieval_permission_test.go
index d7bb7891b3..cb7634814f 100644
--- a/internal/agent/component/retrieval_permission_test.go
+++ b/internal/agent/component/retrieval_permission_test.go
@@ -68,7 +68,7 @@ func TestCheckCanvasRetrievalDependencies(t *testing.T) {
state.Sys["canvas_id"] = canvas.ID
state.Sys["user_id"] = "caller"
state.Sys["tenant_id"] = "canvas-owner"
- ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "caller", TenantID: "canvas-owner"})
+ ctx := permission.WithIdentity(runtime.WithState(t.Context(), state), "caller", "canvas-owner")
if err := checkCanvasRetrievalDependencies(ctx, db, map[string]any{"dataset_ids": []string{dataset.ID}}); err != nil {
t.Fatalf("check accessible dataset dependency: %v", err)
diff --git a/internal/agent/component/universe_a_wrappers.go b/internal/agent/component/universe_a_wrappers.go
index 1e59fccb9b..f3cc4fc536 100644
--- a/internal/agent/component/universe_a_wrappers.go
+++ b/internal/agent/component/universe_a_wrappers.go
@@ -493,7 +493,7 @@ func resolveRetrievalDatasetID(ctx context.Context, db *gorm.DB, kbName string)
}
accessible, accessErr := permission.NewDatabaseChecker(db).FilterResources(
ctx,
- permission.Subject{UserID: userID},
+
refs,
permission.OperationUse,
)
diff --git a/internal/agent/tool/canvas_ctx.go b/internal/agent/tool/canvas_ctx.go
index a6938aa6c4..50b44a5899 100644
--- a/internal/agent/tool/canvas_ctx.go
+++ b/internal/agent/tool/canvas_ctx.go
@@ -45,6 +45,18 @@ func CheckCanvasDependencies(ctx context.Context, db *gorm.DB, kind permission.R
if userID == "" {
return permission.ErrUnauthenticated
}
+ tenantID := canvasTenantID(ctx)
+ contextUserID := permission.UserIDFromContext(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if contextUserID != "" && contextUserID != userID {
+ return permission.ErrIdentityMismatch
+ }
+ if contextTenantID != "" && tenantID != "" && contextTenantID != tenantID {
+ return permission.ErrIdentityMismatch
+ }
+ if contextUserID == "" || contextTenantID == "" {
+ ctx = permission.WithIdentity(ctx, userID, tenantID)
+ }
checker := permission.NewDatabaseChecker(db)
entry := permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}
@@ -59,7 +71,7 @@ func CheckCanvasDependencies(ctx context.Context, db *gorm.DB, kind permission.R
}
seen[id] = struct{}{}
dependency := permission.ResourceRef{Kind: kind, ID: id}
- if err := checker.CheckDependency(ctx, permission.Subject{UserID: userID}, entry, dependency, permission.OperationRun, permission.OperationUse); err != nil {
+ if err := checker.CheckDependency(ctx, entry, dependency, permission.OperationRun, permission.OperationUse); err != nil {
return fmt.Errorf("%s %q: %w", kind, id, err)
}
}
diff --git a/internal/agent/tool/retrieval_nlp.go b/internal/agent/tool/retrieval_nlp.go
index a911617af1..f9a5cf0f89 100644
--- a/internal/agent/tool/retrieval_nlp.go
+++ b/internal/agent/tool/retrieval_nlp.go
@@ -198,18 +198,38 @@ func (a *NLPRetrievalAdapter) Search(ctx context.Context, db *gorm.DB, req Retri
}
// Dataset authorization must use the caller identity established by the
// agent run, not req.UserID, which is a configurable per-user memory filter.
- userID := ""
+ userID := permission.UserIDFromContext(ctx)
if state, stateErr := runtime.GetStateFromContext(ctx); stateErr == nil && state != nil {
- userID, _ = state.GetSysString("user_id")
+ runtimeUserID, _ := state.GetSysString("user_id")
+ if runtimeUserID = strings.TrimSpace(runtimeUserID); runtimeUserID != "" {
+ if userID != "" && userID != runtimeUserID {
+ return nil, permission.ErrIdentityMismatch
+ }
+ userID = runtimeUserID
+ }
}
userID = strings.TrimSpace(userID)
+ if userID == "" {
+ return nil, permission.ErrUnauthenticated
+ }
+ tenantID := canvasTenantID(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if contextTenantID != "" && tenantID != "" && contextTenantID != tenantID {
+ return nil, permission.ErrIdentityMismatch
+ }
+ if permission.UserIDFromContext(ctx) == "" || contextTenantID == "" {
+ if contextTenantID == "" {
+ contextTenantID = tenantID
+ }
+ ctx = permission.WithIdentity(ctx, userID, contextTenantID)
+ }
checker := permission.NewDatabaseChecker(db)
if err := CheckCanvasDependencies(ctx, db, permission.ResourceKindDataset, datasets.kbIDs); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return nil, permissionErr
}
for _, datasetID := range datasets.kbIDs {
- if err := checker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ if err := checker.CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDataset, ID: datasetID,
}, permission.OperationUse); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
diff --git a/internal/agent/tool/retrieval_nlp_test.go b/internal/agent/tool/retrieval_nlp_test.go
index e9dc03b4ca..3a1e400b83 100644
--- a/internal/agent/tool/retrieval_nlp_test.go
+++ b/internal/agent/tool/retrieval_nlp_test.go
@@ -451,7 +451,7 @@ func TestNLPRetrievalAdapter_SearchRequiresDatasetUsePermission(t *testing.T) {
state := runtime.NewCanvasState("run-1", "session-1")
state.Sys["user_id"] = "member"
state.Sys["tenant_id"] = "tenant-1"
- ctx := permission.WithSubject(runtime.WithState(t.Context(), state), permission.Subject{UserID: "member", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(runtime.WithState(t.Context(), state), "member", "tenant-1")
_, err = adapter.Search(ctx, db, RetrievalRequest{
Query: "hello", DatasetIDs: []string{dataset.ID}, UserID: "owner",
})
diff --git a/internal/handler/agent_component.go b/internal/handler/agent_component.go
index 8fb3793fad..029ceece4f 100644
--- a/internal/handler/agent_component.go
+++ b/internal/handler/agent_component.go
@@ -210,7 +210,7 @@ func (h *AgentHandler) DebugComponent(c *gin.Context) {
common.ResponseWithCodeData(c, common.CodeArgumentError, nil, "Model inputs are available only for Agent components.")
return
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(c.Request.Context(), permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(c.Request.Context(), permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationUpdate); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
common.ResponseWithCodeData(c, common.CodeOperatingError, nil, canvasNoAccessMessage)
} else {
diff --git a/internal/handler/agent_component_test.go b/internal/handler/agent_component_test.go
index c2cbed2282..33eec91434 100644
--- a/internal/handler/agent_component_test.go
+++ b/internal/handler/agent_component_test.go
@@ -49,8 +49,8 @@ func componentCtx(t *testing.T, method, path, body string) (*gin.Context, *httpt
c.Set("user", &entity.User{ID: "u-1"})
// The auth middleware attaches the permission subject in production; the
// enterprise policy needs the tenant from it, so mirror that here.
- c.Request = c.Request.WithContext(permission.WithSubject(
- c.Request.Context(), permission.Subject{UserID: "u-1", TenantID: "u-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(
+ c.Request.Context(), "u-1", "u-1"))
return c, w
}
diff --git a/internal/handler/agent_logs_test.go b/internal/handler/agent_logs_test.go
index bb6d60a5fb..9f7d234898 100644
--- a/internal/handler/agent_logs_test.go
+++ b/internal/handler/agent_logs_test.go
@@ -124,7 +124,7 @@ func TestGetAgentLogs_E2EViaMiniredis(t *testing.T) {
if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {
t.Fatalf("prepare agent log permission fixture: %v", err)
}
- ctx = permission.WithSubject(ctx, permission.Subject{UserID: "u1", TenantID: "u1"})
+ ctx = permission.WithIdentity(ctx, "u1", "u1")
db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")})
@@ -258,7 +258,7 @@ func TestGetAgentLogs_EndSignalCompletion(t *testing.T) {
if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {
t.Fatalf("prepare agent log permission fixture: %v", err)
}
- ctx = permission.WithSubject(ctx, permission.Subject{UserID: "u1", TenantID: "u1"})
+ ctx = permission.WithIdentity(ctx, "u1", "u1")
db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")})
@@ -663,7 +663,7 @@ func TestRunCanvasPipelineDebug_WriteThenReadViaMiniredis(t *testing.T) {
if err := testsupport.PrepareEnterprisePermissionFixture(db, "u1", "u1"); err != nil {
t.Fatalf("prepare agent log permission fixture: %v", err)
}
- ctx = permission.WithSubject(ctx, permission.Subject{UserID: "u1", TenantID: "u1"})
+ ctx = permission.WithIdentity(ctx, "u1", "u1")
db.Create(&entity.UserCanvas{ID: "c1", UserID: "u1", Title: sptr("Test")})
mr, err := miniredis.Run()
diff --git a/internal/handler/agent_test.go b/internal/handler/agent_test.go
index b8a3574cb6..72a6f08bab 100644
--- a/internal/handler/agent_test.go
+++ b/internal/handler/agent_test.go
@@ -77,9 +77,9 @@ func setupGinContextWithUserAndDB(t *testing.T, method, path string) (*gin.Conte
c.Request = httptest.NewRequest(method, path, nil)
c.Set("user", &entity.User{ID: "user-1"})
c.Set("user_id", "user-1")
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{
- UserID: "user-1", TenantID: "user-1",
- }))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(),
+ "user-1", "user-1",
+ ))
db := setupHandlerAgentsTestDB(t)
orig := dao.DB
@@ -170,7 +170,7 @@ func TestListAgentVersionsHandler_NoPermission(t *testing.T) {
if err := testsupport.PrepareEnterprisePermissionFixture(db, "user-a", "user-a"); err != nil {
t.Fatalf("prepare agent permission fixture: %v", err)
}
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-a", TenantID: "user-a"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-a", "user-a"))
c.Set("user", &entity.User{ID: "user-a"})
c.Set("user_id", "user-a")
c.Params = gin.Params{{Key: "canvas_id", Value: "canvas-b"}}
@@ -209,7 +209,7 @@ func TestListAgentVersionsHandler_CanvasNotFound(t *testing.T) {
if err := testsupport.PrepareEnterprisePermissionFixture(db, "user-1", "user-1"); err != nil {
t.Fatalf("prepare agent permission fixture: %v", err)
}
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", "user-1"))
c.Set("user", &entity.User{ID: "user-1"})
c.Set("user_id", "user-1")
c.Params = gin.Params{{Key: "canvas_id", Value: "non-existent"}}
@@ -457,9 +457,9 @@ func seedAgentCreationContext(t *testing.T, c *gin.Context, db *gorm.DB) {
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",
- }))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(),
+ "user-1", "tenant-1",
+ ))
}
// sptr returns a pointer to the given string.
diff --git a/internal/handler/agent_webhook.go b/internal/handler/agent_webhook.go
index 98faaa342c..8dd825f6f1 100644
--- a/internal/handler/agent_webhook.go
+++ b/internal/handler/agent_webhook.go
@@ -100,7 +100,7 @@ type canvasLoader interface {
}
type agentWebhookCredentialManager interface {
- Issue(ctx context.Context, subject permission.Subject, canvas *entity.UserCanvas) (string, error)
+ Issue(ctx context.Context, canvas *entity.UserCanvas) (string, error)
Resolve(ctx context.Context, canvasID, token string) (*entity.AgentWebhookCredential, error)
Revoke(ctx context.Context, canvasID, userID string) error
}
@@ -144,7 +144,7 @@ func (h *AgentHandler) Webhook(c *gin.Context) {
return
}
userID = credential.UserID
- ctx = permission.WithSubject(ctx, permission.Subject{UserID: credential.UserID, TenantID: credential.TenantID})
+ ctx = permission.WithIdentity(ctx, credential.UserID, credential.TenantID)
// The URL credential is transport authentication, not Agent input.
query := c.Request.URL.Query()
query.Del("credential")
@@ -293,9 +293,9 @@ func (h *AgentHandler) CreateWebhookCredential(c *gin.Context) {
common.ResponseWithCodeData(c, responseCode, nil, responseMessage)
return
}
- credential, err := h.webhookCredentialManager().Issue(ctx, permission.Subject{UserID: user.ID}, canvas)
+ credential, err := h.webhookCredentialManager().Issue(ctx, canvas)
if err != nil {
- if errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrMembershipNotFound) || errors.Is(err, permission.ErrInvalidSubject) {
+ if errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrMembershipNotFound) || errors.Is(err, permission.ErrIdentityMismatch) {
common.ResponseWithHttpCodeData(c, http.StatusForbidden, common.CodeForbidden, nil, "You do not have permission to create a webhook credential for this agent.")
return
}
diff --git a/internal/handler/agent_webhook_test.go b/internal/handler/agent_webhook_test.go
index e019333cea..74aea05a14 100644
--- a/internal/handler/agent_webhook_test.go
+++ b/internal/handler/agent_webhook_test.go
@@ -72,7 +72,7 @@ type fakeAgentWebhookCredentialManager struct {
revokedUser string
}
-func (f *fakeAgentWebhookCredentialManager) Issue(_ context.Context, _ permission.Subject, _ *entity.UserCanvas) (string, error) {
+func (f *fakeAgentWebhookCredentialManager) Issue(_ context.Context, _ *entity.UserCanvas) (string, error) {
return f.issueToken, f.issueErr
}
@@ -250,8 +250,8 @@ func TestPublicWebhookRunsAsCredentialIdentityWithoutUserToken(t *testing.T) {
case <-time.After(time.Second):
t.Fatal("webhook did not start the agent")
}
- if subject, ok := permission.SubjectFromContext(loader.runContext); !ok || subject.TenantID != tenantID {
- t.Fatalf("run tenant = %q, want %q", subject.TenantID, tenantID)
+ if permission.TenantIDFromContext(loader.runContext) != tenantID {
+ t.Fatalf("run tenant = %q, want %q", permission.TenantIDFromContext(loader.runContext), tenantID)
}
input := loader.runPayload["input"].(map[string]any)
query := input["query"].(map[string]any)
diff --git a/internal/handler/agent_webhook_trace_test.go b/internal/handler/agent_webhook_trace_test.go
index b0d6fefdd3..b90a435685 100644
--- a/internal/handler/agent_webhook_trace_test.go
+++ b/internal/handler/agent_webhook_trace_test.go
@@ -104,9 +104,9 @@ func requestWebhookTrace(t *testing.T, h *AgentHandler, canvasID, userID string,
if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, "u1", userID, "u1"); err != nil {
t.Fatalf("prepare webhook trace caller permission: %v", err)
}
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{
- UserID: userID, TenantID: "u1",
- }))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(),
+ userID, "u1",
+ ))
c.Set("user", &entity.User{ID: userID})
c.Set("user_id", userID)
c.Params = gin.Params{{Key: "canvas_id", Value: canvasID}}
diff --git a/internal/handler/auth.go b/internal/handler/auth.go
index 44fcca6239..1b6671546c 100644
--- a/internal/handler/auth.go
+++ b/internal/handler/auth.go
@@ -223,8 +223,5 @@ func setAuthIdentity(c *gin.Context, identity *service.AuthIdentity) {
c.Set("user", identity.User)
c.Set("user_id", identity.User.ID)
c.Set("tenant_id", identity.TenantID)
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{
- UserID: identity.User.ID,
- TenantID: identity.TenantID,
- }))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), identity.User.ID, identity.TenantID))
}
diff --git a/internal/handler/chat_audio_test.go b/internal/handler/chat_audio_test.go
index 6e2bff60ab..13034e16ab 100644
--- a/internal/handler/chat_audio_test.go
+++ b/internal/handler/chat_audio_test.go
@@ -109,7 +109,7 @@ func TestChatAudioSpeechFailureOmitsProviderError(t *testing.T) {
h.SetMindMapDependencies(nil, nil, service.NewModelFactory(), nil)
c, w := setupGinContextWithUser(http.MethodPost, "/api/v1/chat/audio/speech", `{"text":"hello"}`)
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", "user-1"))
h.ChatAudioSpeech(c)
body := w.Body.String()
diff --git a/internal/handler/compilation_status_test.go b/internal/handler/compilation_status_test.go
index a5fb797350..7059fc697e 100644
--- a/internal/handler/compilation_status_test.go
+++ b/internal/handler/compilation_status_test.go
@@ -97,7 +97,7 @@ func newCompilationStatusHandlerRouter() *gin.Engine {
r := gin.New()
r.GET("/api/v1/datasets/:dataset_id/compilation/status", func(c *gin.Context) {
c.Set("user", &entity.User{ID: "user-1"})
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", "user-1"))
h.GetCompilationStatus(c)
})
return r
diff --git a/internal/handler/compilation_template_group.go b/internal/handler/compilation_template_group.go
index e39d72fec5..d48f2039f2 100644
--- a/internal/handler/compilation_template_group.go
+++ b/internal/handler/compilation_template_group.go
@@ -74,7 +74,7 @@ func (h *CompilationTemplateGroupHandler) List(c *gin.Context) {
if tenantID == "" {
tenantID = user.ID
} else if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(
- c.Request.Context(), permission.Subject{UserID: user.ID}, tenantID, permission.TenantMember,
+ c.Request.Context(), tenantID, permission.TenantMember,
); err != nil {
respondPermissionError(c, err, false)
return
diff --git a/internal/handler/dataset.go b/internal/handler/dataset.go
index a2164efa57..fbb7dfbb85 100644
--- a/internal/handler/dataset.go
+++ b/internal/handler/dataset.go
@@ -328,10 +328,7 @@ func (h *DatasetsHandler) CreateDataset(c *gin.Context) {
}
}
- result, code, err := h.datasetsService.CreateDataset(ctx, &req, permission.Subject{
- UserID: user.ID,
- TenantID: tenantID,
- })
+ result, code, err := h.datasetsService.CreateDataset(ctx, &req)
if err != nil {
common.ErrorWithCode(c, code, err.Error())
operationLog.Code = int(code)
@@ -844,15 +841,7 @@ func (h *DatasetsHandler) DeleteDatasets(c *gin.Context) {
}
ctx := c.Request.Context()
-
- tenantID := strings.TrimSpace(c.GetString("tenant_id"))
- if tenantID == "" {
- tenantID = user.ID
- }
- result, code, err := h.datasetsService.DeleteDatasets(ctx, ids, req.DeleteAll, permission.Subject{
- UserID: user.ID,
- TenantID: tenantID,
- })
+ result, code, err := h.datasetsService.DeleteDatasets(ctx, ids, req.DeleteAll)
if err != nil {
common.ErrorWithCode(c, code, err.Error())
operationLog.Code = int(code)
@@ -1130,7 +1119,7 @@ func (h *DatasetsHandler) GetCompilationStatus(c *gin.Context) {
// @Success 200 {object} map[string]interface{}
// @Router /api/v1/datasets/metadata/flattened [get]
func (h *DatasetsHandler) ListMetadataFlattened(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -1158,7 +1147,7 @@ func (h *DatasetsHandler) ListMetadataFlattened(c *gin.Context) {
ctx := c.Request.Context()
// Check access for each dataset
for _, datasetID := range datasetIDs {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
respondPermissionError(c, err, false)
return
}
diff --git a/internal/handler/dataset_artifact.go b/internal/handler/dataset_artifact.go
index 2c8eb123cd..c2fddb5bc3 100644
--- a/internal/handler/dataset_artifact.go
+++ b/internal/handler/dataset_artifact.go
@@ -73,7 +73,7 @@ func (h *DatasetArtifactHandler) datasetOwner(c *gin.Context, datasetID string)
common.ErrorWithCode(c, common.CodeNotFound, "dataset not found")
return nil, "", ""
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(c.Request.Context(), permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(c.Request.Context(), permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
respondPermissionError(c, err, false)
return nil, "", ""
}
diff --git a/internal/handler/dataset_artifact_topn_test.go b/internal/handler/dataset_artifact_topn_test.go
index da8152cb36..416dd22f7a 100644
--- a/internal/handler/dataset_artifact_topn_test.go
+++ b/internal/handler/dataset_artifact_topn_test.go
@@ -111,7 +111,7 @@ func callGetArtifactGraph(t *testing.T, datasetID, query string) (int, artifactG
w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/api/v1/datasets/"+datasetID+"/artifacts/graph"+query, nil)
c, _ := gin.CreateTestContext(w)
- c.Request = req.WithContext(permission.WithSubject(req.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = req.WithContext(permission.WithIdentity(req.Context(), "user-1", "user-1"))
c.Set("user", &entity.User{ID: "user-1"})
c.Params = gin.Params{{Key: "dataset_id", Value: datasetID}}
h := &DatasetArtifactHandler{
diff --git a/internal/handler/dataset_list_test.go b/internal/handler/dataset_list_test.go
index 986dfa0733..ce22433b82 100644
--- a/internal/handler/dataset_list_test.go
+++ b/internal/handler/dataset_list_test.go
@@ -85,7 +85,7 @@ func newListDatasetsTestRouter() *gin.Engine {
r := gin.New()
r.GET("/api/v1/datasets", func(c *gin.Context) {
c.Set("user", &entity.User{ID: "user-1"})
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", "user-1"))
h.ListDatasets(c)
})
return r
diff --git a/internal/handler/dify_retrieval_handler.go b/internal/handler/dify_retrieval_handler.go
index b7b984cfd6..bfc366633d 100644
--- a/internal/handler/dify_retrieval_handler.go
+++ b/internal/handler/dify_retrieval_handler.go
@@ -130,7 +130,7 @@ type difyRecord struct {
// --- Handler ---
type resourcePermissionChecker interface {
- CheckResource(context.Context, permission.Subject, permission.ResourceRef, permission.Operation) error
+ CheckResource(context.Context, permission.ResourceRef, permission.Operation) error
}
// DifyRetrievalHandler handles Dify-compatible retrieval requests.
@@ -221,7 +221,7 @@ func (h *DifyRetrievalHandler) Retrieval(c *gin.Context) {
return
}
- if err := h.permissionChecker.CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KnowledgeID}, permission.OperationUse); err != nil {
+ if err := h.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KnowledgeID}, permission.OperationUse); err != nil {
respondHTTPPermissionError(c, err, false)
return
}
diff --git a/internal/handler/dify_retrieval_handler_test.go b/internal/handler/dify_retrieval_handler_test.go
index 45893ff625..574b5ab2b0 100644
--- a/internal/handler/dify_retrieval_handler_test.go
+++ b/internal/handler/dify_retrieval_handler_test.go
@@ -44,7 +44,7 @@ import (
type mockKBService struct {
KBServiceIface
getKnowledgebaseByIDFn func(ctx context.Context, kbID string) (*entity.Knowledgebase, error)
- checkAccessFn func(ctx context.Context, subject permission.Subject, datasetID string, operation permission.Operation) error
+ checkAccessFn func(ctx context.Context, datasetID string, operation permission.Operation) error
}
func (m *mockKBService) GetKnowledgebaseByID(ctx context.Context, kbID string) (*entity.Knowledgebase, error) {
@@ -56,9 +56,9 @@ func (m *mockKBService) GetKnowledgebaseByID(ctx context.Context, kbID string) (
}, nil
}
-func (m *mockKBService) CheckResource(ctx context.Context, subject permission.Subject, resource permission.ResourceRef, operation permission.Operation) error {
+func (m *mockKBService) CheckResource(ctx context.Context, resource permission.ResourceRef, operation permission.Operation) error {
if m.checkAccessFn != nil {
- return m.checkAccessFn(ctx, subject, resource.ID, operation)
+ return m.checkAccessFn(ctx, resource.ID, operation)
}
return nil
}
@@ -383,7 +383,7 @@ func TestDifyRetrieval_NoAuth(t *testing.T) {
func TestDifyRetrieval_Unauthorized(t *testing.T) {
h, r := setupDifyTest("user1")
kbSvc := &mockKBService{
- checkAccessFn: func(ctx context.Context, subject permission.Subject, datasetID string, operation permission.Operation) error {
+ checkAccessFn: func(ctx context.Context, datasetID string, operation permission.Operation) error {
if operation != permission.OperationUse {
t.Errorf("dataset operation = %q, want %q", operation, permission.OperationUse)
}
diff --git a/internal/handler/document.go b/internal/handler/document.go
index 0256548bd3..94992b6ad8 100644
--- a/internal/handler/document.go
+++ b/internal/handler/document.go
@@ -66,11 +66,11 @@ type documentServiceIface interface {
GetThumbnails(ctx context.Context, userID string, docIDs []string) (map[string]string, error)
GetDocumentImage(ctx context.Context, userID, imageID string) ([]byte, error)
GetDocumentImageForDocument(ctx context.Context, userID, docID, imageID string) ([]byte, error)
- GetDocumentThumbnail(ctx context.Context, userID, docID string) ([]byte, error)
+ GetDocumentThumbnail(ctx context.Context, docID string) ([]byte, error)
GetMetadataSummary(ctx context.Context, kbID string, docIDs []string) (map[string]interface{}, error)
GetDocumentMetadataByID(ctx context.Context, docID string) (map[string]interface{}, error)
GetDocumentArtifact(ctx context.Context, filename, userID string) (*document.ArtifactResponse, error)
- GetDocumentPreview(ctx context.Context, userID, docID string) (*document.DocumentPreview, error)
+ GetDocumentPreview(ctx context.Context, docID string) (*document.DocumentPreview, error)
UploadLocalDocuments(ctx context.Context, kb *entity.Knowledgebase, tenantID string, files []*multipart.FileHeader, parentPath string, parserConfigOverride map[string]interface{}) ([]map[string]interface{}, []string)
UploadWebDocument(ctx context.Context, kb *entity.Knowledgebase, tenantID, name, url string) (map[string]interface{}, common.ErrorCode, error)
UploadEmptyDocument(ctx context.Context, kb *entity.Knowledgebase, tenantID, name string) (map[string]interface{}, common.ErrorCode, error)
@@ -121,7 +121,7 @@ func NewDocumentHandler(documentService documentServiceIface, datasetService *da
// @Success 200 {object} map[string]interface{}
// @Router /api/v1/documents/{id} [get]
func (h *DocumentHandler) GetDocumentByID(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -140,7 +140,7 @@ func (h *DocumentHandler) GetDocumentByID(c *gin.Context) {
return
}
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: user.ID}, doc.ID, doc.KbID, permission.OperationRead); err != nil {
+ if err := service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationRead); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -224,12 +224,12 @@ func (h *DocumentHandler) GetDocumentImageForDocument(c *gin.Context) {
}
func (h *DocumentHandler) GetDocumentThumbnail(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
}
- data, err := h.documentService.GetDocumentThumbnail(c.Request.Context(), user.ID, c.Param("id"))
+ data, err := h.documentService.GetDocumentThumbnail(c.Request.Context(), c.Param("id"))
if err != nil {
common.ResponseWithCodeData(c, common.CodeDataError, nil, "Image not found.")
return
@@ -297,7 +297,7 @@ func (h *DocumentHandler) GetDocumentArtifact(c *gin.Context) {
}
func (h *DocumentHandler) GetDocumentPreview(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -311,7 +311,7 @@ func (h *DocumentHandler) GetDocumentPreview(c *gin.Context) {
}
ctx := c.Request.Context()
- preview, err := h.documentService.GetDocumentPreview(ctx, user.ID, docID)
+ preview, err := h.documentService.GetDocumentPreview(ctx, docID)
if err != nil {
switch {
case errors.Is(err, document.ErrPreviewDocumentNotFound):
@@ -325,7 +325,7 @@ func (h *DocumentHandler) GetDocumentPreview(c *gin.Context) {
// which names the object-store bucket/key -- in the server
// log only.
common.Error("GetDocumentPreview failed", err,
- zap.String("doc_id", docID), zap.String("user_id", user.ID))
+ zap.String("doc_id", docID), zap.String("user_id", permission.UserIDFromContext(ctx)))
common.ResponseWithCodeData(c, common.CodeServerError, nil, "Failed to load document preview")
}
return
@@ -353,7 +353,7 @@ func (h *DocumentHandler) GetDocumentPreview(c *gin.Context) {
// @Success 200 {object} map[string]interface{}
// @Router /api/v1/documents/{id} [put]
func (h *DocumentHandler) UpdateDocument(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -373,7 +373,7 @@ func (h *DocumentHandler) UpdateDocument(c *gin.Context) {
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 1, nil, "document not found!")
return
}
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: user.ID}, doc.ID, doc.KbID, permission.OperationUpdate); err != nil {
+ if err := service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationUpdate); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -408,7 +408,7 @@ func (h *DocumentHandler) UpdateDocument(c *gin.Context) {
// @Success 200 {object} map[string]interface{}
// @Router /api/v1/documents/{id} [delete]
func (h *DocumentHandler) DeleteDocument(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -428,7 +428,7 @@ func (h *DocumentHandler) DeleteDocument(c *gin.Context) {
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 1, nil, "document not found!")
return
}
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: user.ID}, doc.ID, doc.KbID, permission.OperationDeleteContent); err != nil {
+ if err := service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationDeleteContent); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -635,8 +635,6 @@ func (h *DocumentHandler) ListDocuments(c *gin.Context) {
page, _ := strconv.Atoi(pageStr)
pageSize, _ := strconv.Atoi(pageSizeStr)
- userID := c.GetString("user_id")
-
if orderby := c.Query("orderby"); orderby != "" {
switch orderby {
case "create_time", "update_time", "name":
@@ -647,7 +645,7 @@ func (h *DocumentHandler) ListDocuments(c *gin.Context) {
}
ctx := c.Request.Context()
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1041,7 +1039,7 @@ func (h *DocumentHandler) UploadDocuments(c *gin.Context) {
common.ResponseWithCodeData(c, common.CodeDataError, nil, fmt.Sprintf("Can't find the dataset with ID %s!", datasetID))
return
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID}, permission.OperationUpdate); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1261,7 +1259,7 @@ func (h *DocumentHandler) DownloadDocument(c *gin.Context) {
common.ErrorWithCode(c, common.CodeNotFound, "Resource not found")
return
}
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: user.ID}, doc.ID, doc.KbID, permission.OperationRead); err != nil {
+ if err := service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationRead); err != nil {
respondPermissionError(c, err, true)
return
}
@@ -1425,7 +1423,7 @@ func (h *DocumentHandler) ListIngestionTasks(c *gin.Context) {
var err error
ctx := c.Request.Context()
if req.DatasetID != nil {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: *req.DatasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: *req.DatasetID}, permission.OperationRead); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1483,7 +1481,7 @@ func (h *DocumentHandler) StartIngestionTask(c *gin.Context) {
operationLog.UserID = userID
ctx := c.Request.Context()
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1566,7 +1564,7 @@ func (h *DocumentHandler) ParseDocuments(c *gin.Context) {
userID := c.GetString("user_id")
ctx := c.Request.Context()
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1603,7 +1601,6 @@ func (h *DocumentHandler) StopParseDocuments(c *gin.Context) {
return
}
- userID := c.GetString("user_id")
if orderby := c.Query("orderby"); orderby != "" {
switch orderby {
case "create_time", "update_time", "name":
@@ -1614,7 +1611,7 @@ func (h *DocumentHandler) StopParseDocuments(c *gin.Context) {
}
ctx := c.Request.Context()
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1649,7 +1646,7 @@ func (h *DocumentHandler) StopParseDocuments(c *gin.Context) {
}
func (h *DocumentHandler) MetadataSummaryByDataset(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -1661,7 +1658,7 @@ func (h *DocumentHandler) MetadataSummaryByDataset(c *gin.Context) {
return
}
ctx := c.Request.Context()
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -1857,7 +1854,7 @@ func (h *DocumentHandler) UpdateDocumentMetadatas(c *gin.Context) {
}
func (h *DocumentHandler) handleBatchUpdateDocumentMetadatas(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -1869,7 +1866,7 @@ func (h *DocumentHandler) handleBatchUpdateDocumentMetadatas(c *gin.Context) {
return
}
ctx := c.Request.Context()
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUpdate); err != nil {
respondPermissionError(c, err, false)
return
}
diff --git a/internal/handler/document_test.go b/internal/handler/document_test.go
index 2bf8b4b1f7..8c07f4de77 100644
--- a/internal/handler/document_test.go
+++ b/internal/handler/document_test.go
@@ -222,7 +222,7 @@ func (f *fakeDocumentService) GetDocumentArtifact(ctx context.Context, filename,
ForceAttachment: false,
}, nil
}
-func (f *fakeDocumentService) GetDocumentPreview(ctx context.Context, userID, docID string) (*document.DocumentPreview, error) {
+func (f *fakeDocumentService) GetDocumentPreview(ctx context.Context, docID string) (*document.DocumentPreview, error) {
if docID == "not-found" {
return nil, document.ErrPreviewDocumentNotFound
}
@@ -338,8 +338,7 @@ func (f *fakeDocumentService) GetDocumentImageForDocument(ctx context.Context, u
f.imageID = imageID
return f.imageData, f.imageErr
}
-func (f *fakeDocumentService) GetDocumentThumbnail(ctx context.Context, userID, docID string) ([]byte, error) {
- f.imageUserID = userID
+func (f *fakeDocumentService) GetDocumentThumbnail(ctx context.Context, docID string) ([]byte, error) {
f.imageDocumentID = docID
return f.imageData, f.imageErr
}
@@ -410,9 +409,9 @@ func setupHandlerAccessContext(method, path, body string) (*gin.Context, *httpte
}
func setGinContextSubject(c *gin.Context, userID, tenantID string) {
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{
- UserID: userID, TenantID: tenantID,
- }))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(),
+ userID, tenantID,
+ ))
}
func setupDocumentPermissionDB(t *testing.T, accessible bool) {
@@ -508,9 +507,9 @@ func TestDocumentReadHandlersForbidden(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c, w := setupGinContextWithUser(tt.method, tt.path, tt.body)
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{
- UserID: "user-1", TenantID: "tenant-owner",
- }))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(),
+ "user-1", "tenant-owner",
+ ))
c.Params = tt.params
tt.handler(c)
if w.Code != tt.status {
@@ -1799,6 +1798,7 @@ func TestStopParseDocumentsHandler_NotAccessible(t *testing.T) {
c, w := setupGinContextWithUser("POST", "/api/v1/datasets/ds-1/documents/stop", `{"document_ids": ["doc-1"]}`)
// Use a user that doesn't have access to ds-1
c.Set("user_id", "other-user")
+ setGinContextSubject(c, "other-user", "tenant-owner")
c.Params = gin.Params{{Key: "dataset_id", Value: "ds-1"}}
h.StopParseDocuments(c)
diff --git a/internal/handler/file.go b/internal/handler/file.go
index 05955c1d50..12d67c98f1 100644
--- a/internal/handler/file.go
+++ b/internal/handler/file.go
@@ -424,7 +424,7 @@ func (h *FileHandler) DeleteFiles(c *gin.Context) {
return
}
- if err := h.fileService.DeleteFiles(c.Request.Context(), user.ID, req.IDs); err != nil {
+ if err := h.fileService.DeleteFiles(c.Request.Context(), req.IDs); err != nil {
if respondPermissionErrorIf(c, err, true) {
return
}
diff --git a/internal/handler/file_commit.go b/internal/handler/file_commit.go
index ff5d688d6b..0d5dadbeb5 100644
--- a/internal/handler/file_commit.go
+++ b/internal/handler/file_commit.go
@@ -88,7 +88,7 @@ func CommitFolderResolver(h *FileCommitHandler, entityType, urlParam string) gin
return
}
ctx := c.Request.Context()
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
c.Abort()
@@ -102,7 +102,7 @@ func CommitFolderResolver(h *FileCommitHandler, entityType, urlParam string) gin
if c.Request.Method == "GET" || c.Request.Method == "HEAD" {
operation = permission.OperationRead
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: id}, operation); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: id}, operation); err != nil {
respondPermissionError(c, err, true)
c.Abort()
return
@@ -147,7 +147,7 @@ func (h *FileCommitHandler) folderAccessible(c *gin.Context, userID, folderID st
if err != nil || folder == nil || folder.Type != "folder" {
return false
}
- return permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ return permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindFolder,
ID: folder.ID,
}, permission.OperationRead) == nil
@@ -672,7 +672,7 @@ func (h *FileCommitHandler) GetCommitFileContent(c *gin.Context) {
// @Success 200 {object} map[string]interface{}
// @Router /api/v1/workspace-files/{file_id}/versions [get]
func (h *FileCommitHandler) GetFileVersionHistory(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -686,7 +686,7 @@ func (h *FileCommitHandler) GetFileVersionHistory(c *gin.Context) {
ctx := c.Request.Context()
file, err := h.fileDAO.GetByID(ctx, dao.DB, fileID)
- if err != nil || file == nil || permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{
+ if err != nil || file == nil || permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindFile,
ID: fileID,
}, permission.OperationRead) != nil {
diff --git a/internal/handler/file_commit_test.go b/internal/handler/file_commit_test.go
index fa73595f7c..f377a3ab95 100644
--- a/internal/handler/file_commit_test.go
+++ b/internal/handler/file_commit_test.go
@@ -196,7 +196,7 @@ func fileCommitRouter(h *FileCommitHandler, userID string) *gin.Engine {
r := gin.New()
r.Use(func(c *gin.Context) {
c.Set("user", &entity.User{ID: userID})
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: userID, TenantID: userID}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), userID, userID))
})
r.POST("/api/v1/folders/:folder_id/commits", h.CreateCommit)
r.GET("/api/v1/folders/:folder_id/commits", h.ListCommits)
diff --git a/internal/handler/ingestion_messages_test.go b/internal/handler/ingestion_messages_test.go
index 68b81444d8..34c1a9b948 100644
--- a/internal/handler/ingestion_messages_test.go
+++ b/internal/handler/ingestion_messages_test.go
@@ -152,7 +152,7 @@ func newIngestionMessagesHandlerRouter() *gin.Engine {
r := gin.New()
r.GET("/api/v1/datasets/:dataset_id/ingestions/:log_id/messages", func(c *gin.Context) {
c.Set("user", &entity.User{ID: "user-1"})
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", "user-1"))
h.ListIngestionMessages(c)
})
return r
@@ -164,7 +164,7 @@ func newIngestionLogsHandlerRouter() *gin.Engine {
r := gin.New()
r.GET("/api/v1/datasets/:dataset_id/ingestions", func(c *gin.Context) {
c.Set("user", &entity.User{ID: "user-1"})
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", "user-1"))
h.ListIngestionLogs(c)
})
return r
diff --git a/internal/handler/providers_test.go b/internal/handler/providers_test.go
index 5ff3fc645f..49431fe034 100644
--- a/internal/handler/providers_test.go
+++ b/internal/handler/providers_test.go
@@ -107,9 +107,9 @@ func newProviderHandlerRequest(t *testing.T, body map[string]interface{}, params
ctx.Request = req
ctx.Params = params
ctx.Set("user_id", "user-1")
- ctx.Request = ctx.Request.WithContext(permission.WithSubject(ctx.Request.Context(), permission.Subject{
- UserID: "user-1", TenantID: "tenant-1",
- }))
+ ctx.Request = ctx.Request.WithContext(permission.WithIdentity(ctx.Request.Context(),
+ "user-1", "tenant-1",
+ ))
return ctx, recorder
}
@@ -339,9 +339,9 @@ func TestListModelsSavedCredentialsUsesProviderCatalogMerge(t *testing.T) {
ctx.Request = httptest.NewRequest(http.MethodGet, "/providers/OpenAI/models?use_saved_credentials=true&instance_name=default", nil)
ctx.Params = gin.Params{{Key: "provider_id_or_name", Value: "OpenAI"}}
ctx.Set("user_id", "user-1")
- ctx.Request = ctx.Request.WithContext(permission.WithSubject(ctx.Request.Context(), permission.Subject{
- UserID: "user-1", TenantID: "tenant-1",
- }))
+ ctx.Request = ctx.Request.WithContext(permission.WithIdentity(ctx.Request.Context(),
+ "user-1", "tenant-1",
+ ))
NewProviderHandler(nil, service.NewModelProviderService(), service.NewModelCallService()).ListModels(ctx)
body := decodeProviderHandlerResponse(t, recorder)
diff --git a/internal/handler/searchbot_test.go b/internal/handler/searchbot_test.go
index 7f930c02d4..320b6b0aca 100644
--- a/internal/handler/searchbot_test.go
+++ b/internal/handler/searchbot_test.go
@@ -534,7 +534,7 @@ func TestAskHandler_NoChatModel(t *testing.T) {
strings.NewReader(`{"question": "test", "kb_ids": ["kb1"]}`))
c.Request.Header.Set("Content-Type", "application/json")
c.Set("user", &entity.User{ID: "user-1"})
- c.Request = c.Request.WithContext(permission.WithSubject(c.Request.Context(), permission.Subject{UserID: "user-1"}))
+ c.Request = c.Request.WithContext(permission.WithIdentity(c.Request.Context(), "user-1", ""))
h.Ask(c)
body := buf.String()
if !strings.Contains(body, "chat model not configured") {
diff --git a/internal/handler/tenant.go b/internal/handler/tenant.go
index d21b46e25b..0d37c4080e 100644
--- a/internal/handler/tenant.go
+++ b/internal/handler/tenant.go
@@ -263,7 +263,7 @@ type CreateChunkTableRequest struct {
// @Success 200 {object} map[string]interface{}
// @Router /v1/tenant/chunk-store [post]
func (h *TenantHandler) CreateChunkStore(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -277,7 +277,7 @@ func (h *TenantHandler) CreateChunkStore(c *gin.Context) {
ctx := c.Request.Context()
// Check authorization - user must have access to this kb
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KBID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KBID}, permission.OperationUpdate); err != nil {
respondPermissionError(c, err, false)
return
}
@@ -311,7 +311,7 @@ type DeleteChunkTableRequest struct {
// @Success 200 {object} map[string]interface{}
// @Router /v1/tenant/chunk-store [delete]
func (h *TenantHandler) DeleteChunkStore(c *gin.Context) {
- user, errorCode, errorMessage := GetUser(c)
+ _, errorCode, errorMessage := GetUser(c)
if errorCode != common.CodeSuccess {
common.ErrorWithCode(c, errorCode, errorMessage)
return
@@ -325,7 +325,7 @@ func (h *TenantHandler) DeleteChunkStore(c *gin.Context) {
}
// Check authorization
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: user.ID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KBID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KBID}, permission.OperationUpdate); err != nil {
respondPermissionError(c, err, false)
return
}
diff --git a/internal/ingestion/component/dispatch_model.go b/internal/ingestion/component/dispatch_model.go
index e433de0f17..de35020653 100644
--- a/internal/ingestion/component/dispatch_model.go
+++ b/internal/ingestion/component/dispatch_model.go
@@ -177,8 +177,10 @@ 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) {
- return membershipDAO.FilterByUserIDAndTenantID(ctx, db, subject.UserID, tenantID)
+ userID := permission.UserIDFromContext(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if userID != "" && (contextTenantID == "" || contextTenantID == tenantID) {
+ return membershipDAO.FilterByUserIDAndTenantID(ctx, db, userID, tenantID)
}
return membershipDAO.GetOwnerByTenantID(ctx, db, tenantID)
}
diff --git a/internal/permission/chat_channel_database_test.go b/internal/permission/chat_channel_database_test.go
index 3b98f556dd..b787641ba7 100644
--- a/internal/permission/chat_channel_database_test.go
+++ b/internal/permission/chat_channel_database_test.go
@@ -41,20 +41,20 @@ func TestDatabaseCheckerScopesChatChannelsToTenantMembers(t *testing.T) {
}
checker := newCommunityDatabaseChecker(db)
- member := Subject{UserID: "member-a"}
+ member := permissionTestIdentity{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 {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindChatChannel, ID: "team-channel"}, operation); err != nil {
t.Errorf("member cannot %s team channel: %v", operation, err)
}
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindChatChannel, ID: "other-channel"}, OperationRead); err != ErrPermissionDenied {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindChatChannel, ID: "other-channel"}, OperationRead); err != ErrPermissionDenied {
t.Errorf("cross-tenant access error = %v, want %v", err, ErrPermissionDenied)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindChatChannel, ID: "inactive-channel"}, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindChatChannel, ID: "inactive-channel"}, OperationRead); err != nil {
t.Errorf("inactive channel should remain manageable: %v", err)
}
- scope, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: ResourceKindChatChannel, Operation: OperationRead})
+ scope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: ResourceKindChatChannel, Operation: OperationRead})
if err != nil {
t.Fatalf("scope chat channels: %v", err)
}
diff --git a/internal/permission/database_source.go b/internal/permission/database_source.go
index 6d5e0e4b78..29aa8e41a0 100644
--- a/internal/permission/database_source.go
+++ b/internal/permission/database_source.go
@@ -473,10 +473,11 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (
return resources, nil
}
-func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject, kind ResourceKind, parent ResourceRef) ([]ResourceRef, error) {
+func (s *databaseSource) ListResourceRefs(ctx context.Context, kind ResourceKind, parent ResourceRef) ([]ResourceRef, error) {
if s == nil || s.db == nil {
return nil, ErrSourceUnavailable
}
+ userID := UserIDFromContext(ctx)
var ids []string
switch kind {
case ResourceKindDataset:
@@ -486,7 +487,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
var tenantIDs []string
if err := s.db.WithContext(ctx).Model(&entity.UserTenant{}).
Distinct("tenant_id").
- Where("user_id = ? AND status = ?", subject.UserID, string(entity.StatusValid)).
+ Where("user_id = ? AND status = ?", userID, string(entity.StatusValid)).
Pluck("tenant_id", &tenantIDs).Error; err != nil {
return nil, err
}
@@ -512,11 +513,11 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
if parent.ID != "" || parent.Kind != "" {
return nil, fmt.Errorf("%w: canvases cannot have a parent scope", ErrInvalidPermission)
}
- tenantIDs, err := s.activeTenantIDsForUser(ctx, subject.UserID)
+ tenantIDs, err := s.activeTenantIDsForUser(ctx, userID)
if err != nil {
return nil, err
}
- ownerIDs := append(append(make([]string, 0, len(tenantIDs)+1), tenantIDs...), subject.UserID)
+ ownerIDs := append(append(make([]string, 0, len(tenantIDs)+1), tenantIDs...), userID)
if err := s.db.WithContext(ctx).Model(&entity.UserCanvas{}).
Where("user_id IN ? OR tenant_id IN ?", ownerIDs, tenantIDs).
Pluck("id", &ids).Error; err != nil {
@@ -538,11 +539,11 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
var tenantIDs []string
if err := s.db.WithContext(ctx).Model(&entity.UserTenant{}).
Distinct("tenant_id").
- Where("user_id = ? AND status = ?", subject.UserID, string(entity.StatusValid)).
+ Where("user_id = ? AND status = ?", userID, string(entity.StatusValid)).
Pluck("tenant_id", &tenantIDs).Error; err != nil {
return nil, err
}
- ownerIDs := append(tenantIDs, subject.UserID)
+ ownerIDs := append(tenantIDs, userID)
if err := s.db.WithContext(ctx).Model(&entity.Memory{}).
Where("tenant_id IN ?", ownerIDs).
Pluck("id", &ids).Error; err != nil {
@@ -553,7 +554,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
return nil, fmt.Errorf("%w: files and folders require a folder parent scope", ErrInvalidPermission)
}
parentQuery := s.db.WithContext(ctx).Model(&entity.File{}).
- Where("id = ? AND tenant_id = ? AND type = ?", parent.ID, subject.UserID, "folder")
+ Where("id = ? AND tenant_id = ? AND type = ?", parent.ID, userID, "folder")
var parentFile entity.File
if err := parentQuery.First(&parentFile).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -577,7 +578,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
return nil, fmt.Errorf("%w: search apps cannot have a parent scope", ErrInvalidPermission)
}
if err := s.db.WithContext(ctx).Model(&entity.Search{}).
- Where("status = ? AND created_by = ?", string(entity.StatusValid), subject.UserID).
+ Where("status = ? AND created_by = ?", string(entity.StatusValid), userID).
Pluck("id", &ids).Error; err != nil {
return nil, err
}
@@ -586,7 +587,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
return nil, fmt.Errorf("%w: chats cannot have a parent scope", ErrInvalidPermission)
}
if err := s.db.WithContext(ctx).Model(&entity.Chat{}).
- Where("tenant_id = ? AND status = ?", subject.UserID, string(entity.StatusValid)).
+ Where("tenant_id = ? AND status = ?", userID, string(entity.StatusValid)).
Pluck("id", &ids).Error; err != nil {
return nil, err
}
@@ -612,7 +613,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
if parent.ID != "" || parent.Kind != "" {
return nil, fmt.Errorf("%w: chat channels cannot have a parent scope", ErrInvalidPermission)
}
- tenantIDs, err := s.tenantIDsForSubject(ctx, subject)
+ tenantIDs, err := s.tenantIDsForCurrentUser(ctx)
if err != nil {
return nil, err
}
@@ -631,11 +632,11 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
var tenantIDs []string
if err := s.db.WithContext(ctx).Model(&entity.UserTenant{}).
Distinct("tenant_id").
- Where("user_id = ? AND status = ?", subject.UserID, string(entity.StatusValid)).
+ Where("user_id = ? AND status = ?", userID, string(entity.StatusValid)).
Pluck("tenant_id", &tenantIDs).Error; err != nil {
return nil, err
}
- tenantIDs = uniqueStringValues(append(tenantIDs, subject.UserID))
+ tenantIDs = uniqueStringValues(append(tenantIDs, userID))
if err := s.db.WithContext(ctx).Model(&entity.Connector{}).
Where("tenant_id IN ?", tenantIDs).
Pluck("id", &ids).Error; err != nil {
@@ -654,7 +655,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
if parent.ID != "" || parent.Kind != "" {
return nil, fmt.Errorf("%w: model providers cannot have a parent scope", ErrInvalidPermission)
}
- tenantIDs, err := s.tenantIDsForSubject(ctx, subject)
+ tenantIDs, err := s.tenantIDsForCurrentUser(ctx)
if err != nil {
return nil, err
}
@@ -674,7 +675,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
if parent.ID != "" {
query = query.Where("tenant_model_instance.provider_id = ?", parent.ID)
} else {
- tenantIDs, err := s.tenantIDsForSubject(ctx, subject)
+ tenantIDs, err := s.tenantIDsForCurrentUser(ctx)
if err != nil {
return nil, err
}
@@ -707,7 +708,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
case ResourceKindModelInstance:
query = query.Where("tenant_model.instance_id = ?", parent.ID)
default:
- tenantIDs, err := s.tenantIDsForSubject(ctx, subject)
+ tenantIDs, err := s.tenantIDsForCurrentUser(ctx)
if err != nil {
return nil, err
}
@@ -724,7 +725,7 @@ func (s *databaseSource) ListResourceRefs(ctx context.Context, subject Subject,
if parent.ID != "" || parent.Kind != "" {
return nil, fmt.Errorf("%w: %s resources cannot have a parent scope", ErrInvalidPermission, kind)
}
- tenantIDs, err := s.tenantIDsForSubject(ctx, subject)
+ tenantIDs, err := s.tenantIDsForCurrentUser(ctx)
if err != nil {
return nil, err
}
diff --git a/internal/permission/database_source_test.go b/internal/permission/database_source_test.go
index 853d90988a..820b96c814 100644
--- a/internal/permission/database_source_test.go
+++ b/internal/permission/database_source_test.go
@@ -15,6 +15,11 @@ import (
"gorm.io/gorm"
)
+type permissionTestIdentity struct {
+ UserID string
+ TenantID string
+}
+
func newCommunityDatabaseChecker(db *gorm.DB) *Checker {
return &Checker{policy: &communityPolicy{source: &databaseSource{db: db}}}
}
@@ -52,7 +57,7 @@ func TestDatabaseCheckerAuthorizesDatasetFromPersistedRows(t *testing.T) {
}
checker := newCommunityDatabaseChecker(db)
- subject := Subject{UserID: membership.UserID}
+ subject := permissionTestIdentity{UserID: membership.UserID}
resources, err := (&databaseSource{db: db}).GetResources(context.Background(), []ResourceRef{{
Kind: ResourceKindDataset,
ID: dataset.ID,
@@ -65,16 +70,16 @@ func TestDatabaseCheckerAuthorizesDatasetFromPersistedRows(t *testing.T) {
}
ref := ResourceRef{Kind: ResourceKindDataset, ID: dataset.ID}
- if err := checker.CheckResource(context.Background(), subject, ref, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), subject.UserID, subject.TenantID), ref, OperationRead); err != nil {
t.Errorf("CheckResource(%+v) error = %v, want nil", ref, err)
}
for _, operation := range []Operation{OperationRead, OperationUpdate, OperationDeleteContent, OperationRun, OperationUse} {
- if err := checker.CheckResource(context.Background(), subject, ref, operation); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), subject.UserID, subject.TenantID), ref, operation); err != nil {
t.Errorf("shared dataset CheckResource(%s) error = %v, want nil", operation, err)
}
}
for _, operation := range []Operation{OperationCreate, OperationDelete, OperationShare} {
- if err := checker.CheckResource(context.Background(), subject, ref, operation); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), subject.UserID, subject.TenantID), ref, operation); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("shared dataset CheckResource(%s) error = %v, want permission denied", operation, err)
}
}
@@ -85,14 +90,14 @@ func TestDatabaseCheckerAuthorizesDatasetFromPersistedRows(t *testing.T) {
if err := db.Create(&adminMembership).Error; err != nil {
t.Fatalf("create admin membership: %v", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: adminMembership.UserID}, ref, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), adminMembership.UserID, ""), ref, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("CheckResource(admin member) error = %v, want %v", err, ErrPermissionDenied)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: ownerMembership.UserID}, ref, OperationDelete); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), ownerMembership.UserID, ""), ref, OperationDelete); err != nil {
t.Errorf("tenant owner CheckResource(delete dataset) error = %v, want nil", err)
}
- access, err := checker.ResolveAccess(context.Background(), subject, ref)
+ access, err := checker.ResolveAccess(WithIdentity(context.Background(), subject.UserID, subject.TenantID), ref)
if err != nil {
t.Fatalf("ResolveAccess(dataset) error = %v", err)
}
@@ -134,7 +139,7 @@ func TestDatabaseCheckerValidatesTenantRoleIDsAndLegacyMembershipRoles(t *testin
}
checker := newCommunityDatabaseChecker(db)
- if err := checker.CheckTenant(t.Context(), Subject{UserID: "role-user"}, "tenant-1", TenantMember); err != nil {
+ if err := checker.CheckTenant(WithIdentity(t.Context(), "role-user", ""), "tenant-1", TenantMember); err != nil {
t.Fatalf("valid Tenant role ID should be normalized to an ordinary member: %v", err)
}
for _, test := range []struct {
@@ -145,14 +150,14 @@ func TestDatabaseCheckerValidatesTenantRoleIDsAndLegacyMembershipRoles(t *testin
{userID: "unknown-role-user", tenantID: "tenant-1"},
{userID: "invite-user", tenantID: "tenant-1"},
} {
- if err := checker.CheckTenant(t.Context(), Subject{UserID: test.userID}, test.tenantID, TenantMember); !errors.Is(err, ErrMembershipNotFound) {
+ if err := checker.CheckTenant(WithIdentity(t.Context(), test.userID, ""), test.tenantID, TenantMember); !errors.Is(err, ErrMembershipNotFound) {
t.Errorf("CheckTenant(%q) error = %v, want %v", test.userID, err, ErrMembershipNotFound)
}
}
- if err := checker.CheckTenant(t.Context(), Subject{UserID: "admin-user"}, "tenant-1", TenantNormalMember); !errors.Is(err, ErrMembershipNotFound) {
+ if err := checker.CheckTenant(WithIdentity(t.Context(), "admin-user", ""), "tenant-1", TenantNormalMember); !errors.Is(err, ErrMembershipNotFound) {
t.Errorf("admin CheckTenant(normal member) error = %v, want %v", err, ErrMembershipNotFound)
}
- if err := checker.CheckTenant(t.Context(), Subject{UserID: "normal-user"}, "tenant-1", TenantNormalMember); err != nil {
+ if err := checker.CheckTenant(WithIdentity(t.Context(), "normal-user", ""), "tenant-1", TenantNormalMember); err != nil {
t.Errorf("normal member CheckTenant(normal member) error = %v, want nil", err)
}
@@ -197,7 +202,7 @@ func TestDatabaseCheckerRejectsPrivateDatasetForOtherTenantMember(t *testing.T)
t.Fatalf("create owner membership: %v", err)
}
- err = newCommunityDatabaseChecker(db).CheckResource(context.Background(), Subject{UserID: membership.UserID}, ResourceRef{
+ err = newCommunityDatabaseChecker(db).CheckResource(WithIdentity(context.Background(), membership.UserID, ""), ResourceRef{
Kind: ResourceKindDataset,
ID: dataset.ID,
}, OperationRead)
@@ -239,7 +244,7 @@ func TestDatabaseCheckerScopesDatasetsToMembershipAndVisibility(t *testing.T) {
}
checker := newCommunityDatabaseChecker(db)
- scope, err := checker.Scope(context.Background(), Subject{UserID: "member-user"}, ScopeQuery{
+ scope, err := checker.Scope(WithIdentity(context.Background(), "member-user", ""), ScopeQuery{
Kind: ResourceKindDataset, Operation: OperationRead,
})
if err != nil {
@@ -249,7 +254,7 @@ func TestDatabaseCheckerScopesDatasetsToMembershipAndVisibility(t *testing.T) {
t.Fatalf("Scope(datasets) = %+v, want only the team-visible dataset", scope)
}
- adminScope, err := checker.Scope(context.Background(), Subject{UserID: "admin-user"}, ScopeQuery{
+ adminScope, err := checker.Scope(WithIdentity(context.Background(), "admin-user", ""), ScopeQuery{
Kind: ResourceKindDataset, Operation: OperationRead,
})
if err != nil {
@@ -259,7 +264,7 @@ func TestDatabaseCheckerScopesDatasetsToMembershipAndVisibility(t *testing.T) {
t.Fatalf("Scope(datasets, admin) = %+v, want no accessible datasets", adminScope)
}
- queryScope, err := checker.QueryScope(context.Background(), Subject{UserID: "member-user"}, ScopeQuery{
+ queryScope, err := checker.QueryScope(WithIdentity(context.Background(), "member-user", ""), ScopeQuery{
Kind: ResourceKindDataset, Operation: OperationRead,
})
if err != nil {
@@ -272,7 +277,7 @@ func TestDatabaseCheckerScopesDatasetsToMembershipAndVisibility(t *testing.T) {
if len(queryIDs) != 1 || queryIDs[0] != "team-visible" {
t.Fatalf("QueryScope(datasets) returned %v, want only team-visible", queryIDs)
}
- adminQueryScope, err := checker.QueryScope(context.Background(), Subject{UserID: "admin-user"}, ScopeQuery{
+ adminQueryScope, err := checker.QueryScope(WithIdentity(context.Background(), "admin-user", ""), ScopeQuery{
Kind: ResourceKindDataset, Operation: OperationRead,
})
if err != nil {
@@ -317,7 +322,7 @@ func TestCheckerQueryScopeFallsBackToAuthorizedIDs(t *testing.T) {
},
candidates: []ResourceRef{chatRef},
}
- queryScope, err := NewChecker(source).QueryScope(context.Background(), Subject{UserID: "member"}, ScopeQuery{
+ queryScope, err := NewChecker(source).QueryScope(WithIdentity(context.Background(), "member", ""), ScopeQuery{
Kind: ResourceKindChat, Operation: OperationRead,
})
if err != nil {
@@ -370,31 +375,31 @@ func TestDatabaseCheckerSharedCanvasRestrictsOwnerOperations(t *testing.T) {
privateCanvas := ResourceRef{Kind: ResourceKindCanvas, ID: "private-canvas"}
for _, operation := range []Operation{OperationRead, OperationUpdate, OperationRun, OperationUse} {
- if err := checker.CheckResource(context.Background(), Subject{UserID: membership.UserID}, teamCanvas, operation); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), membership.UserID, ""), teamCanvas, operation); err != nil {
t.Errorf("team member CheckResource(%s) error = %v, want nil", operation, err)
}
}
for _, operation := range []Operation{OperationShare, OperationDelete} {
- if err := checker.CheckResource(context.Background(), Subject{UserID: membership.UserID}, teamCanvas, operation); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), membership.UserID, ""), teamCanvas, operation); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(%s) error = %v, want permission denied", operation, err)
}
}
for _, operation := range []Operation{OperationShare, OperationDelete} {
- if err := checker.CheckResource(context.Background(), Subject{UserID: "owner-1"}, teamCanvas, operation); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "owner-1", ""), teamCanvas, operation); err != nil {
t.Errorf("canvas owner CheckResource(%s) error = %v, want nil", operation, err)
}
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: adminMembership.UserID}, teamCanvas, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), adminMembership.UserID, ""), teamCanvas, OperationRead); err != nil {
t.Errorf("tenant admin CheckResource(read) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "owner-1"}, privateCanvas, OperationDelete); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "owner-1", ""), privateCanvas, OperationDelete); err != nil {
t.Errorf("owner CheckResource(delete) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, teamCanvas, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), teamCanvas, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(read) error = %v, want permission denied", err)
}
- scope, err := checker.Scope(context.Background(), Subject{UserID: membership.UserID}, ScopeQuery{
+ scope, err := checker.Scope(WithIdentity(context.Background(), membership.UserID, ""), ScopeQuery{
Kind: ResourceKindCanvas, Operation: OperationRead,
})
if err != nil {
@@ -433,7 +438,7 @@ func TestDatabaseCheckerListsTenantCanvasCreatedByAnotherMember(t *testing.T) {
t.Fatalf("create canvases: %v", err)
}
- scope, err := newCommunityDatabaseChecker(db).Scope(context.Background(), Subject{UserID: membership.UserID}, ScopeQuery{
+ scope, err := newCommunityDatabaseChecker(db).Scope(WithIdentity(context.Background(), membership.UserID, ""), ScopeQuery{
Kind: ResourceKindCanvas, Operation: OperationRead,
})
if err != nil {
@@ -460,17 +465,17 @@ func TestDatabaseCheckerRestrictsAgentSessionRunToCreator(t *testing.T) {
}
checker := newCommunityDatabaseChecker(db)
session := ResourceRef{Kind: ResourceKindAgentSession, ID: "session-1"}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "session-owner"}, session, OperationRun); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "session-owner", ""), session, OperationRun); err != nil {
t.Fatalf("session owner CheckResource(run) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "canvas-owner"}, session, OperationRun); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "canvas-owner", ""), session, OperationRun); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("canvas owner CheckResource(run) error = %v, want permission denied for another user's session", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, session, OperationRun); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), session, OperationRun); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(run) error = %v, want permission denied", err)
}
- scope, err := checker.Scope(context.Background(), Subject{UserID: "session-owner"}, ScopeQuery{
+ scope, err := checker.Scope(WithIdentity(context.Background(), "session-owner", ""), ScopeQuery{
Kind: ResourceKindAgentSession, Parent: ResourceRef{Kind: ResourceKindCanvas, ID: "canvas-1"}, Operation: OperationRun,
})
if err != nil {
@@ -523,22 +528,22 @@ func TestDatabaseCheckerAuthorizesMemoryFromPersistedRows(t *testing.T) {
t.Errorf("memory resource %q has tenant %q and owner %q; current memory schema uses tenant_id as owner identity", resource.Ref.ID, resource.TenantID, resource.OwnerUserID)
}
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: membership.UserID}, teamRef, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), membership.UserID, ""), teamRef, OperationRead); err != nil {
t.Errorf("team member CheckResource(read) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: membership.UserID}, teamRef, OperationUpdate); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), membership.UserID, ""), teamRef, OperationUpdate); err != nil {
t.Errorf("team member CheckResource(update) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: membership.UserID}, teamRef, OperationShare); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), membership.UserID, ""), teamRef, OperationShare); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(share) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, teamRef, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), teamRef, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "owner-1"}, privateRef, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "owner-1", ""), privateRef, OperationRead); err != nil {
t.Errorf("memory owner CheckResource(read) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: membership.UserID}, privateRef, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), membership.UserID, ""), privateRef, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(private read) error = %v, want permission denied", err)
}
}
@@ -574,7 +579,7 @@ func TestDatabaseCheckerScopesMemoriesToOwnerAndTeamMembership(t *testing.T) {
}
}
- scope, err := newCommunityDatabaseChecker(db).Scope(context.Background(), Subject{UserID: "member-1"}, ScopeQuery{
+ scope, err := newCommunityDatabaseChecker(db).Scope(WithIdentity(context.Background(), "member-1", ""), ScopeQuery{
Kind: ResourceKindMemory, Operation: OperationRead,
})
if err != nil {
@@ -657,19 +662,19 @@ func TestDatabaseCheckerAuthorizesFilesThroughLinkedDatasetAccess(t *testing.T)
checker := newCommunityDatabaseChecker(db)
teamFile := ResourceRef{Kind: ResourceKindFile, ID: "team-file"}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "team-member"}, teamFile, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "team-member", ""), teamFile, OperationRead); err != nil {
t.Errorf("team member CheckResource(file read) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "team-admin"}, teamFile, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "team-admin", ""), teamFile, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team admin CheckResource(file read) error = %v, want permission denied (dataset access requires a normal member)", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, teamFile, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), teamFile, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(file read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "private-owner"}, ResourceRef{Kind: ResourceKindFile, ID: "private-file"}, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "private-owner", ""), ResourceRef{Kind: ResourceKindFile, ID: "private-file"}, OperationRead); err != nil {
t.Errorf("private dataset owner CheckResource(file read) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "team-member"}, ResourceRef{Kind: ResourceKindFile, ID: "private-file"}, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "team-member", ""), ResourceRef{Kind: ResourceKindFile, ID: "private-file"}, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(private file read) error = %v, want permission denied", err)
}
@@ -749,7 +754,7 @@ func TestDatabaseCheckerScopesFilesAndFoldersToOwnedFolder(t *testing.T) {
{kind: ResourceKindFile, want: "child-file"},
{kind: ResourceKindFolder, want: "child-folder"},
} {
- scope, err := checker.Scope(context.Background(), Subject{UserID: "user-1"}, ScopeQuery{
+ scope, err := checker.Scope(WithIdentity(context.Background(), "user-1", ""), ScopeQuery{
Kind: test.kind, Parent: parent, Operation: OperationRead,
})
if err != nil {
@@ -759,14 +764,14 @@ func TestDatabaseCheckerScopesFilesAndFoldersToOwnedFolder(t *testing.T) {
t.Errorf("Scope(%s) = %+v, want only %q", test.kind, scope, test.want)
}
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "user-1"}, ResourceRef{Kind: ResourceKindFolder, ID: "child-file"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "user-1", ""), ResourceRef{Kind: ResourceKindFolder, ID: "child-file"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("folder ref to a file CheckResource error = %v, want resource not found", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "user-1"}, ResourceRef{Kind: ResourceKindFile, ID: "child-folder"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "user-1", ""), ResourceRef{Kind: ResourceKindFile, ID: "child-folder"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("file ref to a folder CheckResource error = %v, want resource not found", err)
}
otherParent := ResourceRef{Kind: ResourceKindFolder, ID: "root"}
- if scope, err := checker.Scope(context.Background(), Subject{UserID: "user-2"}, ScopeQuery{
+ if scope, err := checker.Scope(WithIdentity(context.Background(), "user-2", ""), ScopeQuery{
Kind: ResourceKindFile, Parent: otherParent, Operation: OperationRead,
}); err != nil || scope.Mode != ScopeNone {
t.Errorf("Scope(other user's folder) = (%+v, %v), want empty scope", scope, err)
@@ -819,22 +824,22 @@ func TestDatabaseCheckerKeepsChatsPrivateToTheirOwner(t *testing.T) {
checker := newCommunityDatabaseChecker(db)
teamChat := ResourceRef{Kind: ResourceKindChat, ID: "team-chat"}
- member := Subject{UserID: membership.UserID}
+ member := permissionTestIdentity{UserID: membership.UserID}
for _, operation := range []Operation{OperationRead, OperationCreate, OperationRun, OperationUse} {
- if err := checker.CheckResource(context.Background(), member, teamChat, operation); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), teamChat, operation); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(chat, %s) error = %v, want permission denied", operation, err)
}
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "team-tenant"}, teamChat, OperationUpdate); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "team-tenant", ""), teamChat, OperationUpdate); err != nil {
t.Errorf("chat owner CheckResource(update) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "invite-1"}, teamChat, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "invite-1", ""), teamChat, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("invited user CheckResource(read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindChat, ID: "inactive-chat"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindChat, ID: "inactive-chat"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("inactive chat CheckResource(read) error = %v, want resource not found", err)
}
- scope, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: ResourceKindChat, Operation: OperationRead})
+ scope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: ResourceKindChat, Operation: OperationRead})
if err != nil {
t.Fatalf("Scope(chats) error = %v", err)
}
@@ -842,7 +847,7 @@ func TestDatabaseCheckerKeepsChatsPrivateToTheirOwner(t *testing.T) {
t.Fatalf("team member Scope(chats) = %+v, want empty scope", scope)
}
- ownerScope, err := checker.Scope(context.Background(), Subject{UserID: "team-tenant"}, ScopeQuery{Kind: ResourceKindChat, Operation: OperationRead})
+ ownerScope, err := checker.Scope(WithIdentity(context.Background(), "team-tenant", ""), ScopeQuery{Kind: ResourceKindChat, Operation: OperationRead})
if err != nil {
t.Fatalf("owner Scope(chats) error = %v", err)
}
@@ -889,34 +894,34 @@ func TestDatabaseCheckerScopesChatSessionsAndRestrictsMutations(t *testing.T) {
}
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 {
+ reader := permissionTestIdentity{UserID: "team-reader"}
+ if err := checker.CheckResource(WithIdentity(context.Background(), reader.UserID, reader.TenantID), creatorSession, OperationRead); err != nil {
t.Errorf("tenant member CheckResource(session read) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), reader, creatorSession, OperationUpdate); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), reader.UserID, reader.TenantID), creatorSession, OperationUpdate); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("tenant member CheckResource(session update) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: creatorID}, creatorSession, OperationUpdate); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), creatorID, ""), creatorSession, OperationUpdate); err != nil {
t.Errorf("session creator CheckResource(update) error = %v, want nil", err)
}
- creatorAccess, err := checker.ResolveAccess(context.Background(), Subject{UserID: creatorID}, creatorSession)
+ creatorAccess, err := checker.ResolveAccess(WithIdentity(context.Background(), creatorID, ""), creatorSession)
if err != nil {
t.Fatalf("session creator ResolveAccess() error = %v", err)
}
if creatorAccess.Source != AccessSourceCreator {
t.Errorf("session creator access source = %q, want %q", creatorAccess.Source, AccessSourceCreator)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: chat.TenantID}, creatorSession, OperationDelete); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), chat.TenantID, ""), creatorSession, OperationDelete); err != nil {
t.Errorf("chat owner CheckResource(session delete) error = %v, want nil", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: removedCreatorID}, ResourceRef{Kind: ResourceKindChatSession, ID: "removed-creator-session"}, OperationUpdate); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), removedCreatorID, ""), ResourceRef{Kind: ResourceKindChatSession, ID: "removed-creator-session"}, OperationUpdate); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("creator without active membership CheckResource(update) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, creatorSession, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), creatorSession, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(session read) error = %v, want permission denied", err)
}
- scope, err := checker.Scope(context.Background(), reader, ScopeQuery{
+ scope, err := checker.Scope(WithIdentity(context.Background(), reader.UserID, reader.TenantID), ScopeQuery{
Kind: ResourceKindChatSession, Parent: ResourceRef{Kind: ResourceKindChat, ID: chat.ID}, Operation: OperationRead,
})
if err != nil {
@@ -962,27 +967,27 @@ func TestDatabaseCheckerKeepsSearchAppsPrivateToTheirCreator(t *testing.T) {
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) {
+ member := permissionTestIdentity{UserID: "member-1"}
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), teamSearch, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("tenant member CheckResource(search read) error = %v, want permission denied", err)
}
for _, operation := range []Operation{OperationUpdate, OperationDelete, OperationRun, OperationUse} {
- if err := checker.CheckResource(context.Background(), member, teamSearch, operation); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), teamSearch, operation); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("tenant member CheckResource(search %s) error = %v, want permission denied", operation, err)
}
}
for _, operation := range []Operation{OperationRead, OperationUpdate, OperationDelete, OperationRun, OperationUse} {
- if err := checker.CheckResource(context.Background(), Subject{UserID: "team-owner"}, teamSearch, operation); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "team-owner", ""), teamSearch, operation); err != nil {
t.Errorf("creator CheckResource(search %s) error = %v, want nil", operation, err)
}
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "invite-1"}, teamSearch, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "invite-1", ""), teamSearch, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("invited user CheckResource(search read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, teamSearch, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), teamSearch, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(search read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindSearchApp, ID: "inactive-search"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindSearchApp, ID: "inactive-search"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("inactive search CheckResource(read) error = %v, want resource not found", err)
}
@@ -997,14 +1002,14 @@ func TestDatabaseCheckerKeepsSearchAppsPrivateToTheirCreator(t *testing.T) {
t.Errorf("search authorization facts = %+v, want tenant team-tenant and creator/owner team-owner", got)
}
- readScope, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: ResourceKindSearchApp, Operation: OperationRead})
+ readScope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: ResourceKindSearchApp, Operation: OperationRead})
if err != nil {
t.Fatalf("Scope(search read) error = %v", err)
}
if readScope.Mode != ScopeIDs || len(readScope.ResourceIDs) != 1 || readScope.ResourceIDs[0] != "member-search" {
t.Fatalf("Scope(search read) = %+v, want only member-search", readScope)
}
- runScope, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: ResourceKindSearchApp, Operation: OperationRun})
+ runScope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: ResourceKindSearchApp, Operation: OperationRun})
if err != nil {
t.Fatalf("Scope(search run) error = %v", err)
}
@@ -1072,55 +1077,55 @@ func TestDatabaseCheckerAuthorizesConnectorsAndSyncTasks(t *testing.T) {
}
checker := newCommunityDatabaseChecker(db)
- member := Subject{UserID: "team-member"}
+ member := permissionTestIdentity{UserID: "team-member"}
teamConnector := ResourceRef{Kind: ResourceKindConnector, ID: "team-connector"}
for _, operation := range []Operation{OperationRun, OperationUse} {
- if err := checker.CheckResource(context.Background(), member, teamConnector, operation); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), teamConnector, operation); err != nil {
t.Errorf("team member CheckResource(connector %s) error = %v, want nil", operation, err)
}
}
for _, operation := range []Operation{OperationRead, OperationUpdate, OperationDelete} {
- if err := checker.CheckResource(context.Background(), member, teamConnector, operation); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), teamConnector, operation); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(connector %s) error = %v, want permission denied", operation, err)
}
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "invited-user"}, teamConnector, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "invited-user", ""), teamConnector, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("invited user CheckResource(connector read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), Subject{UserID: "outsider"}, teamConnector, OperationRead); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), "outsider", ""), teamConnector, OperationRead); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("outsider CheckResource(connector read) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindConnector, ID: "personal-connector"}, OperationRead); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindConnector, ID: "personal-connector"}, OperationRead); err != nil {
t.Errorf("connector owner CheckResource(read) error = %v, want nil", err)
}
linkedTask := ResourceRef{Kind: ResourceKindSyncTask, ID: "linked-task"}
for _, operation := range []Operation{OperationRead, OperationRun} {
- if err := checker.CheckResource(context.Background(), member, linkedTask, operation); err != nil {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), linkedTask, operation); err != nil {
t.Errorf("team member CheckResource(sync task %s) error = %v, want nil", operation, err)
}
}
- if err := checker.CheckResource(context.Background(), member, linkedTask, OperationDelete); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), linkedTask, OperationDelete); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(sync task delete) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindSyncTask, ID: "unlinked-task"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindSyncTask, ID: "unlinked-task"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("unlinked sync task CheckResource(read) error = %v, want resource not found", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindSyncTask, ID: "prune-task"}, OperationRun); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindSyncTask, ID: "prune-task"}, OperationRun); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(prune task run) error = %v, want permission denied", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindSyncTask, ID: "completed-task"}, OperationRun); !errors.Is(err, ErrPermissionDenied) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindSyncTask, ID: "completed-task"}, OperationRun); !errors.Is(err, ErrPermissionDenied) {
t.Errorf("team member CheckResource(completed task run) error = %v, want permission denied", err)
}
- connectorScope, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: ResourceKindConnector, Operation: OperationRead})
+ connectorScope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: ResourceKindConnector, Operation: OperationRead})
if err != nil {
t.Fatalf("Scope(connectors) error = %v", err)
}
if connectorScope.Mode != ScopeIDs || len(connectorScope.ResourceIDs) != 1 || connectorScope.ResourceIDs[0] != "personal-connector" {
t.Fatalf("Scope(connectors) = %+v, want personal connector only", connectorScope)
}
- taskScope, err := checker.Scope(context.Background(), member, ScopeQuery{
+ taskScope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{
Kind: ResourceKindSyncTask, Parent: teamConnector, Operation: OperationRead,
})
if err != nil {
@@ -1129,7 +1134,7 @@ func TestDatabaseCheckerAuthorizesConnectorsAndSyncTasks(t *testing.T) {
if taskScope.Mode != ScopeIDs || len(taskScope.ResourceIDs) != 3 {
t.Fatalf("Scope(sync tasks) = %+v, want linked sync and prune task logs", taskScope)
}
- if _, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: ResourceKindSyncTask, Operation: OperationRead}); !errors.Is(err, ErrInvalidPermission) {
+ if _, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: ResourceKindSyncTask, Operation: OperationRead}); !errors.Is(err, ErrInvalidPermission) {
t.Errorf("Scope(sync tasks without connector) error = %v, want invalid permission", err)
}
}
@@ -1190,13 +1195,13 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
}
checker := newCommunityDatabaseChecker(db)
- member := Subject{UserID: "team-member"}
+ member := permissionTestIdentity{UserID: "team-member"}
providerRef := ResourceRef{Kind: ResourceKindModelProvider, ID: "team-provider"}
instanceRef := ResourceRef{Kind: ResourceKindModelInstance, ID: "team-instance"}
modelRef := ResourceRef{Kind: ResourceKindModel, ID: "team-model"}
for _, test := range []struct {
name string
- subject Subject
+ subject permissionTestIdentity
ref ResourceRef
operation Operation
wantErr error
@@ -1208,11 +1213,11 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
{name: "member reads model", subject: member, ref: modelRef, operation: OperationRead},
{name: "member uses model", subject: member, ref: modelRef, operation: OperationUse},
{name: "member cannot manage model", subject: member, ref: modelRef, operation: OperationUpdate, wantErr: ErrPermissionDenied},
- {name: "outsider cannot use model", subject: Subject{UserID: "outsider"}, ref: modelRef, operation: OperationUse, wantErr: ErrPermissionDenied},
- {name: "invite cannot use model", subject: Subject{UserID: "team-invite"}, ref: modelRef, operation: OperationUse, wantErr: ErrPermissionDenied},
+ {name: "outsider cannot use model", subject: permissionTestIdentity{UserID: "outsider"}, ref: modelRef, operation: OperationUse, wantErr: ErrPermissionDenied},
+ {name: "invite cannot use model", subject: permissionTestIdentity{UserID: "team-invite"}, ref: modelRef, operation: OperationUse, wantErr: ErrPermissionDenied},
} {
t.Run(test.name, func(t *testing.T) {
- err := checker.CheckResource(context.Background(), test.subject, test.ref, test.operation)
+ err := checker.CheckResource(WithIdentity(context.Background(), test.subject.UserID, test.subject.TenantID), test.ref, test.operation)
if test.wantErr == nil && err != nil {
t.Fatalf("CheckResource(%s) error = %v, want nil", test.name, err)
}
@@ -1222,11 +1227,11 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
})
}
- owner := Subject{UserID: "team-owner"}
- if err := checker.CheckResource(context.Background(), owner, instanceRef, OperationRead); err != nil {
+ owner := permissionTestIdentity{UserID: "team-owner"}
+ if err := checker.CheckResource(WithIdentity(context.Background(), owner.UserID, owner.TenantID), instanceRef, OperationRead); err != nil {
t.Errorf("tenant owner cannot read instance credentials: %v", err)
}
- if err := checker.CheckResource(context.Background(), member, ResourceRef{Kind: ResourceKindModel, ID: "malformed-model"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ResourceRef{Kind: ResourceKindModel, ID: "malformed-model"}, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("cross-provider model CheckResource error = %v, want resource not found", err)
}
@@ -1247,7 +1252,7 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
if operation == "" {
operation = OperationRead
}
- scope, err := checker.Scope(context.Background(), member, ScopeQuery{
+ scope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{
Kind: query.kind, Parent: query.parent, Operation: operation,
})
if err != nil {
@@ -1258,7 +1263,7 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t
}
})
}
- if _, err := checker.Scope(context.Background(), member, ScopeQuery{
+ if _, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{
Kind: ResourceKindModelInstance,
Parent: ResourceRef{Kind: ResourceKindModel, ID: "team-model"},
Operation: OperationRead,
@@ -1332,15 +1337,15 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
}
checker := newCommunityDatabaseChecker(db)
- member := Subject{UserID: "team-member"}
- owner := Subject{UserID: "team-owner"}
- outsider := Subject{UserID: "outsider"}
- invite := Subject{UserID: "team-invite"}
+ member := permissionTestIdentity{UserID: "team-member"}
+ owner := permissionTestIdentity{UserID: "team-owner"}
+ outsider := permissionTestIdentity{UserID: "outsider"}
+ invite := permissionTestIdentity{UserID: "team-invite"}
mcpRef := ResourceRef{Kind: ResourceKindMCPServer, ID: "team-mcp"}
spaceRef := ResourceRef{Kind: ResourceKindSkillSpace, ID: "active-space"}
for _, test := range []struct {
name string
- subject Subject
+ subject permissionTestIdentity
ref ResourceRef
operation Operation
wantErr error
@@ -1360,7 +1365,7 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
{name: "deleting skill space remains addressable", subject: member, ref: ResourceRef{Kind: ResourceKindSkillSpace, ID: "deleting-space"}, operation: OperationRead},
} {
t.Run(test.name, func(t *testing.T) {
- err := checker.CheckResource(context.Background(), test.subject, test.ref, test.operation)
+ err := checker.CheckResource(WithIdentity(context.Background(), test.subject.UserID, test.subject.TenantID), test.ref, test.operation)
if test.wantErr == nil && err != nil {
t.Fatalf("CheckResource error = %v, want nil", err)
}
@@ -1372,7 +1377,7 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
for _, id := range []string{"deleted-space", "wrong-folder-type-space", "cross-tenant-folder-space", "missing-folder-space"} {
ref := ResourceRef{Kind: ResourceKindSkillSpace, ID: id}
- if err := checker.CheckResource(context.Background(), member, ref, OperationRead); !errors.Is(err, ErrResourceNotFound) {
+ if err := checker.CheckResource(WithIdentity(context.Background(), member.UserID, member.TenantID), ref, OperationRead); !errors.Is(err, ErrResourceNotFound) {
t.Errorf("CheckResource(%q) error = %v, want resource not found", id, err)
}
}
@@ -1392,7 +1397,7 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
for _, kind := range []ResourceKind{ResourceKindMCPServer, ResourceKindSkillSpace} {
t.Run("scope "+string(kind), func(t *testing.T) {
- scope, err := checker.Scope(context.Background(), member, ScopeQuery{Kind: kind, Operation: OperationRead})
+ scope, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{Kind: kind, Operation: OperationRead})
if err != nil {
t.Fatalf("Scope(%s) error = %v", kind, err)
}
@@ -1410,7 +1415,7 @@ func TestDatabaseCheckerAuthorizesMCPServersAndSkillSpaces(t *testing.T) {
t.Fatalf("Scope(%s) = %+v, want IDs %v", kind, scope, want)
}
})
- if _, err := checker.Scope(context.Background(), member, ScopeQuery{
+ if _, err := checker.Scope(WithIdentity(context.Background(), member.UserID, member.TenantID), ScopeQuery{
Kind: kind, Parent: ResourceRef{Kind: ResourceKindCanvas, ID: "unexpected-parent"}, Operation: OperationRead,
}); !errors.Is(err, ErrInvalidPermission) {
t.Errorf("Scope(%s with parent) error = %v, want invalid permission", kind, err)
diff --git a/internal/permission/file_query_scope_test.go b/internal/permission/file_query_scope_test.go
index 0eeeb76e21..bc9dc1331b 100644
--- a/internal/permission/file_query_scope_test.go
+++ b/internal/permission/file_query_scope_test.go
@@ -75,7 +75,7 @@ func TestFileQueryScopeFiltersInSQLAndReturnsBatchAccessMasks(t *testing.T) {
checker := newCommunityDatabaseChecker(db)
ctx := context.Background()
- scope, err := checker.QueryScope(ctx, Subject{UserID: "reader", TenantID: "file-tenant"}, ScopeQuery{
+ scope, err := checker.QueryScope(WithIdentity(ctx, "reader", "file-tenant"), ScopeQuery{
Kind: ResourceKindFile,
Parent: ResourceRef{Kind: ResourceKindFolder, ID: "root"},
Operation: OperationRead,
@@ -98,7 +98,7 @@ func TestFileQueryScopeFiltersInSQLAndReturnsBatchAccessMasks(t *testing.T) {
{Kind: ResourceKindFile, ID: "reader-owned"},
{Kind: ResourceKindFile, ID: "team-linked"},
}
- accesses, err := checker.FilterAccesses(ctx, Subject{UserID: "reader", TenantID: "file-tenant"}, refs, OperationRead)
+ accesses, err := checker.FilterAccesses(WithIdentity(ctx, "reader", "file-tenant"), refs, OperationRead)
if err != nil {
t.Fatalf("resolve page access masks: %v", err)
}
diff --git a/internal/permission/mcp_query_scope_test.go b/internal/permission/mcp_query_scope_test.go
index 1160db2db9..3d67f2df28 100644
--- a/internal/permission/mcp_query_scope_test.go
+++ b/internal/permission/mcp_query_scope_test.go
@@ -41,7 +41,7 @@ func TestCommunityMCPQueryScopeFiltersBeforeListing(t *testing.T) {
{userID: "owner", want: 1},
{userID: "member", want: 0},
} {
- scope, err := checker.QueryScope(context.Background(), Subject{UserID: test.userID, TenantID: "tenant-1"}, query)
+ scope, err := checker.QueryScope(WithIdentity(context.Background(), test.userID, "tenant-1"), query)
if err != nil {
t.Fatalf("QueryScope(%q): %v", test.userID, err)
}
diff --git a/internal/permission/model_resources.go b/internal/permission/model_resources.go
index e017eb4999..bfa347b915 100644
--- a/internal/permission/model_resources.go
+++ b/internal/permission/model_resources.go
@@ -105,12 +105,13 @@ func (s *databaseSource) loadTenantOwnerIDs(ctx context.Context, tenantIDs []str
return ownersByTenant, nil
}
-func (s *databaseSource) tenantIDsForSubject(ctx context.Context, subject Subject) ([]string, error) {
- tenantIDs, err := s.activeTenantIDsForUser(ctx, subject.UserID)
+func (s *databaseSource) tenantIDsForCurrentUser(ctx context.Context) ([]string, error) {
+ userID := UserIDFromContext(ctx)
+ tenantIDs, err := s.activeTenantIDsForUser(ctx, userID)
if err != nil {
return nil, err
}
- return uniqueStringValues(append(tenantIDs, subject.UserID)), nil
+ return uniqueStringValues(append(tenantIDs, userID)), nil
}
// modelProviderResource builds permission metadata for a model provider.
diff --git a/internal/permission/policy.go b/internal/permission/policy.go
index c04674e847..14c248efcc 100644
--- a/internal/permission/policy.go
+++ b/internal/permission/policy.go
@@ -49,9 +49,9 @@ func newPolicy(source Source) policy {
return &communityPolicy{source: source}
}
-func (p *communityPolicy) CheckFeature(ctx context.Context, subject Subject, feature Feature, action Action) error {
- if err := validateSubject(subject); err != nil {
- return err
+func (p *communityPolicy) CheckFeature(ctx context.Context, feature Feature, action Action) error {
+ if strings.TrimSpace(UserIDFromContext(ctx)) == "" {
+ return ErrUnauthenticated
}
if strings.TrimSpace(string(feature)) == "" || !validAction(action) {
return ErrInvalidPermission
@@ -60,39 +60,36 @@ func (p *communityPolicy) CheckFeature(ctx context.Context, subject Subject, fea
return nil
}
-func (p *communityPolicy) CheckTenant(ctx context.Context, subject Subject, tenantID string, requirement TenantRequirement) error {
- return newEvaluation(p.source).checkTenant(ctx, subject, tenantID, requirement)
+func (p *communityPolicy) CheckTenant(ctx context.Context, tenantID string, requirement TenantRequirement) error {
+ return newEvaluation(p.source).checkTenant(ctx, tenantID, requirement)
}
-func (p *communityPolicy) CheckResource(ctx context.Context, subject Subject, ref ResourceRef, operation Operation) error {
- if !validOperation(operation) {
- return ErrInvalidPermission
- }
- access, err := newEvaluation(p.source).resolveAccess(ctx, subject, ref)
- if err != nil {
- return err
- }
- if !accessAllows(access, operation) {
- return ErrPermissionDenied
+func (p *communityPolicy) CheckResource(ctx context.Context, ref ResourceRef, operation Operation) error {
+ if strings.TrimSpace(UserIDFromContext(ctx)) == "" {
+ return ErrUnauthenticated
}
- return nil
+ return newEvaluation(p.source).checkResource(ctx, ref, operation)
}
-func (p *communityPolicy) CheckDependency(ctx context.Context, subject Subject, entryRef, dependencyRef ResourceRef, entryOperation, dependencyOperation Operation) error {
+func (p *communityPolicy) CheckDependency(ctx context.Context, entryRef, dependencyRef ResourceRef, entryOperation, dependencyOperation Operation) error {
+ if strings.TrimSpace(UserIDFromContext(ctx)) == "" {
+ return ErrUnauthenticated
+ }
if !validOperation(entryOperation) || !validOperation(dependencyOperation) {
return ErrInvalidPermission
}
evaluation := newEvaluation(p.source)
- return evaluation.checkDependency(ctx, subject, entryRef, dependencyRef, entryOperation, dependencyOperation)
+ return evaluation.checkDependency(ctx, entryRef, dependencyRef, entryOperation, dependencyOperation)
}
-func (p *communityPolicy) ResolveAccess(ctx context.Context, subject Subject, ref ResourceRef) (Access, error) {
- return newEvaluation(p.source).resolveAccess(ctx, subject, ref)
+func (p *communityPolicy) ResolveAccess(ctx context.Context, ref ResourceRef) (Access, error) {
+ return newEvaluation(p.source).resolveAccess(ctx, ref)
}
-func (p *communityPolicy) Scope(ctx context.Context, subject Subject, query ScopeQuery) (Scope, error) {
- if err := validateSubject(subject); err != nil {
- return Scope{}, err
+func (p *communityPolicy) Scope(ctx context.Context, query ScopeQuery) (Scope, error) {
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if userID == "" {
+ return Scope{}, ErrUnauthenticated
}
if strings.TrimSpace(string(query.Kind)) == "" || !validOperation(query.Operation) {
return Scope{}, ErrInvalidPermission
@@ -105,7 +102,7 @@ func (p *communityPolicy) Scope(ctx context.Context, subject Subject, query Scop
}
evaluation := newEvaluation(p.source)
- candidateRefs, err := p.source.ListResourceRefs(ctx, subject, query.Kind, query.Parent)
+ candidateRefs, err := p.source.ListResourceRefs(ctx, query.Kind, query.Parent)
if err != nil {
return Scope{}, fmt.Errorf("permission: list resource candidates: %w", err)
}
@@ -129,9 +126,9 @@ func (p *communityPolicy) Scope(ctx context.Context, subject Subject, query Scop
for _, ref := range candidateRefs {
var checkErr error
if query.Entry == nil {
- checkErr = evaluation.checkResource(ctx, subject, ref, query.Operation)
+ checkErr = evaluation.checkResource(ctx, ref, query.Operation)
} else {
- checkErr = evaluation.checkDependency(ctx, subject, entryRef, ref, query.EntryOp, query.Operation)
+ checkErr = evaluation.checkDependency(ctx, entryRef, ref, query.EntryOp, query.Operation)
}
if checkErr == nil {
accessible = append(accessible, ref)
@@ -171,27 +168,28 @@ func (p *communityPolicy) Scope(ctx context.Context, subject Subject, query Scop
return scope, nil
}
-func (p *communityPolicy) QueryScope(ctx context.Context, subject Subject, query ScopeQuery) (QueryScope, bool, error) {
+func (p *communityPolicy) QueryScope(ctx context.Context, query ScopeQuery) (QueryScope, bool, error) {
if query.Kind == ResourceKindModelProvider || query.Kind == ResourceKindModelInstance || query.Kind == ResourceKindModel {
- return p.modelQueryScope(ctx, subject, query)
+ return p.modelQueryScope(ctx, query)
}
if query.Kind == ResourceKindMCPServer && query.Operation == OperationRead && query.Parent.ID == "" && query.Parent.Kind == "" && query.Entry == nil {
- return p.mcpServerReadQueryScope(ctx, subject)
+ return p.mcpServerReadQueryScope(ctx, query.TenantID)
}
if query.Kind == ResourceKindFile || query.Kind == ResourceKindFolder {
- return p.fileReadQueryScope(ctx, subject, query)
+ return p.fileReadQueryScope(ctx, query)
}
if query.Kind != ResourceKindDataset || query.Operation != OperationRead || query.Parent.ID != "" || query.Parent.Kind != "" || query.Entry != nil {
return QueryScope{}, false, nil
}
- if err := validateSubject(subject); err != nil {
- return QueryScope{}, true, err
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if userID == "" {
+ return QueryScope{}, true, ErrUnauthenticated
}
source, ok := p.source.(*databaseSource)
if !ok || source.db == nil {
return QueryScope{}, false, nil
}
- if err := source.validateDatasetTenants(ctx, subject.UserID); err != nil {
+ if err := source.validateDatasetTenants(ctx, userID); err != nil {
return QueryScope{}, true, err
}
// Enterprise tenant roles are stored as numeric IDs. The generic SQL fast
@@ -208,10 +206,10 @@ func (p *communityPolicy) QueryScope(ctx context.Context, subject Subject, query
Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.role = ? AND user_tenant.status = ?", string(RoleOwner), string(entity.StatusValid))
callerIsOwner := db.Model(&entity.UserTenant{}).
Select("1").
- Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", subject.UserID, string(RoleOwner), string(entity.StatusValid))
+ Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", userID, string(RoleOwner), string(entity.StatusValid))
callerIsMember := db.Model(&entity.UserTenant{}).
Select("1").
- Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", subject.UserID, string(RoleNormal), string(entity.StatusValid))
+ Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", userID, string(RoleNormal), string(entity.StatusValid))
accessibleDatasets := db.Model(&entity.Knowledgebase{}).
Select("knowledgebase.id").
Where("knowledgebase.status = ?", string(entity.StatusValid)).
@@ -221,13 +219,14 @@ func (p *communityPolicy) QueryScope(ctx context.Context, subject Subject, query
}}, true, nil
}
-func (p *communityPolicy) modelQueryScope(ctx context.Context, subject Subject, query ScopeQuery) (QueryScope, bool, error) {
+func (p *communityPolicy) modelQueryScope(ctx context.Context, query ScopeQuery) (QueryScope, bool, error) {
parent := query.Parent
if query.Entry != nil || (parent.ID == "") != (parent.Kind == "") {
return QueryScope{}, false, nil
}
- if err := validateSubject(subject); err != nil {
- return QueryScope{}, true, err
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if userID == "" {
+ return QueryScope{}, true, ErrUnauthenticated
}
source, ok := p.source.(*databaseSource)
if !ok || source.db == nil || tenantRoleMembershipEnabled(source.db) {
@@ -253,13 +252,13 @@ func (p *communityPolicy) modelQueryScope(ctx context.Context, subject Subject,
Limit(1)
provider = provider.Where("tenant_model_provider.user_id = COALESCE((?), tenant_model_provider.tenant_id)", owner)
if ownerOnly {
- return provider.Where("tenant_model_provider.user_id = ?", subject.UserID)
+ return provider.Where("tenant_model_provider.user_id = ?", userID)
}
membership := source.db.WithContext(ctx).Model(&entity.UserTenant{}).
Select("1").
Where("user_tenant.tenant_id = tenant_model_provider.tenant_id AND user_tenant.user_id = ? AND user_tenant.status = ? AND user_tenant.role IN ?",
- subject.UserID, string(entity.StatusValid), []string{string(RoleOwner), string(RoleAdmin), string(RoleNormal)})
- return provider.Where("(tenant_model_provider.user_id = ? OR EXISTS (?))", subject.UserID, membership)
+ userID, string(entity.StatusValid), []string{string(RoleOwner), string(RoleAdmin), string(RoleNormal)})
+ return provider.Where("(tenant_model_provider.user_id = ? OR EXISTS (?))", userID, membership)
}
switch query.Kind {
@@ -276,10 +275,10 @@ func (p *communityPolicy) modelQueryScope(ctx context.Context, subject Subject,
membership := db.Model(&entity.UserTenant{}).
Select("1").
Where("user_tenant.tenant_id = tenant_model_provider.tenant_id AND user_tenant.user_id = ? AND user_tenant.status = ? AND user_tenant.role IN ?",
- subject.UserID, string(entity.StatusValid), []string{string(RoleOwner), string(RoleAdmin), string(RoleNormal)})
+ userID, string(entity.StatusValid), []string{string(RoleOwner), string(RoleAdmin), string(RoleNormal)})
return query.
Where("tenant_model_provider.user_id = COALESCE((?), tenant_model_provider.tenant_id)", owner).
- Where("(tenant_model_provider.user_id = ? OR EXISTS (?))", subject.UserID, membership)
+ Where("(tenant_model_provider.user_id = ? OR EXISTS (?))", userID, membership)
}}, true, nil
case ResourceKindModelInstance:
if query.Operation != OperationRead && query.Operation != OperationUse {
@@ -308,13 +307,17 @@ func (p *communityPolicy) modelQueryScope(ctx context.Context, subject Subject,
}
}
-func (p *communityPolicy) mcpServerReadQueryScope(ctx context.Context, subject Subject) (QueryScope, bool, error) {
- if err := validateSubject(subject); err != nil {
- return QueryScope{}, true, err
+func (p *communityPolicy) mcpServerReadQueryScope(ctx context.Context, targetTenantID string) (QueryScope, bool, error) {
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if userID == "" {
+ return QueryScope{}, true, ErrUnauthenticated
}
- tenantID := strings.TrimSpace(subject.TenantID)
+ tenantID := strings.TrimSpace(targetTenantID)
if tenantID == "" {
- return QueryScope{}, true, ErrInvalidSubject
+ tenantID = strings.TrimSpace(TenantIDFromContext(ctx))
+ }
+ if tenantID == "" {
+ return QueryScope{}, true, ErrInvalidPermission
}
source, ok := p.source.(*databaseSource)
if !ok || source.db == nil {
@@ -324,17 +327,18 @@ func (p *communityPolicy) mcpServerReadQueryScope(ctx context.Context, subject S
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))
+ 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) {
+func (p *communityPolicy) fileReadQueryScope(ctx context.Context, 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
}
- if err := validateSubject(subject); err != nil {
- return QueryScope{}, true, err
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if userID == "" {
+ return QueryScope{}, true, ErrUnauthenticated
}
source, ok := p.source.(*databaseSource)
if !ok || source.db == nil {
@@ -355,20 +359,20 @@ func (p *communityPolicy) fileReadQueryScope(ctx context.Context, subject Subjec
fileOwner := db.Model(&entity.UserTenant{}).
Select("1").
- Where("user_tenant.tenant_id = file.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", subject.UserID, string(RoleOwner), string(entity.StatusValid))
+ Where("user_tenant.tenant_id = file.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", userID, string(RoleOwner), string(entity.StatusValid))
anyFileOwner := db.Model(&entity.UserTenant{}).
Select("1").
Where("user_tenant.tenant_id = file.tenant_id AND user_tenant.role = ? AND user_tenant.status = ?", string(RoleOwner), string(entity.StatusValid))
rootMember := db.Model(&entity.UserTenant{}).
Select("1").
- Where("user_tenant.tenant_id = file.tenant_id AND user_tenant.user_id = ? AND user_tenant.role IN ? AND user_tenant.status = ?", subject.UserID, []string{string(RoleOwner), string(RoleAdmin), string(RoleNormal)}, string(entity.StatusValid))
+ Where("user_tenant.tenant_id = file.tenant_id AND user_tenant.user_id = ? AND user_tenant.role IN ? AND user_tenant.status = ?", userID, []string{string(RoleOwner), string(RoleAdmin), string(RoleNormal)}, string(entity.StatusValid))
datasetOwner := db.Model(&entity.UserTenant{}).
Select("1").
- Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", subject.UserID, string(RoleOwner), string(entity.StatusValid))
+ Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", userID, string(RoleOwner), string(entity.StatusValid))
datasetMember := db.Model(&entity.UserTenant{}).
Select("1").
- Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", subject.UserID, string(RoleNormal), string(entity.StatusValid))
+ Where("user_tenant.tenant_id = knowledgebase.tenant_id AND user_tenant.user_id = ? AND user_tenant.role = ? AND user_tenant.status = ?", userID, string(RoleNormal), string(entity.StatusValid))
sharedDataset := db.Table("file2document AS f2d").
Select("1").
Joins("JOIN document ON document.id = f2d.document_id").
@@ -379,8 +383,8 @@ func (p *communityPolicy) fileReadQueryScope(ctx context.Context, subject Subjec
return query.
Where("file.tenant_id = (?)", parent).
Where("(file.parent_id = file.id AND ((TRIM(file.created_by) = ?) OR (NULLIF(TRIM(file.created_by), '') IS NULL AND (EXISTS (?) OR (file.tenant_id = ? AND NOT EXISTS (?)))) OR EXISTS (?))) OR (file.parent_id <> file.id AND ((TRIM(file.created_by) = ?) OR (NULLIF(TRIM(file.created_by), '') IS NULL AND (EXISTS (?) OR (file.tenant_id = ? AND NOT EXISTS (?)))) OR EXISTS (?)))",
- subject.UserID, fileOwner, subject.UserID, anyFileOwner, rootMember,
- subject.UserID, fileOwner, subject.UserID, anyFileOwner, sharedDataset)
+ userID, fileOwner, userID, anyFileOwner, rootMember,
+ userID, fileOwner, userID, anyFileOwner, sharedDataset)
}}, true, nil
}
@@ -398,8 +402,8 @@ func (s *databaseSource) validateDatasetTenants(ctx context.Context, userID stri
return err
}
-func (p *communityPolicy) FilterResources(ctx context.Context, subject Subject, refs []ResourceRef, operation Operation) ([]ResourceRef, error) {
- accesses, err := p.FilterAccesses(ctx, subject, refs, operation)
+func (p *communityPolicy) FilterResources(ctx context.Context, refs []ResourceRef, operation Operation) ([]ResourceRef, error) {
+ accesses, err := p.FilterAccesses(ctx, refs, operation)
if err != nil {
return nil, err
}
@@ -412,9 +416,9 @@ func (p *communityPolicy) FilterResources(ctx context.Context, subject Subject,
return accessible, nil
}
-func (p *communityPolicy) ResolveAccesses(ctx context.Context, subject Subject, refs []ResourceRef) (map[ResourceRef]Access, error) {
- if err := validateSubject(subject); err != nil {
- return nil, err
+func (p *communityPolicy) ResolveAccesses(ctx context.Context, refs []ResourceRef) (map[ResourceRef]Access, error) {
+ if strings.TrimSpace(UserIDFromContext(ctx)) == "" {
+ return nil, ErrUnauthenticated
}
evaluation := newEvaluation(p.source)
refs = uniqueRefs(refs)
@@ -423,7 +427,7 @@ func (p *communityPolicy) ResolveAccesses(ctx context.Context, subject Subject,
}
accesses := make(map[ResourceRef]Access, len(refs))
for _, ref := range refs {
- access, err := evaluation.resolveAccess(ctx, subject, ref)
+ access, err := evaluation.resolveAccess(ctx, ref)
if err == nil {
accesses[ref] = access
continue
@@ -436,11 +440,11 @@ func (p *communityPolicy) ResolveAccesses(ctx context.Context, subject Subject,
return accesses, nil
}
-func (p *communityPolicy) FilterAccesses(ctx context.Context, subject Subject, refs []ResourceRef, operation Operation) (map[ResourceRef]Access, error) {
+func (p *communityPolicy) FilterAccesses(ctx context.Context, refs []ResourceRef, operation Operation) (map[ResourceRef]Access, error) {
if !validOperation(operation) {
return nil, ErrInvalidPermission
}
- accesses, err := p.ResolveAccesses(ctx, subject, refs)
+ accesses, err := p.ResolveAccesses(ctx, refs)
if err != nil {
return nil, err
}
@@ -461,14 +465,18 @@ func newEvaluation(source Source) *evaluation {
}
}
-func (e *evaluation) checkTenant(ctx context.Context, subject Subject, tenantID string, requirement TenantRequirement) error {
- if err := validateSubject(subject); err != nil {
- return err
+func (e *evaluation) checkTenant(ctx context.Context, tenantID string, requirement TenantRequirement) error {
+ return e.checkTenantForUser(ctx, UserIDFromContext(ctx), tenantID, requirement)
+}
+
+func (e *evaluation) checkTenantForUser(ctx context.Context, userID, tenantID string, requirement TenantRequirement) error {
+ if strings.TrimSpace(userID) == "" {
+ return ErrUnauthenticated
}
if strings.TrimSpace(tenantID) == "" || !validTenantRequirement(requirement) {
return ErrInvalidPermission
}
- membership, err := e.getMembership(ctx, subject.UserID, tenantID)
+ membership, err := e.getMembership(ctx, userID, tenantID)
if err != nil {
return err
}
@@ -478,11 +486,11 @@ func (e *evaluation) checkTenant(ctx context.Context, subject Subject, tenantID
return nil
}
-func (e *evaluation) checkResource(ctx context.Context, subject Subject, ref ResourceRef, operation Operation) error {
+func (e *evaluation) checkResource(ctx context.Context, ref ResourceRef, operation Operation) error {
if !validOperation(operation) {
return ErrInvalidPermission
}
- access, err := e.resolveAccess(ctx, subject, ref)
+ access, err := e.resolveAccess(ctx, ref)
if err != nil {
return err
}
@@ -492,9 +500,10 @@ func (e *evaluation) checkResource(ctx context.Context, subject Subject, ref Res
return nil
}
-func (e *evaluation) checkDependency(ctx context.Context, subject Subject, entryRef, dependencyRef ResourceRef, entryOperation, dependencyOperation Operation) error {
- if err := validateSubject(subject); err != nil {
- return err
+func (e *evaluation) checkDependency(ctx context.Context, entryRef, dependencyRef ResourceRef, entryOperation, dependencyOperation Operation) error {
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if strings.TrimSpace(userID) == "" {
+ return ErrUnauthenticated
}
if !validOperation(entryOperation) || !validOperation(dependencyOperation) {
return ErrInvalidPermission
@@ -506,7 +515,7 @@ func (e *evaluation) checkDependency(ctx context.Context, subject Subject, entry
if err != nil {
return err
}
- entryAccess, err := e.resolveResource(ctx, subject, entry)
+ entryAccess, err := e.resolveResource(ctx, entry)
if err != nil {
return err
}
@@ -517,15 +526,14 @@ func (e *evaluation) checkDependency(ctx context.Context, subject Subject, entry
if err != nil {
return err
}
- userAccess, err := e.resolveResource(ctx, subject, dependency)
+ userAccess, err := e.resolveResource(ctx, dependency)
if err != nil {
return err
}
if !accessAllows(userAccess, dependencyOperation) {
return ErrPermissionDenied
}
- ownerSubject := Subject{UserID: entry.OwnerUserID, TenantID: entry.TenantID}
- ownerAccess, err := e.resolveResource(ctx, ownerSubject, dependency)
+ ownerAccess, err := e.resolveResourceForUser(ctx, entry.OwnerUserID, dependency)
if err != nil {
if errorsIsPermissionDenial(err) {
return ErrPermissionDenied
@@ -538,9 +546,10 @@ func (e *evaluation) checkDependency(ctx context.Context, subject Subject, entry
return nil
}
-func (e *evaluation) resolveAccess(ctx context.Context, subject Subject, ref ResourceRef) (Access, error) {
- if err := validateSubject(subject); err != nil {
- return Access{}, err
+func (e *evaluation) resolveAccess(ctx context.Context, ref ResourceRef) (Access, error) {
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if strings.TrimSpace(userID) == "" {
+ return Access{}, ErrUnauthenticated
}
if err := e.loadResources(ctx, []ResourceRef{ref}); err != nil {
return Access{}, err
@@ -549,10 +558,18 @@ func (e *evaluation) resolveAccess(ctx context.Context, subject Subject, ref Res
if err != nil {
return Access{}, err
}
- return e.resolveResource(ctx, subject, resource)
+ return e.resolveResource(ctx, resource)
}
-func (e *evaluation) resolveResource(ctx context.Context, subject Subject, resource Resource) (Access, error) {
+func (e *evaluation) resolveResource(ctx context.Context, resource Resource) (Access, error) {
+ userID := strings.TrimSpace(UserIDFromContext(ctx))
+ if userID == "" {
+ return Access{}, ErrUnauthenticated
+ }
+ return e.resolveResourceForUser(ctx, userID, resource)
+}
+
+func (e *evaluation) resolveResourceForUser(ctx context.Context, userID string, resource Resource) (Access, error) {
if resource.TenantID == "" || resource.OwnerUserID == "" || !validResourceRef(resource.Ref) {
return Access{}, fmt.Errorf("%w: incomplete resource authorization facts", ErrInvalidPermission)
}
@@ -570,7 +587,7 @@ func (e *evaluation) resolveResource(ctx context.Context, subject Subject, resou
default:
return Access{}, fmt.Errorf("%w: unknown resource visibility %q", ErrInvalidPermission, resource.Visibility)
}
- if subject.UserID == resource.OwnerUserID {
+ if userID == resource.OwnerUserID {
return resourceAccess(resource, AccessSourceOwner), nil
}
@@ -582,13 +599,13 @@ func (e *evaluation) resolveResource(ctx context.Context, subject Subject, resou
if requirement == "" {
requirement = TenantNormalMember
}
- if err := e.checkTenant(ctx, subject, resource.TenantID, requirement); err != nil {
+ if err := e.checkTenantForUser(ctx, userID, resource.TenantID, requirement); err != nil {
if errors.Is(err, ErrMembershipNotFound) {
return Access{}, ErrPermissionDenied
}
return Access{}, err
}
- if subject.UserID == resource.CreatedBy && resource.CreatorOperations != nil {
+ if userID == resource.CreatedBy && resource.CreatorOperations != nil {
return resourceAccessWithOperations(resource, AccessSourceCreator, resource.CreatorOperations), nil
}
operations := resource.TenantOperations
@@ -597,11 +614,11 @@ func (e *evaluation) resolveResource(ctx context.Context, subject Subject, resou
}
return resourceAccessWithOperations(resource, AccessSourceTenant, operations), nil
case VisibilityShared:
- if contains(resource.SharedWithUserIDs, subject.UserID) {
+ if contains(resource.SharedWithUserIDs, userID) {
return resourceAccess(resource, AccessSourceShared), nil
}
for _, tenantID := range resource.SharedWithTenantIDs {
- if err := e.checkTenant(ctx, subject, tenantID, TenantNormalMember); err != nil {
+ if err := e.checkTenantForUser(ctx, userID, tenantID, TenantNormalMember); err != nil {
if errors.Is(err, ErrMembershipNotFound) {
continue
}
@@ -687,13 +704,6 @@ func errorsIsPermissionDenial(err error) bool {
return errors.Is(err, ErrPermissionDenied) || errors.Is(err, ErrMembershipNotFound)
}
-func validateSubject(subject Subject) error {
- if strings.TrimSpace(subject.UserID) == "" {
- return ErrUnauthenticated
- }
- return nil
-}
-
func validResourceRef(ref ResourceRef) bool {
return strings.TrimSpace(string(ref.Kind)) != "" && strings.TrimSpace(ref.ID) != ""
}
diff --git a/internal/permission/policy_test.go b/internal/permission/policy_test.go
index 3c1d143bde..4b0bb44d99 100644
--- a/internal/permission/policy_test.go
+++ b/internal/permission/policy_test.go
@@ -28,7 +28,7 @@ func (s *permissionTestSource) GetResources(_ context.Context, refs []ResourceRe
return resources, nil
}
-func (s *permissionTestSource) ListResourceRefs(_ context.Context, _ Subject, kind ResourceKind, parent ResourceRef) ([]ResourceRef, error) {
+func (s *permissionTestSource) ListResourceRefs(_ context.Context, kind ResourceKind, parent ResourceRef) ([]ResourceRef, error) {
refs := make([]ResourceRef, 0, len(s.candidates))
for _, ref := range s.candidates {
if ref.Kind == kind {
@@ -54,7 +54,7 @@ func TestCommunityPolicyResolvesResourceTenant(t *testing.T) {
},
}
- access, err := NewChecker(source).ResolveAccess(context.Background(), Subject{UserID: "user-1"}, resourceRef)
+ access, err := NewChecker(source).ResolveAccess(WithIdentity(context.Background(), "user-1", ""), resourceRef)
if err != nil {
t.Fatalf("ResolveAccess() error = %v", err)
}
@@ -69,7 +69,7 @@ func TestCommunityPolicyResolvesResourceTenant(t *testing.T) {
}
}
-func TestCommunityPolicyUsesResourceTenantInsteadOfSubjectTenant(t *testing.T) {
+func TestCommunityPolicyUsesResourceTenantInsteadOfActiveTenant(t *testing.T) {
resourceRef := ResourceRef{Kind: "dataset", ID: "dataset-1"}
source := &permissionTestSource{
memberships: map[string]*Membership{
@@ -85,7 +85,7 @@ func TestCommunityPolicyUsesResourceTenantInsteadOfSubjectTenant(t *testing.T) {
},
}
- access, err := NewChecker(source).ResolveAccess(context.Background(), Subject{UserID: "user-1", TenantID: "another-tenant"}, resourceRef)
+ access, err := NewChecker(source).ResolveAccess(WithIdentity(context.Background(), "user-1", "another-tenant"), resourceRef)
if err != nil {
t.Fatalf("ResolveAccess() error = %v", err)
}
@@ -93,13 +93,13 @@ func TestCommunityPolicyUsesResourceTenantInsteadOfSubjectTenant(t *testing.T) {
t.Fatalf("ResolveAccess() tenant = %q, want resource tenant", access.TenantID)
}
- _, err = NewChecker(source).ResolveAccess(context.Background(), Subject{UserID: "unrelated-user", TenantID: "tenant-resource"}, resourceRef)
+ _, err = NewChecker(source).ResolveAccess(WithIdentity(context.Background(), "unrelated-user", "tenant-resource"), resourceRef)
if !errors.Is(err, ErrPermissionDenied) {
t.Fatalf("ResolveAccess() error = %v, want %v for a non-member", err, ErrPermissionDenied)
}
}
-func TestCommunityPolicySharedResourceNeedsNoSubjectTenant(t *testing.T) {
+func TestCommunityPolicySharedResourceNeedsNoActiveTenant(t *testing.T) {
resourceRef := ResourceRef{Kind: "agent", ID: "agent-1"}
source := &permissionTestSource{
memberships: map[string]*Membership{
@@ -116,14 +116,14 @@ func TestCommunityPolicySharedResourceNeedsNoSubjectTenant(t *testing.T) {
},
}
- access, err := NewChecker(source).ResolveAccess(context.Background(), Subject{UserID: "user-1"}, resourceRef)
+ access, err := NewChecker(source).ResolveAccess(WithIdentity(context.Background(), "user-1", ""), resourceRef)
if err != nil {
t.Fatalf("ResolveAccess() error = %v", err)
}
if access.Source != AccessSourceShared || !access.Allows(OperationRun) {
t.Fatalf("ResolveAccess() = %#v, want shared run access", access)
}
- if err := NewChecker(source).CheckResource(context.Background(), Subject{UserID: "user-1"}, resourceRef, OperationShare); !errors.Is(err, ErrPermissionDenied) {
+ if err := NewChecker(source).CheckResource(WithIdentity(context.Background(), "user-1", ""), resourceRef, OperationShare); !errors.Is(err, ErrPermissionDenied) {
t.Fatalf("CheckResource(share) error = %v, want %v for a shared resource", err, ErrPermissionDenied)
}
}
@@ -146,9 +146,7 @@ func TestCommunityPolicyChecksDependencyForBothUserAndEntryOwner(t *testing.T) {
},
}
- err := NewChecker(source).CheckDependency(
- context.Background(), Subject{UserID: "caller"}, entryRef, dependencyRef, OperationRun, OperationRead,
- )
+ err := NewChecker(source).CheckDependency(WithIdentity(context.Background(), "caller", ""), entryRef, dependencyRef, OperationRun, OperationRead)
if !errors.Is(err, ErrPermissionDenied) {
t.Fatalf("CheckDependency() error = %v, want %v", err, ErrPermissionDenied)
}
@@ -156,9 +154,7 @@ func TestCommunityPolicyChecksDependencyForBothUserAndEntryOwner(t *testing.T) {
dependency := source.resources[dependencyRef]
dependency.SharedWithUserIDs = []string{"caller", "entry-owner"}
source.resources[dependencyRef] = dependency
- err = NewChecker(source).CheckDependency(
- context.Background(), Subject{UserID: "caller"}, entryRef, dependencyRef, OperationRun, OperationRead,
- )
+ err = NewChecker(source).CheckDependency(WithIdentity(context.Background(), "caller", ""), entryRef, dependencyRef, OperationRun, OperationRead)
if err != nil {
t.Fatalf("CheckDependency() error = %v, want nil when both caller and entry owner can read dependency", err)
}
@@ -166,7 +162,7 @@ func TestCommunityPolicyChecksDependencyForBothUserAndEntryOwner(t *testing.T) {
func TestCommunityPolicyFeatureDoesNotRequireTenantContext(t *testing.T) {
checker := NewChecker(&permissionTestSource{})
- if err := checker.CheckFeature(context.Background(), Subject{UserID: "user-1"}, "dataset", ActionRead); err != nil {
+ if err := checker.CheckFeature(WithIdentity(context.Background(), "user-1", ""), "dataset", ActionRead); err != nil {
t.Fatalf("CheckFeature() error = %v", err)
}
}
@@ -193,7 +189,7 @@ func TestCommunityPolicyScopeUsesParentResourceTenant(t *testing.T) {
candidates: []ResourceRef{childRef},
}
- scope, err := NewChecker(source).Scope(context.Background(), Subject{UserID: "user-1"}, ScopeQuery{
+ scope, err := NewChecker(source).Scope(WithIdentity(context.Background(), "user-1", ""), ScopeQuery{
Kind: "document", Parent: parentRef, Operation: OperationRead,
})
if err != nil {
@@ -209,7 +205,7 @@ func TestCommunityPolicyScopeUsesParentResourceTenant(t *testing.T) {
func TestCommunityPolicyRequiresUserIdentity(t *testing.T) {
resourceRef := ResourceRef{Kind: "dataset", ID: "dataset-1"}
- _, err := NewChecker(&permissionTestSource{}).ResolveAccess(context.Background(), Subject{}, resourceRef)
+ _, err := NewChecker(&permissionTestSource{}).ResolveAccess(context.Background(), resourceRef)
if !errors.Is(err, ErrUnauthenticated) {
t.Fatalf("ResolveAccess() error = %v, want %v", err, ErrUnauthenticated)
}
diff --git a/internal/permission/types.go b/internal/permission/types.go
index e4ec8b7c7b..328ece197d 100644
--- a/internal/permission/types.go
+++ b/internal/permission/types.go
@@ -21,11 +21,12 @@ import (
"errors"
)
-type subjectContextKey struct{}
+type userIDContextKey struct{}
+type tenantIDContextKey struct{}
var (
ErrUnauthenticated = errors.New("permission: user is required")
- ErrInvalidSubject = errors.New("permission: tenant is required")
+ ErrIdentityMismatch = errors.New("permission: identity does not match request context")
ErrResourceNotFound = errors.New("permission: resource not found")
ErrMembershipNotFound = errors.New("permission: active tenant membership not found")
ErrPermissionDenied = errors.New("permission: access denied")
@@ -33,46 +34,29 @@ var (
ErrSourceUnavailable = errors.New("permission: source is not configured")
)
-// Subject identifies the authenticated user and, when the policy requires it,
-// the active tenant context. Community-edition resource checks derive the
-// effective tenant from the persisted resource, so TenantID may be empty.
-type Subject struct {
- UserID string
- 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)
+// WithIdentity attaches the authenticated user and active Tenant to a request
+// context as separate values.
+func WithIdentity(ctx context.Context, userID, tenantID string) context.Context {
+ ctx = context.WithValue(ctx, userIDContextKey{}, userID)
+ return context.WithValue(ctx, tenantIDContextKey{}, tenantID)
}
-// SubjectFromContext returns the authenticated permission subject attached to
-// the request context, if one is present.
-func SubjectFromContext(ctx context.Context) (Subject, bool) {
+// UserIDFromContext returns the authenticated user ID attached to ctx.
+func UserIDFromContext(ctx context.Context) string {
if ctx == nil {
- return Subject{}, false
+ return ""
}
- subject, ok := ctx.Value(subjectContextKey{}).(Subject)
- return subject, ok
+ userID, _ := ctx.Value(userIDContextKey{}).(string)
+ return userID
}
-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
+// TenantIDFromContext returns the active Tenant ID attached to ctx.
+func TenantIDFromContext(ctx context.Context) string {
+ if ctx == nil {
+ return ""
}
- return subject, nil
+ tenantID, _ := ctx.Value(tenantIDContextKey{}).(string)
+ return tenantID
}
// ResourceKind identifies a resource family without coupling this package to business entities.
@@ -248,6 +232,9 @@ type Scope struct {
// ScopeQuery describes the candidate resource set and optional execution entry.
type ScopeQuery struct {
+ // TenantID optionally selects a tenant boundary for the query. It does not
+ // change the authenticated identity carried by the context.
+ TenantID string
Kind ResourceKind
Parent ResourceRef
Operation Operation
@@ -263,29 +250,29 @@ type ScopeQuery struct {
type Source interface {
GetMembership(ctx context.Context, userID, tenantID string) (*Membership, error)
GetResources(ctx context.Context, refs []ResourceRef) ([]Resource, error)
- ListResourceRefs(ctx context.Context, subject Subject, kind ResourceKind, parent ResourceRef) ([]ResourceRef, error)
+ ListResourceRefs(ctx context.Context, kind ResourceKind, parent ResourceRef) ([]ResourceRef, error)
}
type policy interface {
- CheckFeature(context.Context, Subject, Feature, Action) error
- CheckTenant(context.Context, Subject, string, TenantRequirement) error
- CheckResource(context.Context, Subject, ResourceRef, Operation) error
- CheckDependency(context.Context, Subject, ResourceRef, ResourceRef, Operation, Operation) error
- ResolveAccess(context.Context, Subject, ResourceRef) (Access, error)
- Scope(context.Context, Subject, ScopeQuery) (Scope, error)
- FilterResources(context.Context, Subject, []ResourceRef, Operation) ([]ResourceRef, error)
+ CheckFeature(context.Context, Feature, Action) error
+ CheckTenant(context.Context, string, TenantRequirement) error
+ CheckResource(context.Context, ResourceRef, Operation) error
+ CheckDependency(context.Context, ResourceRef, ResourceRef, Operation, Operation) error
+ ResolveAccess(context.Context, ResourceRef) (Access, error)
+ Scope(context.Context, ScopeQuery) (Scope, error)
+ FilterResources(context.Context, []ResourceRef, Operation) ([]ResourceRef, error)
}
type queryScopePolicy interface {
- QueryScope(context.Context, Subject, ScopeQuery) (QueryScope, bool, error)
+ QueryScope(context.Context, ScopeQuery) (QueryScope, bool, error)
}
type accessResolverPolicy interface {
- ResolveAccesses(context.Context, Subject, []ResourceRef) (map[ResourceRef]Access, error)
+ ResolveAccesses(context.Context, []ResourceRef) (map[ResourceRef]Access, error)
}
type resourceOwnerGranter interface {
- GrantResourceOwner(context.Context, Subject, ResourceRef) error
+ GrantResourceOwner(context.Context, ResourceRef) error
}
// Checker exposes edition-independent permission methods.
@@ -304,7 +291,7 @@ func NewChecker(source Source) *Checker {
// 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 {
+func (c *Checker) GrantResourceOwner(ctx context.Context, resource ResourceRef) error {
if c == nil || c.policy == nil {
return ErrSourceUnavailable
}
@@ -312,99 +299,67 @@ func (c *Checker) GrantResourceOwner(ctx context.Context, subject Subject, resou
if !ok {
return nil
}
- var err error
- if subject, err = resolveSubject(ctx, subject); err != nil {
- return err
- }
- return granter.GrantResourceOwner(ctx, subject, resource)
+ return granter.GrantResourceOwner(ctx, 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 {
+// CheckFeature checks feature access for the authenticated identity in ctx.
+func (c *Checker) CheckFeature(ctx context.Context, 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)
+ return c.policy.CheckFeature(ctx, feature, action)
}
-// CheckTenant checks the user's membership and role in tenantID.
-func (c *Checker) CheckTenant(ctx context.Context, subject Subject, tenantID string, requirement TenantRequirement) error {
+// CheckTenant checks the authenticated user's membership and role in tenantID.
+func (c *Checker) CheckTenant(ctx context.Context, tenantID string, requirement TenantRequirement) 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.CheckTenant(ctx, subject, tenantID, requirement)
+ return c.policy.CheckTenant(ctx, tenantID, requirement)
}
-// CheckResource checks a direct operation on a resource.
-func (c *Checker) CheckResource(ctx context.Context, subject Subject, resource ResourceRef, operation Operation) error {
+// CheckResource checks a direct operation on a resource for the identity in ctx.
+func (c *Checker) CheckResource(ctx context.Context, resource ResourceRef, operation Operation) 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.CheckResource(ctx, subject, resource, operation)
+ return c.policy.CheckResource(ctx, resource, operation)
}
-// CheckDependency checks entry access and the user's and entry owner's access to a dependency.
-func (c *Checker) CheckDependency(ctx context.Context, subject Subject, entry, dependency ResourceRef, entryOperation, dependencyOperation Operation) error {
+// CheckDependency checks entry access and the caller's and entry owner's access to a dependency.
+func (c *Checker) CheckDependency(ctx context.Context, entry, dependency ResourceRef, entryOperation, dependencyOperation Operation) 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.CheckDependency(ctx, subject, entry, dependency, entryOperation, dependencyOperation)
+ return c.policy.CheckDependency(ctx, entry, dependency, entryOperation, dependencyOperation)
}
-// ResolveAccess resolves the effective operations and grant source for a resource.
-func (c *Checker) ResolveAccess(ctx context.Context, subject Subject, resource ResourceRef) (Access, error) {
+// ResolveAccess resolves the effective access for the authenticated identity in ctx.
+func (c *Checker) ResolveAccess(ctx context.Context, resource ResourceRef) (Access, error) {
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)
+ return c.policy.ResolveAccess(ctx, resource)
}
// Scope returns the explicitly authorized IDs for a resource query.
-func (c *Checker) Scope(ctx context.Context, subject Subject, query ScopeQuery) (Scope, error) {
+func (c *Checker) Scope(ctx context.Context, query ScopeQuery) (Scope, error) {
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)
+ return c.policy.Scope(ctx, query)
}
// QueryScope returns a database-applied authorization predicate for a resource
// query. Policies may compile the authorization rules into SQL. When they do
// not, the checker falls back to the existing authorized-ID scope and applies
// those IDs as an IN predicate.
-func (c *Checker) QueryScope(ctx context.Context, subject Subject, query ScopeQuery) (QueryScope, error) {
+func (c *Checker) QueryScope(ctx context.Context, query ScopeQuery) (QueryScope, error) {
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)
+ queryScope, supported, err := queryPolicy.QueryScope(ctx, query)
if err != nil {
return QueryScope{}, err
}
@@ -413,7 +368,7 @@ func (c *Checker) QueryScope(ctx context.Context, subject Subject, query ScopeQu
}
}
- scope, err := c.policy.Scope(ctx, subject, query)
+ scope, err := c.policy.Scope(ctx, query)
if err != nil {
return QueryScope{}, err
}
@@ -421,34 +376,26 @@ func (c *Checker) QueryScope(ctx context.Context, subject Subject, query ScopeQu
}
// FilterResources returns only candidate resources that allow operation.
-func (c *Checker) FilterResources(ctx context.Context, subject Subject, resources []ResourceRef, operation Operation) ([]ResourceRef, error) {
+func (c *Checker) FilterResources(ctx context.Context, resources []ResourceRef, operation Operation) ([]ResourceRef, error) {
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)
+ return c.policy.FilterResources(ctx, resources, operation)
}
// 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) {
+func (c *Checker) ResolveAccesses(ctx context.Context, resources []ResourceRef) (map[ResourceRef]Access, error) {
if c == nil || c.policy == nil {
return nil, ErrSourceUnavailable
}
- var err error
- if subject, err = resolveSubject(ctx, subject); err != nil {
- return nil, err
- }
if batchPolicy, ok := c.policy.(accessResolverPolicy); ok {
- return batchPolicy.ResolveAccesses(ctx, subject, resources)
+ return batchPolicy.ResolveAccesses(ctx, resources)
}
accesses := make(map[ResourceRef]Access, len(resources))
for _, resource := range uniqueRefs(resources) {
- access, err := c.policy.ResolveAccess(ctx, subject, resource)
+ access, err := c.policy.ResolveAccess(ctx, resource)
if err != nil {
if errorsIsPermissionDenial(err) || errors.Is(err, ErrResourceNotFound) {
continue
@@ -462,14 +409,14 @@ func (c *Checker) ResolveAccesses(ctx context.Context, subject Subject, resource
// 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) {
+func (c *Checker) FilterAccesses(ctx context.Context, 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)
+ accesses, err := c.ResolveAccesses(ctx, resources)
if err != nil {
return nil, err
}
diff --git a/internal/service/agent.go b/internal/service/agent.go
index af62c5e557..4461de6597 100644
--- a/internal/service/agent.go
+++ b/internal/service/agent.go
@@ -508,7 +508,7 @@ func (s *AgentService) ListAgentFilters(ctx context.Context, userID, canvasCateg
return s.listCompilationGroupFilters(ctx, userID)
}
- canvasScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ canvasScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindCanvas,
Operation: permission.OperationRead,
})
@@ -642,9 +642,8 @@ func toAgentItem(c *dao.UserCanvasListItem) *AgentItem {
// Mirrors Python agent_api.list_agents — validates owner_ids against joined tenants,
// then delegates to the DAO.
func (s *AgentService) ListAgents(ctx context.Context, userID string, keywords string, page, pageSize int, terms []dao.OrderTerm, ownerIDs []string, canvasCategory, canvasType string, tags []string) (*ListAgentsResponse, common.ErrorCode, error) {
- subject := permission.Subject{UserID: userID}
checker := permission.NewDatabaseChecker(dao.DB)
- canvasScope, err := checker.Scope(ctx, subject, permission.ScopeQuery{
+ canvasScope, err := checker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindCanvas,
Operation: permission.OperationRead,
})
@@ -660,7 +659,7 @@ func (s *AgentService) ListAgents(ctx context.Context, userID string, keywords s
if id == userID {
continue
}
- if err := checker.CheckTenant(ctx, subject, id, permission.TenantMember); err != nil {
+ if err := checker.CheckTenant(ctx, id, permission.TenantMember); err != nil {
if errors.Is(err, permission.ErrMembershipNotFound) {
return nil, common.CodeOperatingError, fmt.Errorf("only authorized owner_ids can be queried")
}
@@ -716,7 +715,7 @@ 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{
+ access, accessErr := checker.ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindCanvas,
ID: c.ID,
})
@@ -1050,9 +1049,9 @@ func (s *AgentService) CreateAgent(ctx context.Context, userID string, req *Crea
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})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx,
+
+ permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: row.ID})
}); err != nil {
if dao.IsDuplicateKeyErr(err) {
return nil, common.CodeDataError, agentTitleAlreadyExistsError(title)
@@ -1117,7 +1116,7 @@ func (s *AgentService) loadCanvasForUser(ctx context.Context, userID, canvasID s
if userID == "" {
return nil, dao.ErrUserCanvasNotFound
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, operation); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, operation); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return nil, dao.ErrUserCanvasNotFound
}
@@ -1141,7 +1140,7 @@ func (s *AgentService) GetAgent(ctx context.Context, userID, canvasID string) (*
if err != nil {
return nil, err
}
- access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindCanvas,
ID: canvasID,
})
@@ -1179,7 +1178,7 @@ func (s *AgentService) UpdateAgent(ctx context.Context, userID, canvasID string,
ownerUserID := canvasInstance.UserID
if v, ok := patch["permission"]; ok {
- shareErr := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationShare)
+ shareErr := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationShare)
if shareErr != nil {
if !errors.Is(shareErr, permission.ErrPermissionDenied) {
return fmt.Errorf("check agent sharing permission: %w", shareErr)
@@ -1391,7 +1390,7 @@ func (s *AgentService) ResetAgent(ctx context.Context, userID, canvasID string)
// orphan version rows. Canvas delete access is decided by the permission
// policy, including its sharing rules.
func (s *AgentService) DeleteAgent(ctx context.Context, userID, canvasID string) error {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationDelete); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationDelete); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return ErrAgentNotOwner
}
@@ -2076,7 +2075,6 @@ func validateAgentChatModelReferences(ctx context.Context, userID, tenantID stri
func checkAgentSessionRunPermission(ctx context.Context, userID, sessionID string) error {
err := permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindAgentSession, ID: sessionID},
permission.OperationRun,
)
diff --git a/internal/service/agent_sessions.go b/internal/service/agent_sessions.go
index c87a5f4bc1..acbeb22c9f 100644
--- a/internal/service/agent_sessions.go
+++ b/internal/service/agent_sessions.go
@@ -77,7 +77,7 @@ type DeleteAgentSessionsResponse struct {
// CheckCanvasAccess returns true when the user is the canvas owner or
// holds team-level permission for the owner's tenant.
func (s *AgentService) CheckCanvasAccess(ctx context.Context, userID, canvasID string) (bool, error) {
- err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationRead)
+ err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationRead)
if errors.Is(err, permission.ErrResourceNotFound) {
return false, dao.ErrUserCanvasNotFound
}
@@ -351,8 +351,7 @@ func (s *AgentService) DeleteAgentSessionItem(ctx context.Context, userID, agent
if sessionID == "" {
return false, common.CodeArgumentError, errors.New("session_id is required")
}
- subject := permission.Subject{UserID: userID}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: agentID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: agentID}, permission.OperationUse); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return false, common.CodeOperatingError, errors.New("agent not found or no permission")
}
@@ -384,7 +383,7 @@ func (s *AgentService) DeleteAgentSessions(ctx context.Context, userID, agentID
return nil, common.CodeArgumentError, errors.New("agent_id is required")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: agentID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: agentID}, permission.OperationUse); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return nil, common.CodeDataError, fmt.Errorf("you don't have permission to delete sessions for agent %s", agentID)
}
@@ -460,7 +459,7 @@ func (s *AgentService) DeleteAgentSessions(ctx context.Context, userID, agentID
// ListAgentTags list agent tags
func (s *AgentService) ListAgentTags(ctx context.Context, userID, canvasCategory string) ([]AgentTagCount, common.ErrorCode, error) {
- canvasScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ canvasScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindCanvas,
Operation: permission.OperationRead,
})
@@ -558,7 +557,7 @@ func normalizeAgentTags(rawTags interface{}) (string, error) {
// UpdateAgentTags normalises tags and persists them on a single canvas.
func (s *AgentService) UpdateAgentTags(ctx context.Context, userID, canvasID string, tags interface{}) (bool, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationUpdate); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return false, common.CodeOperatingError, errors.New("agent not found or no permission")
}
@@ -625,7 +624,7 @@ func (s *AgentService) CreateAgentSession(ctx context.Context, req *CreateAgentS
return nil, common.CodeArgumentError, errors.New("create agent session: user_id is required")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: req.UserID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: req.AgentID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: req.AgentID}, permission.OperationRun); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return nil, common.CodeOperatingError, errors.New("agent not found or no permission")
}
diff --git a/internal/service/agent_test.go b/internal/service/agent_test.go
index 99e08996de..8502f642af 100644
--- a/internal/service/agent_test.go
+++ b/internal/service/agent_test.go
@@ -833,7 +833,7 @@ func TestRunAgent_StorageErrorFromCanvasAccess(t *testing.T) {
t.Fatalf("failed to close sql.DB: %v", cErr)
}
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"})
+ ctx := permission.WithIdentity(t.Context(), "user-1", "user-1")
svc := NewAgentService()
_, err := svc.RunAgent(
ctx,
@@ -888,7 +888,7 @@ func TestLoadCanvasForUser_StorageErrorWrap(t *testing.T) {
t.Fatalf("failed to close sql.DB: %v", cErr)
}
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "user-1"})
+ ctx := permission.WithIdentity(t.Context(), "user-1", "user-1")
svc := NewAgentService()
_, err := svc.loadCanvasForUser(ctx, "user-1", "canvas-1", permission.OperationRead)
if err == nil {
@@ -1311,7 +1311,7 @@ func TestAgentModelValidationUsesCanvasTenant(t *testing.T) {
t.Fatalf("grant canvas access: %v", err)
}
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: tenantOwnerID, TenantID: tenantID})
+ ctx := permission.WithIdentity(t.Context(), tenantOwnerID, 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)
@@ -2145,7 +2145,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 permission.WithIdentity(t.Context(), "user-1", "tenant-agent")
}
func TestCreateAgentRequiresAuthenticatedUserID(t *testing.T) {
diff --git a/internal/service/agent_tool_history_test.go b/internal/service/agent_tool_history_test.go
index 2d48b310c9..26aae65d98 100644
--- a/internal/service/agent_tool_history_test.go
+++ b/internal/service/agent_tool_history_test.go
@@ -70,7 +70,7 @@ func TestRunAgent_ToolHistoryPersists(t *testing.T) {
ctx, cancel := context.WithCancel(t.Context())
// The auth middleware attaches the permission subject in production;
// the enterprise policy resolves the canvas through its tenant.
- ctx = permission.WithSubject(ctx, permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ ctx = permission.WithIdentity(ctx, "user-1", "tenant-1")
defer cancel()
mcp := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodDelete {
diff --git a/internal/service/agent_webhook_credential.go b/internal/service/agent_webhook_credential.go
index 457299157d..a6d2ab6f77 100644
--- a/internal/service/agent_webhook_credential.go
+++ b/internal/service/agent_webhook_credential.go
@@ -48,21 +48,23 @@ func NewAgentWebhookCredentialService(db *gorm.DB) *AgentWebhookCredentialServic
// Issue creates or rotates the credential for the authenticated user and the
// canvas tenant. The raw token is returned once; only its SHA-256 hash is saved.
-func (s *AgentWebhookCredentialService) Issue(ctx context.Context, subject permission.Subject, canvas *entity.UserCanvas) (string, error) {
+func (s *AgentWebhookCredentialService) Issue(ctx context.Context, canvas *entity.UserCanvas) (string, error) {
if s == nil || s.db == nil || canvas == nil {
return "", gorm.ErrInvalidDB
}
- userID := strings.TrimSpace(subject.UserID)
+ userID := strings.TrimSpace(permission.UserIDFromContext(ctx))
tenantID := canvas.EffectiveTenantID()
if userID == "" || tenantID == "" || strings.TrimSpace(canvas.ID) == "" {
- return "", permission.ErrInvalidSubject
+ return "", permission.ErrUnauthenticated
+ }
+ if contextTenantID := permission.TenantIDFromContext(ctx); contextTenantID != "" && contextTenantID != tenantID {
+ return "", permission.ErrIdentityMismatch
}
- subject.TenantID = tenantID
checker := permission.NewDatabaseChecker(s.db)
- if err := checker.CheckTenant(ctx, subject, tenantID, permission.TenantMember); err != nil {
+ if err := checker.CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
return "", err
}
- if err := checker.CheckResource(ctx, subject, permission.ResourceRef{
+ if err := checker.CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindCanvas,
ID: canvas.ID,
}, permission.OperationRun); err != nil {
@@ -119,19 +121,25 @@ func (s *AgentWebhookCredentialService) Resolve(ctx context.Context, canvasID, t
if canvas.EffectiveTenantID() != credential.TenantID {
return nil, ErrInvalidAgentWebhookCredential
}
- subject := permission.Subject{UserID: credential.UserID, TenantID: credential.TenantID}
+ if userID := permission.UserIDFromContext(ctx); userID != "" && userID != credential.UserID {
+ return nil, ErrInvalidAgentWebhookCredential
+ }
+ if tenantID := permission.TenantIDFromContext(ctx); tenantID != "" && tenantID != credential.TenantID {
+ return nil, ErrInvalidAgentWebhookCredential
+ }
+ ctx = permission.WithIdentity(ctx, credential.UserID, credential.TenantID)
checker := permission.NewDatabaseChecker(s.db)
- if err := checker.CheckTenant(ctx, subject, credential.TenantID, permission.TenantMember); err != nil {
- if errors.Is(err, permission.ErrMembershipNotFound) || errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrInvalidSubject) {
+ if err := checker.CheckTenant(ctx, credential.TenantID, permission.TenantMember); err != nil {
+ if errors.Is(err, permission.ErrMembershipNotFound) || errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrIdentityMismatch) {
return nil, ErrInvalidAgentWebhookCredential
}
return nil, fmt.Errorf("check webhook tenant membership: %w", err)
}
- if err := checker.CheckResource(ctx, subject, permission.ResourceRef{
+ if err := checker.CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindCanvas,
ID: canvasID,
}, permission.OperationRun); err != nil {
- if errors.Is(err, permission.ErrMembershipNotFound) || errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrInvalidSubject) {
+ if errors.Is(err, permission.ErrMembershipNotFound) || errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrIdentityMismatch) {
return nil, ErrInvalidAgentWebhookCredential
}
return nil, fmt.Errorf("check webhook run permission: %w", err)
@@ -146,7 +154,7 @@ func (s *AgentWebhookCredentialService) Revoke(ctx context.Context, canvasID, us
return gorm.ErrInvalidDB
}
if strings.TrimSpace(canvasID) == "" || strings.TrimSpace(userID) == "" {
- return permission.ErrInvalidSubject
+ return permission.ErrInvalidPermission
}
return dao.RevokeAgentWebhookCredential(ctx, s.db, canvasID, userID)
}
diff --git a/internal/service/agent_webhook_credential_test.go b/internal/service/agent_webhook_credential_test.go
index 4ce433c729..60f92a7b40 100644
--- a/internal/service/agent_webhook_credential_test.go
+++ b/internal/service/agent_webhook_credential_test.go
@@ -40,8 +40,8 @@ func TestAgentWebhookCredentialUsesBoundPrincipalAndCanBeRotated(t *testing.T) {
}
svc := NewAgentWebhookCredentialService(db)
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "caller-1", TenantID: tenantID})
- firstToken, err := svc.Issue(ctx, permission.Subject{UserID: "caller-1", TenantID: tenantID}, canvas)
+ ctx := permission.WithIdentity(t.Context(), "caller-1", tenantID)
+ firstToken, err := svc.Issue(ctx, canvas)
if err != nil {
t.Fatalf("issue credential: %v", err)
}
@@ -64,7 +64,7 @@ func TestAgentWebhookCredentialUsesBoundPrincipalAndCanBeRotated(t *testing.T) {
t.Fatalf("resolved principal = (%q, %q), want (caller-1, %q)", resolved.UserID, resolved.TenantID, tenantID)
}
- secondToken, err := svc.Issue(ctx, permission.Subject{UserID: "caller-1", TenantID: tenantID}, canvas)
+ secondToken, err := svc.Issue(ctx, canvas)
if err != nil {
t.Fatalf("rotate credential: %v", err)
}
diff --git a/internal/service/bot.go b/internal/service/bot.go
index 3e2ccc1530..b6561b366c 100644
--- a/internal/service/bot.go
+++ b/internal/service/bot.go
@@ -68,7 +68,7 @@ func NewBotService(agentSvc *AgentService) *BotService {
func (s *BotService) ChatbotInfo(ctx context.Context, userID, dialogID string) (
title, avatar, prologue, llmID string, hasWebSearch bool, ec common.ErrorCode, err error,
) {
- if err = permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: dialogID}, permission.OperationRead); err != nil {
+ if err = permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: dialogID}, permission.OperationRead); err != nil {
ec, err = permissionresponse.NormalizeHidden(err)
return "", "", "", "", false, ec, err
}
@@ -248,7 +248,7 @@ func (s *BotService) loadCanvas(ctx context.Context, userID, agentID string, ope
if userID == "" {
return nil, dao.ErrUserCanvasNotFound
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: agentID}, operation); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: agentID}, operation); err != nil {
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return nil, dao.ErrUserCanvasNotFound
}
diff --git a/internal/service/bot_completion.go b/internal/service/bot_completion.go
index bf2d82f0de..484f2f3275 100644
--- a/internal/service/bot_completion.go
+++ b/internal/service/bot_completion.go
@@ -298,7 +298,7 @@ func (s *BotService) ChatbotCompletion(
}
req.Question = question
// 1. Authorize and load the dialog before touching session state.
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: dialogID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: dialogID}, permission.OperationRun); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
diff --git a/internal/service/chat.go b/internal/service/chat.go
index c8101fc07a..f91f619a02 100644
--- a/internal/service/chat.go
+++ b/internal/service/chat.go
@@ -51,8 +51,8 @@ var ReadOnlyFields = map[string]struct{}{
}
type resourceScopeChecker interface {
- CheckResource(context.Context, permission.Subject, permission.ResourceRef, permission.Operation) error
- Scope(context.Context, permission.Subject, permission.ScopeQuery) (permission.Scope, error)
+ CheckResource(context.Context, permission.ResourceRef, permission.Operation) error
+ Scope(context.Context, permission.ScopeQuery) (permission.Scope, error)
}
// ChatService chat service
@@ -108,7 +108,7 @@ type ListChatsResponse struct {
// ListChats list chats for a user
func (s *ChatService) ListChats(ctx context.Context, userID, status, keywords, id, name string, page, pageSize int, terms []dao.OrderTerm, ownerIDs []string) (*ListChatsResponse, error) {
- chatScope, err := s.permissionChecker.Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ chatScope, err := s.permissionChecker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindChat,
Operation: permission.OperationRead,
})
@@ -147,7 +147,7 @@ func (s *ChatService) ListChats(ctx context.Context, userID, status, keywords, i
chatsWithKBNames := make([]*ChatWithKBNames, 0, len(chats))
checker := permission.NewDatabaseChecker(dao.DB)
for _, chat := range chats {
- access, err := checker.ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := checker.ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindChat,
ID: chat.ID,
})
@@ -202,7 +202,7 @@ func (s *ChatService) Create(ctx context.Context, userID string, req map[string]
code, normalized := permissionresponse.Normalize(err)
return nil, code, normalized
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "chat", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "chat", permission.ActionWrite); err != nil {
code, normalized := permissionresponse.Normalize(err)
return nil, code, normalized
}
@@ -359,7 +359,7 @@ func (s *ChatService) Create(ctx context.Context, userID string, req map[string]
if err := s.chatDAO.Create(ctx, tx, chat); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chat.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chat.ID})
}); err != nil {
return nil, common.CodeDataError, fmt.Errorf("failed to create chat: %w", err)
}
@@ -414,7 +414,7 @@ func (s *ChatService) validateCreateDatasetIDs(ctx context.Context, value interf
}
for _, datasetID := range normalizedIDs {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return nil, permissionErr
}
@@ -440,7 +440,7 @@ func validateChatDatasetAccess(ctx context.Context, userID string, kbIDs entity.
if !ok || strings.TrimSpace(datasetID) == "" {
continue
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return permissionErr
}
@@ -820,7 +820,7 @@ const (
)
func (s *ChatService) getChatForOperation(ctx context.Context, userID, chatID string, operation permission.Operation) (*entity.Chat, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, operation); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, operation); err != nil {
return nil, err
}
return s.chatDAO.GetByIDAndStatus(ctx, dao.DB, chatID, string(entity.StatusValid))
@@ -1154,7 +1154,7 @@ func (s *ChatService) validateRESTDatasetIDs(ctx context.Context, value interfac
continue
}
datasetID := fmt.Sprint(item)
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return nil, permissionErr
}
@@ -1341,7 +1341,7 @@ func checkDuplicateChatIDs(ids []string) ([]string, []string) {
func (s *ChatService) BulkDeleteChats(ctx context.Context, userID string, req *BulkDeleteChatsRequest) (map[string]interface{}, error) {
ids := req.IDs
if len(ids) == 0 && req.DeleteAll {
- chatScope, err := s.permissionChecker.Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ chatScope, err := s.permissionChecker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindChat,
Operation: permission.OperationDelete,
})
@@ -1410,7 +1410,7 @@ type GetChatResponse struct {
// GetChat gets chat detail by ID with permission check
func (s *ChatService) GetChat(ctx context.Context, userID string, chatID string) (*GetChatResponse, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
return nil, err
}
@@ -1418,7 +1418,7 @@ func (s *ChatService) GetChat(ctx context.Context, userID string, chatID string)
if err != nil {
return nil, err
}
- access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindChat,
ID: chat.ID,
})
diff --git a/internal/service/chat_channel.go b/internal/service/chat_channel.go
index ad4e112c13..623dbb619c 100644
--- a/internal/service/chat_channel.go
+++ b/internal/service/chat_channel.go
@@ -78,7 +78,7 @@ func getChatChannelRuntimeProvider() ChatChannelRuntimeProvider {
}
func (s *ChatChannelService) List(ctx context.Context, userID string) ([]*entity.ChatChannelListResponse, error) {
- channelScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ channelScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindChatChannel,
Operation: permission.OperationRead,
})
@@ -100,11 +100,11 @@ func (s *ChatChannelService) CreateChatChannel(ctx context.Context, userID, name
if err != nil {
return nil, err
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "chat", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "chat", permission.ActionWrite); err != nil {
return nil, err
}
if chatID != nil && *chatID != "" {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: *chatID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: *chatID}, permission.OperationUse); err != nil {
return nil, err
}
}
@@ -122,7 +122,7 @@ func (s *ChatChannelService) CreateChatChannel(ctx context.Context, userID, name
if err := s.chatChannelDAO.Create(ctx, tx, row); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: row.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: row.ID})
}); err != nil {
return nil, err
}
@@ -135,7 +135,7 @@ func (s *ChatChannelService) CreateChatChannel(ctx context.Context, userID, name
}
func (s *ChatChannelService) GetChatChannel(ctx context.Context, userID, channelID string) (*entity.ChatChannel, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, code, permissionErr
}
@@ -152,7 +152,7 @@ func (s *ChatChannelService) GetChatChannel(ctx context.Context, userID, channel
}
func (s *ChatChannelService) UpdateChatChannel(ctx context.Context, userID, channelID string, req map[string]interface{}) (*entity.ChatChannel, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationUpdate); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, code, permissionErr
}
@@ -196,12 +196,13 @@ func (s *ChatChannelService) UpdateChatChannel(ctx context.Context, userID, chan
return nil, common.CodeDataError, errors.New("chat_id must be string or null")
}
if chatID != "" {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationUse); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
if channel.TenantID != userID {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: channel.TenantID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationUse); err != nil {
+ ownerCtx := permission.WithIdentity(ctx, channel.TenantID, channel.TenantID)
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ownerCtx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationUse); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -230,7 +231,7 @@ func (s *ChatChannelService) UpdateChatChannel(ctx context.Context, userID, chan
// GetChatChannelRuntime returns the live runtime metadata for a WhatsApp chat channel.
func (s *ChatChannelService) GetChatChannelRuntime(ctx context.Context, userID, channelID string) (map[string]any, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationUse); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, code, permissionErr
}
@@ -312,7 +313,7 @@ func (s *ChatChannelService) HandleIncomingMessage(ctx context.Context, msg Chat
}
func (s *ChatChannelService) DeleteChatChannel(ctx context.Context, userID, channelID string) (bool, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationDelete); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatChannel, ID: channelID}, permission.OperationDelete); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return false, code, permissionErr
}
diff --git a/internal/service/chat_channel_test.go b/internal/service/chat_channel_test.go
index e8a51fe184..01ae032c4d 100644
--- a/internal/service/chat_channel_test.go
+++ b/internal/service/chat_channel_test.go
@@ -271,7 +271,7 @@ func TestChatChannelServiceDeleteChatChannel(t *testing.T) {
svc := NewChatChannelService()
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-2", TenantID: "tenant-2"})
+ ctx := permission.WithIdentity(t.Context(), "user-2", "tenant-2")
deleted, code, err := svc.DeleteChatChannel(ctx, "user-2", "cc-1")
if code != common.CodeNotFound || err == nil {
t.Fatalf("expected hidden resource-not-found response, got code=%v err=%v", code, err)
diff --git a/internal/service/chat_session.go b/internal/service/chat_session.go
index 5d21f07f1f..3285e5f195 100644
--- a/internal/service/chat_session.go
+++ b/internal/service/chat_session.go
@@ -56,7 +56,7 @@ type chatSessionStore interface {
type chatSessionPermissionChecker interface {
resourceScopeChecker
- FilterResources(context.Context, permission.Subject, []permission.ResourceRef, permission.Operation) ([]permission.ResourceRef, error)
+ FilterResources(context.Context, []permission.ResourceRef, permission.Operation) ([]permission.ResourceRef, error)
}
type chatPipelineRunner interface {
@@ -133,7 +133,7 @@ type ChatSessionPayload struct {
// ListChatSessions lists chat sessions for a dialog
func (s *ChatSessionService) ListChatSessions(ctx context.Context, userID, chatID, sessionID, name, sessionUserID string, terms []dao.OrderTerm, page, pageSize int, options ...dao.ConversationHistoryOptions) (*ListChatSessionsResponse, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
_, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, normalizedErr
}
@@ -155,7 +155,7 @@ func (s *ChatSessionService) ListChatSessions(ctx context.Context, userID, chatI
for _, session := range sessions {
refs = append(refs, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: session.ID})
}
- accessible, err := checker.FilterResources(ctx, permission.Subject{UserID: userID}, refs, permission.OperationRead)
+ accessible, err := checker.FilterResources(ctx, refs, permission.OperationRead)
if err != nil {
_, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, normalizedErr
@@ -176,7 +176,7 @@ func (s *ChatSessionService) ListChatSessions(ctx context.Context, userID, chatI
// GetSession returns one chat session after ownership validation.
func (s *ChatSessionService) GetSession(ctx context.Context, userID, chatID, sessionID string, options ...dao.ConversationHistoryOptions) (*ChatSessionPayload, common.ErrorCode, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -191,7 +191,7 @@ func (s *ChatSessionService) GetSession(ctx context.Context, userID, chatID, ses
if session.DialogID != chatID {
return nil, common.CodeDataError, errors.New("session does not belong to this chat")
}
- if err = s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationRead); err != nil {
+ if err = s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationRead); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -206,7 +206,7 @@ func (s *ChatSessionService) GetSession(ctx context.Context, userID, chatID, ses
// CreateSession create a session in a dialog
func (s *ChatSessionService) CreateSession(ctx context.Context, userID, chatID string, req map[string]interface{}) (*ChatSessionPayload, common.ErrorCode, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationCreate); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationCreate); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -267,7 +267,7 @@ func (s *ChatSessionService) CreateSession(ctx context.Context, userID, chatID s
// DeleteSessions delete a session in a dialog
func (s *ChatSessionService) DeleteSessions(ctx context.Context, userID, chatID string, req map[string]interface{}) (interface{}, string, common.ErrorCode, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, "", code, normalizedErr
}
@@ -281,7 +281,7 @@ func (s *ChatSessionService) DeleteSessions(ctx context.Context, userID, chatID
deleteAll, _ := req["delete_all"].(bool)
if deleteAll {
chatRef := permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}
- sessionScope, err := s.permissionChecker.Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ sessionScope, err := s.permissionChecker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindChatSession,
Parent: chatRef,
Operation: permission.OperationDelete,
@@ -327,7 +327,7 @@ func (s *ChatSessionService) DeleteSessions(ctx context.Context, userID, chatID
continue
}
- if werr := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sid}, permission.OperationDelete); werr != nil {
+ if werr := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sid}, permission.OperationDelete); werr != nil {
_, normalizedErr := permissionresponse.NormalizeHidden(werr)
errorsList = append(errorsList, fmt.Sprintf("%s: %s", normalizedErr, sid))
continue
@@ -448,7 +448,7 @@ func checkDuplicateChatSessionIDs(ids []string) ([]string, []string) {
// UpdateSession updates one chat session after Python-style field validation.
func (s *ChatSessionService) UpdateSession(ctx context.Context, userID, chatID, sessionID string, req map[string]interface{}) (*ChatSessionPayload, common.ErrorCode, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -461,7 +461,7 @@ func (s *ChatSessionService) UpdateSession(ctx context.Context, userID, chatID,
return nil, common.CodeServerError, err
}
- if err = s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationUpdate); err != nil {
+ if err = s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationUpdate); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -520,7 +520,7 @@ func (s *ChatSessionService) UpdateSession(ctx context.Context, userID, chatID,
}
func (s *ChatSessionService) DeleteSessionMessage(ctx context.Context, userID, chatID, sessionID, msgID string) (*ChatSessionPayload, common.ErrorCode, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -533,7 +533,7 @@ func (s *ChatSessionService) DeleteSessionMessage(ctx context.Context, userID, c
return nil, common.CodeDataError, errors.New("session not found")
}
- if werr := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationUpdate); werr != nil {
+ if werr := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationUpdate); werr != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(werr)
return nil, code, normalizedErr
}
@@ -580,7 +580,7 @@ func (s *ChatSessionService) DeleteSessionMessage(ctx context.Context, userID, c
}
func (s *ChatSessionService) UpdateMessageFeedback(ctx context.Context, userID, chatID, sessionID, msgID string, req map[string]interface{}) (*ChatSessionPayload, common.ErrorCode, error) {
- if err := s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
+ if err := s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRead); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -595,7 +595,7 @@ func (s *ChatSessionService) UpdateMessageFeedback(ctx context.Context, userID,
return nil, common.CodeDataError, errors.New("session not found")
}
- if err = s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationUpdate); err != nil {
+ if err = s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationUpdate); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -1169,7 +1169,7 @@ func (s *ChatSessionService) ChatCompletions(
var dialog *entity.Chat
var session *entity.ChatSession
if chatID != "" {
- if err = s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRun); err != nil {
+ if err = s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChat, ID: chatID}, permission.OperationRun); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return fail(common.NewCodedError(code, normalizedErr.Error()))
}
@@ -1185,7 +1185,7 @@ func (s *ChatSessionService) ChatCompletions(
if session.DialogID != chatID {
return fail(common.NewCodedError(common.CodeDataError, "Session does not belong to this chat!"))
}
- if err = s.permissionChecker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationRun); err != nil {
+ if err = s.permissionChecker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: sessionID}, permission.OperationRun); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return fail(common.NewCodedError(code, normalizedErr.Error()))
}
diff --git a/internal/service/chat_session_contract_test.go b/internal/service/chat_session_contract_test.go
index be55d65bd1..3a24956885 100644
--- a/internal/service/chat_session_contract_test.go
+++ b/internal/service/chat_session_contract_test.go
@@ -30,15 +30,15 @@ type emptyChatSessionScopeChecker struct {
checkErr error
}
-func (c emptyChatSessionScopeChecker) CheckResource(context.Context, permission.Subject, permission.ResourceRef, permission.Operation) error {
+func (c emptyChatSessionScopeChecker) CheckResource(context.Context, permission.ResourceRef, permission.Operation) error {
return c.checkErr
}
-func (emptyChatSessionScopeChecker) Scope(context.Context, permission.Subject, permission.ScopeQuery) (permission.Scope, error) {
+func (emptyChatSessionScopeChecker) Scope(context.Context, permission.ScopeQuery) (permission.Scope, error) {
return permission.Scope{Mode: permission.ScopeNone}, nil
}
-func (c emptyChatSessionScopeChecker) FilterResources(context.Context, permission.Subject, []permission.ResourceRef, permission.Operation) ([]permission.ResourceRef, error) {
+func (c emptyChatSessionScopeChecker) FilterResources(context.Context, []permission.ResourceRef, permission.Operation) ([]permission.ResourceRef, error) {
return nil, c.checkErr
}
@@ -176,7 +176,7 @@ func TestDeleteSessions_SuccessByIDs(t *testing.T) {
pipeline: &fakePipeline{},
}
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "user-1", "user-1")
result, message, code, err := svc.DeleteSessions(ctx, "user-1", "chat-1", map[string]interface{}{"ids": []interface{}{"s1"}})
if err != nil {
t.Fatalf("unexpected error: %v", err)
@@ -206,7 +206,7 @@ func TestDeleteSessions_DeleteAllAndInvalidID(t *testing.T) {
}
// Empty payload -> success with empty result map.
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "user-1", "user-1")
if _, _, code, err := svc.DeleteSessions(ctx, "user-1", "chat-1", map[string]interface{}{}); err != nil || code != common.CodeSuccess {
t.Fatalf("empty payload: code=%v err=%v", code, err)
}
diff --git a/internal/service/chat_session_test.go b/internal/service/chat_session_test.go
index 6cf6ba7c89..8a0fdae924 100644
--- a/internal/service/chat_session_test.go
+++ b/internal/service/chat_session_test.go
@@ -202,7 +202,8 @@ func (f *fakeSessionStore) GetDialogByID(ctx context.Context, db *gorm.DB, chatI
return d, nil
}
-func (f *fakeSessionStore) CheckResource(_ context.Context, subject permission.Subject, ref permission.ResourceRef, operation permission.Operation) error {
+func (f *fakeSessionStore) CheckResource(ctx context.Context, ref permission.ResourceRef, operation permission.Operation) error {
+ userID := permission.UserIDFromContext(ctx)
chatID := ref.ID
var session *entity.ChatSession
if ref.Kind == permission.ResourceKindChatSession {
@@ -230,7 +231,7 @@ func (f *fakeSessionStore) CheckResource(_ context.Context, subject permission.S
member := false
owner := false
for _, ownerID := range ownerIDs {
- if ownerID == subject.UserID {
+ if ownerID == userID {
owner = true
member = true
break
@@ -251,19 +252,19 @@ func (f *fakeSessionStore) CheckResource(_ context.Context, subject permission.S
if operation == permission.OperationRead {
return nil
}
- if owner || (session.UserID != nil && *session.UserID == subject.UserID) {
+ if owner || (session.UserID != nil && *session.UserID == userID) {
return nil
}
return permission.ErrPermissionDenied
}
-func (f *fakeSessionStore) Scope(ctx context.Context, subject permission.Subject, query permission.ScopeQuery) (permission.Scope, error) {
+func (f *fakeSessionStore) Scope(ctx context.Context, query permission.ScopeQuery) (permission.Scope, error) {
f.scopeCalls++
if query.Kind != permission.ResourceKindChatSession || query.Parent.Kind != permission.ResourceKindChat {
return permission.Scope{}, permission.ErrInvalidPermission
}
if query.Entry != nil {
- if err := f.CheckResource(ctx, subject, *query.Entry, query.EntryOp); err != nil {
+ if err := f.CheckResource(ctx, *query.Entry, query.EntryOp); err != nil {
return permission.Scope{}, err
}
}
@@ -272,7 +273,7 @@ func (f *fakeSessionStore) Scope(ctx context.Context, subject permission.Subject
if session.DialogID != query.Parent.ID {
continue
}
- if err := f.CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: session.ID}, query.Operation); err != nil {
+ if err := f.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindChatSession, ID: session.ID}, query.Operation); err != nil {
if errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrResourceNotFound) {
continue
}
@@ -290,11 +291,11 @@ func (f *fakeSessionStore) Scope(ctx context.Context, subject permission.Subject
return scope, nil
}
-func (f *fakeSessionStore) FilterResources(ctx context.Context, subject permission.Subject, refs []permission.ResourceRef, operation permission.Operation) ([]permission.ResourceRef, error) {
+func (f *fakeSessionStore) FilterResources(ctx context.Context, refs []permission.ResourceRef, operation permission.Operation) ([]permission.ResourceRef, error) {
f.filteredRefs = append(f.filteredRefs, refs...)
var accessible []permission.ResourceRef
for _, ref := range refs {
- if err := f.CheckResource(ctx, subject, ref, operation); err != nil {
+ if err := f.CheckResource(ctx, ref, operation); err != nil {
if errors.Is(err, permission.ErrPermissionDenied) || errors.Is(err, permission.ErrResourceNotFound) {
continue
}
@@ -367,7 +368,7 @@ func TestChatCompletionsPersistsAnswerDetailsForHistory(t *testing.T) {
)}
svc := &ChatSessionService{chatSessionDAO: store, permissionChecker: store, pipeline: pipeline}
streamChan := make(chan string, 8)
- if _, err := svc.ChatCompletions(t.Context(), "user-1", "chat-1", "session-1", nil, "new question", nil, "", nil, nil, mode.legacy, mode.stream, streamChan); err != nil {
+ if _, err := svc.ChatCompletions(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "chat-1", "session-1", nil, "new question", nil, "", nil, nil, mode.legacy, mode.stream, streamChan); err != nil {
t.Fatal(err)
}
if len(pipeline.messages) != 3 || pipeline.messages[1]["content"] != "old answer" {
@@ -380,7 +381,7 @@ func TestChatCompletionsPersistsAnswerDetailsForHistory(t *testing.T) {
}
}
}
- payload, code, err := svc.GetSession(t.Context(), "user-1", "chat-1", "session-1", dao.ConversationHistoryOptions{IncludeReference: true, IncludePrompt: true})
+ payload, code, err := svc.GetSession(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "chat-1", "session-1", dao.ConversationHistoryOptions{IncludeReference: true, IncludePrompt: true})
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetSession: code=%v err=%v", code, err)
}
@@ -659,7 +660,7 @@ func TestGetSession_Success(t *testing.T) {
}
ctx := t.Context()
- resp, code, err := svc.GetSession(ctx, "user-1", "chat-1", "session-1", dao.ConversationHistoryOptions{IncludeReference: true, IncludePrompt: true})
+ resp, code, err := svc.GetSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1", dao.ConversationHistoryOptions{IncludeReference: true, IncludePrompt: true})
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -697,7 +698,7 @@ func TestGetSession_NotOwner(t *testing.T) {
}
ctx := t.Context()
- _, code, err := svc.GetSession(ctx, "user-1", "chat-1", "session-1")
+ _, code, err := svc.GetSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1")
if err == nil || err.Error() != "Resource not found" {
t.Fatalf("err=%v", err)
}
@@ -718,7 +719,7 @@ func TestGetSession_WrongChat(t *testing.T) {
}
ctx := t.Context()
- _, code, err := svc.GetSession(ctx, "user-1", "chat-1", "session-1")
+ _, code, err := svc.GetSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1")
if err == nil || err.Error() != "session does not belong to this chat" {
t.Fatalf("err=%v", err)
}
@@ -745,7 +746,7 @@ func TestUpdateSession_Success(t *testing.T) {
longName := " " + strings.Repeat("x", 260) + " "
ctx := t.Context()
- resp, code, err := svc.UpdateSession(ctx, "user-1", "chat-1", "session-1", map[string]interface{}{
+ resp, code, err := svc.UpdateSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1", map[string]interface{}{
"name": longName,
"user_id": "spoof",
"chat_id": "spoof-chat",
@@ -800,7 +801,7 @@ func TestUpdateSession_ValidationErrors(t *testing.T) {
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
ctx := t.Context()
- _, code, err := svc.UpdateSession(ctx, "user-1", "chat-1", "session-1", tc.req)
+ _, code, err := svc.UpdateSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1", tc.req)
if err == nil || err.Error() != tc.message {
t.Fatalf("err=%v", err)
}
@@ -822,7 +823,7 @@ func TestUpdateSession_NotFound(t *testing.T) {
}
ctx := t.Context()
- _, code, err := svc.UpdateSession(ctx, "user-1", "chat-1", "missing", map[string]interface{}{"name": "renamed"})
+ _, code, err := svc.UpdateSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "missing", map[string]interface{}{"name": "renamed"})
if err == nil || err.Error() != "Session not found!" {
t.Fatalf("err=%v", err)
}
@@ -853,7 +854,7 @@ func TestDeleteSessionMessage_RemovesMessagePairAndReference(t *testing.T) {
}
ctx := t.Context()
- resp, code, err := svc.DeleteSessionMessage(ctx, "user-1", "chat-1", "session-1", "msg-1")
+ resp, code, err := svc.DeleteSessionMessage(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1", "msg-1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -869,7 +870,7 @@ func TestDeleteSessionMessage_RemovesMessagePairAndReference(t *testing.T) {
if _, ok := resp.Messages[2]["reference"]; ok {
t.Fatalf("delete response contains reference: %#v", resp.Messages[2])
}
- resp, code, err = svc.GetSession(ctx, "user-1", "chat-1", "session-1", dao.ConversationHistoryOptions{IncludeReference: true})
+ resp, code, err = svc.GetSession(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "chat-1", "session-1", dao.ConversationHistoryOptions{IncludeReference: true})
if err != nil || code != common.CodeSuccess {
t.Fatalf("GetSession: code=%v err=%v", code, err)
}
@@ -903,7 +904,7 @@ func TestUpdateMessageFeedback_AppliesChunkFeedbackWithResolvedTenantAndContext(
pipeline: &fakePipeline{},
docEngine: docEngine,
}
- ctx := context.WithValue(t.Context(), feedbackContextKey{}, "request-context")
+ ctx := context.WithValue(permission.WithIdentity(t.Context(), "user-1", "tenant-owner"), feedbackContextKey{}, "request-context")
resp, code, err := svc.UpdateMessageFeedback(ctx, "user-1", "chat-1", "session-1", "msg-1", map[string]interface{}{
"thumbup": true,
@@ -957,7 +958,7 @@ func TestUpdateMessageFeedback_ToggleUsesResolvedTenantForUndoAndApply(t *testin
docEngine: docEngine,
}
- resp, code, err := svc.UpdateMessageFeedback(t.Context(), "user-1", "chat-1", "session-1", "msg-1", map[string]interface{}{
+ resp, code, err := svc.UpdateMessageFeedback(permission.WithIdentity(t.Context(), "user-1", "tenant-owner"), "user-1", "chat-1", "session-1", "msg-1", map[string]interface{}{
"thumbup": false,
"feedback": "not useful",
})
@@ -1141,7 +1142,7 @@ func TestChatCompletions_AppendOnly(t *testing.T) {
}
ctx := t.Context()
- result, err := svc.ChatCompletions(ctx, "user-1", "dialog-1", "session-1", []map[string]interface{}{
+ result, err := svc.ChatCompletions(permission.WithIdentity(ctx, "user-1", permission.TenantIDFromContext(ctx)), "user-1", "dialog-1", "session-1", []map[string]interface{}{
{"role": "user", "content": "ignored client history"},
{"id": "msg-1", "role": "user", "content": "hi"},
}, "", nil, "", nil, nil, false, false, nil)
@@ -1203,7 +1204,7 @@ func TestChatCompletions_AppendOnly(t *testing.T) {
)}
svc := &ChatSessionService{chatSessionDAO: store, permissionChecker: store, pipeline: pipeline}
streamChan := make(chan string, 8)
- result, err := svc.ChatCompletions(t.Context(), "user-1", "dialog-1", sessionID, payload, "must not replace payload", nil, "", nil, map[string]interface{}{"store_history_messages": false}, legacy, stream, streamChan)
+ result, err := svc.ChatCompletions(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "dialog-1", sessionID, payload, "must not replace payload", nil, "", nil, map[string]interface{}{"store_history_messages": false}, legacy, stream, streamChan)
if err != nil {
t.Errorf("completion failed: %v", err)
return
@@ -1232,7 +1233,7 @@ func TestChatCompletions_AppendOnly(t *testing.T) {
if len(store.updateCalled) != 2 || len(store.createCalled) != 0 || string(stored.Message) != storedMessages {
t.Fatal("model tests changed stored history or created a session")
}
- if _, err := svc.ChatCompletions(t.Context(), "user-1", "dialog-1", "", nil, "question without messages", nil, "", nil, map[string]interface{}{"store_history_messages": false}, false, false, nil); err == nil {
+ if _, err := svc.ChatCompletions(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "dialog-1", "", nil, "question without messages", nil, "", nil, map[string]interface{}{"store_history_messages": false}, false, false, nil); err == nil {
t.Fatal("non-storing completion must require messages")
}
})
@@ -1269,9 +1270,8 @@ func TestChatCompletionsPassesRequestUserIDToPipeline(t *testing.T) {
pipeline: pipeline,
}
- _, err := svc.ChatCompletions(
- t.Context(),
- "user-1",
+ _, err := svc.ChatCompletions(permission.WithIdentity(t.Context(),
+ "user-1", permission.TenantIDFromContext(t.Context())), "user-1",
"dialog-1",
"session-1",
[]map[string]interface{}{{"role": "user", "content": "hi"}},
@@ -1351,9 +1351,8 @@ func TestChatCompletionsStreamFinalCarriesDecoratedReference(t *testing.T) {
}
streamChan := make(chan string, 8)
- _, err := svc.ChatCompletions(
- t.Context(),
- "user-1",
+ _, err := svc.ChatCompletions(permission.WithIdentity(t.Context(),
+ "user-1", permission.TenantIDFromContext(t.Context())), "user-1",
"dialog-1",
"session-1",
[]map[string]interface{}{{"role": "user", "content": "what is marigold"}},
@@ -1450,9 +1449,8 @@ func TestChatCompletionsModelIDOverrideUsesModelResolver(t *testing.T) {
modelFactory: resolver,
}
- _, err := svc.ChatCompletions(
- t.Context(),
- "user-1",
+ _, err := svc.ChatCompletions(permission.WithIdentity(t.Context(),
+ "user-1", permission.TenantIDFromContext(t.Context())), "user-1",
"dialog-1",
"session-1",
[]map[string]interface{}{{"role": "user", "content": "hi"}},
@@ -1849,7 +1847,7 @@ func newSharedChatReadonlyService() (*ChatSessionService, *fakeSessionStore) {
func TestUpdateSession_SharedSessionReadonlyForTeammate(t *testing.T) {
svc, store := newSharedChatReadonlyService()
- _, code, err := svc.UpdateSession(t.Context(), "user-1", "chat-1", "session-1", map[string]interface{}{"name": "renamed"})
+ _, code, err := svc.UpdateSession(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "chat-1", "session-1", map[string]interface{}{"name": "renamed"})
if err == nil || err.Error() != "Resource not found" {
t.Fatalf("err=%v", err)
}
@@ -1867,7 +1865,7 @@ func TestUpdateSession_SessionCreatorCanRenameInSharedChat(t *testing.T) {
// rename sessions they created themselves on the shared chat.
store.sessions["session-1"].UserID = strPtr("user-1")
- resp, code, err := svc.UpdateSession(t.Context(), "user-1", "chat-1", "session-1", map[string]interface{}{"name": "renamed"})
+ resp, code, err := svc.UpdateSession(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "chat-1", "session-1", map[string]interface{}{"name": "renamed"})
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -1884,7 +1882,7 @@ func TestUpdateSession_ChatOwnerCanRenameAnySession(t *testing.T) {
// The dialog tenant itself may manage every session of its chat.
store.dialogExists["tenant-owner|chat-1"] = true
- _, code, err := svc.UpdateSession(t.Context(), "tenant-owner", "chat-1", "session-1", map[string]interface{}{"name": "renamed"})
+ _, code, err := svc.UpdateSession(permission.WithIdentity(t.Context(), "tenant-owner", permission.TenantIDFromContext(t.Context())), "tenant-owner", "chat-1", "session-1", map[string]interface{}{"name": "renamed"})
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -1896,7 +1894,7 @@ func TestUpdateSession_ChatOwnerCanRenameAnySession(t *testing.T) {
func TestDeleteSessions_SharedSessionReadonlyForTeammate(t *testing.T) {
svc, store := newSharedChatReadonlyService()
- resp, msg, code, err := svc.DeleteSessions(t.Context(), "user-1", "chat-1", map[string]interface{}{"ids": []interface{}{"session-1"}})
+ resp, msg, code, err := svc.DeleteSessions(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "chat-1", map[string]interface{}{"ids": []interface{}{"session-1"}})
if err == nil || !strings.Contains(err.Error(), "Resource not found") {
t.Fatalf("err=%v", err)
}
@@ -1916,7 +1914,7 @@ func TestDeleteSessions_SharedSessionReadonlyForTeammate(t *testing.T) {
func TestDeleteSessionMessage_SharedSessionReadonlyForTeammate(t *testing.T) {
svc, _ := newSharedChatReadonlyService()
- _, code, err := svc.DeleteSessionMessage(t.Context(), "user-1", "chat-1", "session-1", "msg-1")
+ _, code, err := svc.DeleteSessionMessage(permission.WithIdentity(t.Context(), "user-1", permission.TenantIDFromContext(t.Context())), "user-1", "chat-1", "session-1", "msg-1")
if err == nil || err.Error() != "Resource not found" {
t.Fatalf("err=%v", err)
}
@@ -1950,9 +1948,8 @@ func TestChatCompletions_SharedSessionReadonlyForTeammate(t *testing.T) {
pipeline := &fakePipeline{resultChan: makeResultChan(AsyncChatResult{Answer: "ok", Final: true})}
svc.pipeline = pipeline
- _, err := svc.ChatCompletions(
- t.Context(),
- "user-1",
+ _, err := svc.ChatCompletions(permission.WithIdentity(t.Context(),
+ "user-1", permission.TenantIDFromContext(t.Context())), "user-1",
"chat-1",
"session-1",
[]map[string]interface{}{{"role": "user", "content": "hi"}},
@@ -2002,9 +1999,8 @@ func TestChatCompletions_CancelledNonStreamDoesNotPersistBlankTurn(t *testing.T)
pipeline: pipeline,
}
- _, _ = svc.ChatCompletions(
- ctx,
- "user-1",
+ _, _ = svc.ChatCompletions(permission.WithIdentity(ctx,
+ "user-1", permission.TenantIDFromContext(ctx)), "user-1",
"chat-1",
"session-1",
nil,
diff --git a/internal/service/chunk/chunk.go b/internal/service/chunk/chunk.go
index 0a21d86753..ef76555dac 100644
--- a/internal/service/chunk/chunk.go
+++ b/internal/service/chunk/chunk.go
@@ -137,8 +137,7 @@ func NewChunkService() *ChunkService {
// 7. knowledge graph retrieval (not implemented)
// 8. Apply retrieval by children to group child chunks under parent chunks
func (s *ChunkService) RetrievalTest(ctx context.Context, req *service.RetrievalTestRequest) (*service.RetrievalTestResponse, error) {
- subject, _ := permission.SubjectFromContext(ctx)
- common.Info("RetrievalTest started", zap.String("userID", subject.UserID), zap.Any("kbID", req.Datasets), zap.String("question", req.Question))
+ common.Info("RetrievalTest started", zap.String("userID", permission.UserIDFromContext(ctx)), zap.Any("kbID", req.Datasets), zap.String("question", req.Question))
common.Debug(fmt.Sprintf("RetrievalTest request:\n"+
" kbID=%v\n"+
@@ -172,7 +171,7 @@ func (s *ChunkService) RetrievalTest(ctx context.Context, req *service.Retrieval
var tenantIDs []string
var kbRecords []*entity.Knowledgebase
for _, datasetID := range req.Datasets {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDataset,
ID: datasetID,
}, permission.OperationUse); err != nil {
@@ -446,7 +445,7 @@ func (s *ChunkService) RetrievalTest(ctx context.Context, req *service.Retrieval
// Infinity/OceanBase chunks already carry real vectors and are left unchanged.
hydrateChunkVectors(ctx, s.docEngine, filteredChunks, req.Datasets, tenantIDs)
- common.Info("RetrievalTest completed", zap.String("userID", subject.UserID), zap.Any("kbID", req.Datasets), zap.String("question", req.Question), zap.Int64("chunkCount", int64(len(filteredChunks))))
+ common.Info("RetrievalTest completed", zap.String("userID", permission.UserIDFromContext(ctx)), zap.Any("kbID", req.Datasets), zap.String("question", req.Question), zap.Int64("chunkCount", int64(len(filteredChunks))))
return &service.RetrievalTestResponse{
Chunks: filteredChunks,
@@ -636,7 +635,7 @@ func (s *ChunkService) cancelAllTasksOfDoc(ctx context.Context, doc *entity.Docu
}
func (s *ChunkService) StopParsing(ctx context.Context, userID, datasetID string, req service.StopParsingRequest) (*service.StopParsingResponse, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRun); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -711,7 +710,7 @@ func (s *ChunkService) checkDatasetAccess(ctx context.Context, datasetID, userID
if s.checkDatasetAccessFunc != nil {
return s.checkDatasetAccessFunc(datasetID, userID)
}
- return permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, operation)
+ return permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, operation)
}
func (s *ChunkService) getKnowledgebaseByID(ctx context.Context, datasetID string) (*entity.Knowledgebase, error) {
diff --git a/internal/service/chunk/chunk_permissions_test.go b/internal/service/chunk/chunk_permissions_test.go
index 52bb36ad8c..47aa9a8deb 100644
--- a/internal/service/chunk/chunk_permissions_test.go
+++ b/internal/service/chunk/chunk_permissions_test.go
@@ -57,7 +57,7 @@ func TestChunkManagementDatasetPermissions(t *testing.T) {
if err := testsupport.PrepareEnterprisePermissionFixture(db, "owner", "owner", "member"); err != nil {
t.Fatalf("prepare permission fixture: %v", err)
}
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: tt.userID, TenantID: "owner"})
+ ctx := permission.WithIdentity(t.Context(), tt.userID, "owner")
for _, op := range []struct {
name string
run func(*ChunkService) error
diff --git a/internal/service/chunk/chunk_test.go b/internal/service/chunk/chunk_test.go
index b59791a7bd..cbee27b591 100644
--- a/internal/service/chunk/chunk_test.go
+++ b/internal/service/chunk/chunk_test.go
@@ -2005,7 +2005,7 @@ func chunkTestContext(t *testing.T, userID, tenantID string, memberIDs ...string
if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, members...); err != nil {
t.Fatalf("prepare permission fixture: %v", err)
}
- return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})
+ return permission.WithIdentity(t.Context(), userID, tenantID)
}
func newParseTestService(t *testing.T) *ChunkService {
diff --git a/internal/service/compilation_template_group_service.go b/internal/service/compilation_template_group_service.go
index 0c35b40aa4..d0b16d72be 100644
--- a/internal/service/compilation_template_group_service.go
+++ b/internal/service/compilation_template_group_service.go
@@ -552,8 +552,8 @@ func (s *CompilationTemplateGroupService) reconcileChildren(ctx context.Context,
func identityForTemplateTenant(ctx context.Context, tenantID string) Identity {
access := Identity{UserID: tenantID, TenantID: tenantID}
- if subject, ok := permission.SubjectFromContext(ctx); ok && strings.TrimSpace(subject.UserID) != "" {
- access.UserID = subject.UserID
+ if userID := strings.TrimSpace(permission.UserIDFromContext(ctx)); userID != "" {
+ access.UserID = userID
}
return access
}
diff --git a/internal/service/connector.go b/internal/service/connector.go
index 565a73571e..87b81ea95f 100644
--- a/internal/service/connector.go
+++ b/internal/service/connector.go
@@ -282,7 +282,7 @@ func (s *ConnectorService) CreateConnector(ctx context.Context, userID string, r
if err != nil {
return nil, err
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "file", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "file", permission.ActionWrite); err != nil {
return nil, err
}
if req.RefreshFreq != nil && *req.RefreshFreq <= 0 {
@@ -323,7 +323,7 @@ func (s *ConnectorService) CreateConnector(ctx context.Context, userID string, r
if err := s.connectorDAO.Create(ctx, tx, connector); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connector.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connector.ID})
}); err != nil {
return nil, err
}
@@ -336,7 +336,7 @@ func (s *ConnectorService) GetConnector(ctx context.Context, connectorID, userID
if strings.TrimSpace(connectorID) == "" {
return nil, ErrConnectorIDRequired
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRead); err != nil {
return nil, err
}
@@ -369,7 +369,7 @@ func (s *ConnectorService) ListConnectors(ctx context.Context, userID, requested
if err != nil {
return nil, err
}
- } else if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, permission.TenantMember); err != nil {
+ } else if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
return nil, err
}
connectors, err := s.connectorDAO.ListByTenantID(ctx, dao.DB, tenantID)
@@ -386,7 +386,7 @@ func (s *ConnectorService) ListConnectors(ctx context.Context, userID, requested
func (s *ConnectorService) TestConnector(ctx context.Context, connectorID, userID string, config entity.JSONMap) error {
var storedConnector *entity.Connector
if connectorID != "" {
- permissionErr := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationUse)
+ permissionErr := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationUse)
if permissionErr != nil && !errors.Is(permissionErr, permission.ErrResourceNotFound) {
return permissionErr
}
@@ -945,7 +945,7 @@ func (s *ConnectorService) DeleteConnector(ctx context.Context, connectorID, use
if connectorID == "" {
return false, common.CodeDataError, fmt.Errorf("connector_id is required")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationDelete); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationDelete); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return false, code, permissionErr
}
@@ -981,12 +981,12 @@ func (s *ConnectorService) UpdateConnector(ctx context.Context, connectorID, use
if connectorID == "" {
return nil, common.CodeDataError, fmt.Errorf("connector_id is required")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationUpdate); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, code, permissionErr
}
if req != nil && (req.Reschedule || isConnectorCancelStatus(req.Status) || isConnectorScheduleStatus(req.Status)) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRun); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, code, permissionErr
}
@@ -1080,7 +1080,7 @@ func (s *ConnectorService) RebuildConnector(ctx context.Context, connectorID, us
if kbID == "" {
return false, common.CodeArgumentError, fmt.Errorf("required argument is missing: kb_id")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRun); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return false, code, permissionErr
}
@@ -1095,7 +1095,7 @@ func (s *ConnectorService) RebuildConnector(ctx context.Context, connectorID, us
// The caller-supplied kb is targeted by delete + re-sync below, so it must
// be accessible to the caller and the connector must be bound to it.
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kbID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kbID}, permission.OperationRun); err != nil {
common.Warn("rebuild denied: kb not accessible",
zap.String("connector_id", connectorID), zap.String("kb_id", kbID), zap.String("user_id", userID))
code, permissionErr := permissionresponse.Normalize(err)
@@ -1150,12 +1150,12 @@ func (s *ConnectorService) ResumeFailedSync(ctx context.Context, connectorID, us
if req.TaskID == "" {
return false, common.CodeArgumentError, fmt.Errorf("required argument is missing: task_id")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}, permission.OperationRun); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return false, code, permissionErr
}
connectorRef := permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}
- taskScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ taskScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindSyncTask,
Parent: connectorRef,
Operation: permission.OperationRun,
@@ -1177,7 +1177,7 @@ func (s *ConnectorService) ResumeFailedSync(ctx context.Context, connectorID, us
code, permissionErr := permissionresponse.NormalizeHidden(permission.ErrResourceNotFound)
return false, code, permissionErr
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KbID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: req.KbID}, permission.OperationRun); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return false, code, permissionErr
}
@@ -1278,13 +1278,12 @@ func (s *ConnectorService) ListLog(ctx context.Context, connectorID, userID stri
}
checker := permission.NewDatabaseChecker(dao.DB)
- subject := permission.Subject{UserID: userID}
connectorRef := permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}
- if err := checker.CheckResource(ctx, subject, connectorRef, permission.OperationRead); err != nil {
+ if err := checker.CheckResource(ctx, connectorRef, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, 0, code, permissionErr
}
- taskScope, err := checker.Scope(ctx, subject, permission.ScopeQuery{
+ taskScope, err := checker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindSyncTask,
Parent: connectorRef,
Operation: permission.OperationRead,
@@ -1327,14 +1326,13 @@ func (s *ConnectorService) ListLogs(ctx context.Context, userID, datasetID strin
}
if datasetID != "" {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, 0, code, permissionErr
}
}
checker := permission.NewDatabaseChecker(dao.DB)
- subject := permission.Subject{UserID: userID}
- connectorScope, err := checker.Scope(ctx, subject, permission.ScopeQuery{
+ connectorScope, err := checker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindConnector,
Operation: permission.OperationRead,
})
@@ -1348,7 +1346,7 @@ func (s *ConnectorService) ListLogs(ctx context.Context, userID, datasetID strin
var taskIDs []string
for _, connectorID := range connectorIDs {
connectorRef := permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connectorID}
- taskScope, err := checker.Scope(ctx, subject, permission.ScopeQuery{
+ taskScope, err := checker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindSyncTask,
Parent: connectorRef,
Operation: permission.OperationRead,
diff --git a/internal/service/dataset/compilation_status.go b/internal/service/dataset/compilation_status.go
index 24ab4c83de..b2d1171a2c 100644
--- a/internal/service/dataset/compilation_status.go
+++ b/internal/service/dataset/compilation_status.go
@@ -42,7 +42,7 @@ func (d *DatasetService) GetDatasetCompilationStatus(ctx context.Context, userID
if datasetID == "" {
return CompilationStatus{}, common.CodeDataError, errors.New("dataset_id is required")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return CompilationStatus{}, code, permissionErr
}
diff --git a/internal/service/dataset/create_test.go b/internal/service/dataset/create_test.go
index cd309ad22a..10d31cbeb3 100644
--- a/internal/service/dataset/create_test.go
+++ b/internal/service/dataset/create_test.go
@@ -10,14 +10,9 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
- "ragflow/internal/permission"
"ragflow/internal/service"
)
-func testDatasetSubject(id string) permission.Subject {
- return permission.Subject{UserID: id, TenantID: id}
-}
-
func insertCreateDatasetTenant(t *testing.T, tenantID string) {
t.Helper()
var existing entity.Tenant
@@ -49,7 +44,7 @@ func TestCreateDataset_NoComponentParams(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
chunkMethod := "naive"
parseType := 1
@@ -57,7 +52,7 @@ func TestCreateDataset_NoComponentParams(t *testing.T) {
Name: "ds-no-cp",
ParserID: &chunkMethod,
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
@@ -80,12 +75,12 @@ func TestCreateDataset_DefaultsParentChildConfig(t *testing.T) {
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- result, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ result, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-default-parent-child",
ParserID: sptr("general"),
ParseType: iptr(1),
ParserConfig: map[string]interface{}{},
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -126,10 +121,10 @@ func TestCreateDataset_RequiresParseTypeWhenParserIDIsProvided(t *testing.T) {
insertCreateDatasetTenant(t, "tenant-1")
parserID := "qa"
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-parser-only",
ParserID: &parserID,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil || code != common.CodeDataError || err.Error() != "parse_type is required" {
t.Fatalf("CreateDataset = (code=%d, err=%v), want data error for missing parse_type", code, err)
}
@@ -139,7 +134,7 @@ func TestCreateDataset_ComponentParamsPopulated(t *testing.T) {
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
seedCreateDatasetDefaultChatModel(t, db, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
chunkMethod := "general"
parseType := 1
@@ -148,7 +143,7 @@ func TestCreateDataset_ComponentParamsPopulated(t *testing.T) {
ParserID: &chunkMethod,
ParserConfig: map[string]interface{}{},
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
@@ -196,7 +191,7 @@ func TestCreateDataset_ParentChildConfigReachesGeneralChunker(t *testing.T) {
parserID := "general"
parseType := 1
- result, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ result, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-parent-child",
ParserID: &parserID,
ParseType: &parseType,
@@ -208,7 +203,7 @@ func TestCreateDataset_ParentChildConfigReachesGeneralChunker(t *testing.T) {
},
},
},
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -232,7 +227,7 @@ func TestCreateDataset_PreservesChunkerComponentOverrides(t *testing.T) {
parserID := "general"
parseType := 1
- result, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ result, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-chunker-override",
ParserID: &parserID,
ParseType: &parseType,
@@ -241,7 +236,7 @@ func TestCreateDataset_PreservesChunkerComponentOverrides(t *testing.T) {
"chunk_token_size": float64(256),
},
},
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -263,7 +258,7 @@ func TestCreateDataset_ParseTypeBuiltinHasNoPipelineID(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
parseTypeBuiltin := 1
chunkMethod := "naive"
@@ -271,7 +266,7 @@ func TestCreateDataset_ParseTypeBuiltinHasNoPipelineID(t *testing.T) {
Name: "ds-parse-builtin",
ParserID: &chunkMethod,
ParseType: &parseTypeBuiltin,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
@@ -291,7 +286,7 @@ func TestCreateDataset_ParseTypePipelineIgnoresParserID(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
pipelineID := "0123456789abcdef0123456789abcdef"
parseTypePipeline := 2
@@ -299,7 +294,7 @@ func TestCreateDataset_ParseTypePipelineIgnoresParserID(t *testing.T) {
Name: "ds-parse-pipeline",
PipelineID: &pipelineID,
ParseType: &parseTypePipeline,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
@@ -316,9 +311,9 @@ func TestCreateDataset_ValidatesName(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
- _, code, err := testDatasetCreateService(t).CreateDataset(ctx, &service.CreateDatasetRequest{Name: " "}, testDatasetSubject("tenant-1"))
+ _, code, err := testDatasetCreateService(t).CreateDataset(ctx, &service.CreateDatasetRequest{Name: " "})
if err == nil {
t.Fatal("expected name validation error")
}
@@ -346,13 +341,13 @@ func TestCreateDataset_DedupesDuplicateName(t *testing.T) {
t.Fatalf("failed to create existing kb: %v", err)
}
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
// Mirror Python's duplicate_name: the create appends (1) instead of failing.
result, code, err := testDatasetCreateService(t).CreateDataset(ctx, &service.CreateDatasetRequest{
Name: "Existing",
ParserID: sptr("general"),
ParseType: iptr(1),
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("expected success, got %v", err)
}
@@ -372,11 +367,11 @@ func TestCreateDataset_UsesActorAsCreatorAndTenantAsOwner(t *testing.T) {
parserID := "general"
parseType := 1
- result, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ result, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "member-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "created-by-member",
ParserID: &parserID,
ParseType: &parseType,
- }, permission.Subject{UserID: "member-1", TenantID: "tenant-1"})
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -398,9 +393,9 @@ func TestCreateDatasetRejectsUserWithoutTenantMembership(t *testing.T) {
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "outsider", "tenant-1"), &service.CreateDatasetRequest{
Name: "unauthorized-dataset",
- }, permission.Subject{UserID: "outsider", TenantID: "tenant-1"})
+ })
if err == nil || code != common.CodeForbidden || err.Error() != "Permission denied" {
t.Fatalf("CreateDataset = (code=%d, err=%v), want forbidden for missing tenant membership", code, err)
}
@@ -421,7 +416,7 @@ func TestCreateDataset_RejectsInvalidEmbeddingModel(t *testing.T) {
{"whitespace_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")
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
db := setupServiceTestDB(t)
@@ -433,7 +428,7 @@ func TestCreateDataset_RejectsInvalidEmbeddingModel(t *testing.T) {
ParserID: sptr("general"),
ParseType: iptr(1),
EmbeddingModel: &tc.embeddingModel,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected embedding model validation error")
}
@@ -474,9 +469,9 @@ func TestCreateDataset_ExplicitEmbeddingDoesNotResolveInvalidDefault(t *testing.
}
embeddingModel := "embedding-test@default@OpenAI"
- result, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ result, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "explicit-embedding", ParserID: sptr("general"), ParseType: iptr(1), EmbeddingModel: &embeddingModel,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset with explicit embedding = %v, want success", err)
}
@@ -492,7 +487,7 @@ func TestCreateDataset_SetsExplicitLanguage(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
language := " Chinese "
result, code, err := testDatasetCreateService(t).CreateDataset(ctx, &service.CreateDatasetRequest{
@@ -500,7 +495,7 @@ func TestCreateDataset_SetsExplicitLanguage(t *testing.T) {
Language: &language,
ParserID: sptr("general"),
ParseType: iptr(1),
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
@@ -516,7 +511,7 @@ func TestCreateDataset_OmittedLanguageKeepsDefault(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
// An omitted language must stay unset on the insert so the column default
// applies, mirroring the Python service dropping a None language.
@@ -524,7 +519,7 @@ func TestCreateDataset_OmittedLanguageKeepsDefault(t *testing.T) {
Name: "ds-no-language",
ParserID: sptr("general"),
ParseType: iptr(1),
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
@@ -551,12 +546,12 @@ func TestCreateDataset_RejectsBlankLanguage(t *testing.T) {
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-blank-language",
Language: &language,
ParserID: sptr("general"),
ParseType: iptr(1),
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected language validation error")
}
@@ -579,14 +574,14 @@ func TestCreateDataset_LanguageLimitCountsCharacters(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
result, code, err := testDatasetCreateService(t).CreateDataset(ctx, &service.CreateDatasetRequest{
Name: "ds-language-at-limit",
Language: &atLimit,
ParserID: sptr("general"),
ParseType: iptr(1),
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed for a %d-character language: %v", datasetLanguageLimit, err)
}
@@ -602,7 +597,7 @@ func TestCreateDataset_LanguageLimitCountsCharacters(t *testing.T) {
Language: &overLimit,
ParserID: sptr("general"),
ParseType: iptr(1),
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected language length validation error")
}
diff --git a/internal/service/dataset/crud.go b/internal/service/dataset/crud.go
index 449fdeabd0..002f11bd15 100644
--- a/internal/service/dataset/crud.go
+++ b/internal/service/dataset/crud.go
@@ -50,9 +50,12 @@ func resolvePipelineVersionID(ctx context.Context, db *gorm.DB, pipelineID *stri
return nil, nil
}
-func (d *DatasetService) CreateDataset(ctx context.Context, req *service.CreateDatasetRequest, subject permission.Subject) (map[string]interface{}, common.ErrorCode, error) {
- tenantID := strings.TrimSpace(subject.TenantID)
- userID := strings.TrimSpace(subject.UserID)
+func (d *DatasetService) CreateDataset(ctx context.Context, req *service.CreateDatasetRequest) (map[string]interface{}, common.ErrorCode, error) {
+ userID := strings.TrimSpace(permission.UserIDFromContext(ctx))
+ tenantID := strings.TrimSpace(permission.TenantIDFromContext(ctx))
+ if tenantID == "" {
+ tenantID = userID
+ }
if tenantID == "" || userID == "" {
return nil, common.CodeUnauthorized, errors.New("user id and tenant id are required")
}
@@ -72,11 +75,11 @@ func (d *DatasetService) CreateDataset(ctx context.Context, req *service.CreateD
if err != nil || tenant == nil {
return nil, common.CodeDataError, errors.New("tenant not found")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, subject, tenantID, permission.TenantMember); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, subject, "dataset", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "dataset", permission.ActionWrite); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -145,7 +148,7 @@ func (d *DatasetService) CreateDataset(ctx context.Context, req *service.CreateD
}
if pipelineID != nil && strings.TrimSpace(*pipelineID) != "" {
- if ok, err := canvasAccessibleForUser(ctx, subject, strings.TrimSpace(*pipelineID)); err != nil {
+ if ok, err := canvasAccessibleForUser(ctx, strings.TrimSpace(*pipelineID)); err != nil {
return nil, common.CodeServerError, err
} else if !ok {
return nil, common.CodeDataError, errors.New("canvas is not accessible")
@@ -296,7 +299,7 @@ func (d *DatasetService) CreateDataset(ctx context.Context, req *service.CreateD
if err := d.kbDAO.Create(ctx, tx, kb); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID})
}); err != nil {
if dao.IsDuplicateKeyErr(err) {
return nil, common.CodeDataError, fmt.Errorf("dataset name '%s' already exists", name)
@@ -339,7 +342,7 @@ func (d *DatasetService) GetDataset(ctx context.Context, datasetID, userID strin
}
datasetID = normalizedID
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.NormalizeHidden(err)
return nil, code, permissionErr
}
@@ -351,7 +354,7 @@ func (d *DatasetService) GetDataset(ctx context.Context, datasetID, userID strin
}
data := datasetToMap(ctx, kb)
- access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDataset,
ID: kb.ID,
})
@@ -376,10 +379,13 @@ func (d *DatasetService) GetDataset(ctx context.Context, datasetID, userID strin
return data, common.CodeSuccess, nil
}
-func (d *DatasetService) DeleteDatasets(ctx context.Context, ids []string, deleteAll bool, subject permission.Subject) (map[string]interface{}, common.ErrorCode, error) {
- subject.UserID = strings.TrimSpace(subject.UserID)
- subject.TenantID = strings.TrimSpace(subject.TenantID)
- if subject.UserID == "" {
+func (d *DatasetService) DeleteDatasets(ctx context.Context, ids []string, deleteAll bool) (map[string]interface{}, common.ErrorCode, error) {
+ userID := strings.TrimSpace(permission.UserIDFromContext(ctx))
+ tenantID := strings.TrimSpace(permission.TenantIDFromContext(ctx))
+ if tenantID == "" {
+ tenantID = userID
+ }
+ if userID == "" {
return nil, common.CodeUnauthorized, errors.New("user id is required")
}
@@ -403,14 +409,14 @@ func (d *DatasetService) DeleteDatasets(ctx context.Context, ids []string, delet
if !deleteAll {
return map[string]interface{}{"deleted": []string{}}, common.CodeSuccess, nil
}
- if subject.TenantID == "" {
+ if tenantID == "" {
return nil, common.CodeUnauthorized, errors.New("tenant id is required to delete all datasets")
}
- if err := checker.CheckTenant(ctx, subject, subject.TenantID, permission.TenantOwner); err != nil {
+ if err := checker.CheckTenant(ctx, tenantID, permission.TenantOwner); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
- kbs, err := d.kbDAO.Query(ctx, dao.DB, map[string]interface{}{"tenant_id": subject.TenantID})
+ kbs, err := d.kbDAO.Query(ctx, dao.DB, map[string]interface{}{"tenant_id": tenantID})
if err != nil {
return nil, common.CodeServerError, errors.New("database operation failed")
}
@@ -423,7 +429,7 @@ func (d *DatasetService) DeleteDatasets(ctx context.Context, ids []string, delet
for _, id := range normalizedIDs {
refs = append(refs, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: id})
}
- accessible, err := checker.FilterResources(ctx, subject, refs, permission.OperationDelete)
+ accessible, err := checker.FilterResources(ctx, refs, permission.OperationDelete)
if err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
@@ -629,7 +635,6 @@ func (d *DatasetService) ListDatasets(ctx context.Context, id, name string, page
operatorPermissions := make(map[string]int32)
err := dao.DB.Transaction(func(tx *gorm.DB) error {
checker := permission.NewDatabaseChecker(tx)
- subject := permission.Subject{UserID: userID}
operation := permission.OperationRead
var entry *permission.ResourceRef
if canvasID != "" {
@@ -639,9 +644,9 @@ func (d *DatasetService) ListDatasets(ctx context.Context, id, name string, page
checkAccess := func(datasetID string) error {
dependency := permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}
if entry == nil {
- return checker.CheckResource(ctx, subject, dependency, operation)
+ return checker.CheckResource(ctx, dependency, operation)
}
- return checker.CheckDependency(ctx, subject, *entry, dependency, permission.OperationRun, operation)
+ return checker.CheckDependency(ctx, *entry, dependency, permission.OperationRun, operation)
}
listQuery := tx.WithContext(ctx).Model(&entity.Knowledgebase{})
var resourceIDs []string
@@ -680,7 +685,7 @@ func (d *DatasetService) ListDatasets(ctx context.Context, id, name string, page
scopeQuery.Entry = entry
scopeQuery.EntryOp = permission.OperationRun
}
- scope, checkErr := checker.QueryScope(ctx, subject, scopeQuery)
+ scope, checkErr := checker.QueryScope(ctx, scopeQuery)
if checkErr != nil {
return checkErr
}
@@ -695,7 +700,7 @@ func (d *DatasetService) ListDatasets(ctx context.Context, id, name string, page
if kb == nil {
continue
}
- access, accessErr := checker.ResolveAccess(ctx, subject, permission.ResourceRef{
+ access, accessErr := checker.ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDataset,
ID: kb.ID,
})
@@ -754,7 +759,7 @@ func (d *DatasetService) ListDatasetFilters(ctx context.Context, userID, canvasI
query.Entry = &permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}
query.EntryOp = permission.OperationRun
}
- scope, err := permission.NewDatabaseChecker(tx).Scope(ctx, permission.Subject{UserID: userID}, query)
+ scope, err := permission.NewDatabaseChecker(tx).Scope(ctx, query)
if err != nil {
return err
}
diff --git a/internal/service/dataset/embedding.go b/internal/service/dataset/embedding.go
index fb2bb1c9a2..2d577de11b 100644
--- a/internal/service/dataset/embedding.go
+++ b/internal/service/dataset/embedding.go
@@ -41,7 +41,7 @@ func (d *DatasetService) CheckEmbedding(ctx context.Context, userID, datasetID s
if datasetID == "" {
return nil, common.CodeDataError, errors.New(`lack of "Dataset ID"`)
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
diff --git a/internal/service/dataset/empty_version_test.go b/internal/service/dataset/empty_version_test.go
index 3854eed2a1..de16938ced 100644
--- a/internal/service/dataset/empty_version_test.go
+++ b/internal/service/dataset/empty_version_test.go
@@ -18,7 +18,7 @@ func TestCreateDataset_EmptyVersionRejected(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
canvasID := "0123456789abcdef0123456789abcdef"
seedDataflowCanvas(t, db, canvasID)
@@ -30,7 +30,7 @@ func TestCreateDataset_EmptyVersionRejected(t *testing.T) {
PipelineID: &canvasID,
ParseType: &parseType,
// PipelineVersionID omitted on purpose (empty version)
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatalf("expected rejection of empty pipeline version, got result=%v code=%d", result, code)
}
@@ -55,7 +55,7 @@ func TestCreateDataset_ExplicitEmptyVersionStringRejected(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
canvasID := "0123456789abcdef0123456789abcdef"
seedDataflowCanvas(t, db, canvasID)
@@ -68,7 +68,7 @@ func TestCreateDataset_ExplicitEmptyVersionStringRejected(t *testing.T) {
PipelineID: &canvasID,
PipelineVersionID: &empty,
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil || code == common.CodeSuccess {
t.Fatalf("expected rejection of explicit empty version, got code=%d err=%v", code, err)
}
@@ -83,7 +83,7 @@ func TestCreateDataset_BuiltinEmptyVersionAllowed(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
parseType := 1
general := "general"
@@ -91,7 +91,7 @@ func TestCreateDataset_BuiltinEmptyVersionAllowed(t *testing.T) {
Name: "ds-builtin-no-version",
ParserID: &general,
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("expected BuiltIn create without version to succeed, got code=%d err=%v", code, err)
}
diff --git a/internal/service/dataset/helpers.go b/internal/service/dataset/helpers.go
index ce8f1d0721..58db80de31 100644
--- a/internal/service/dataset/helpers.go
+++ b/internal/service/dataset/helpers.go
@@ -300,8 +300,8 @@ func pythonStringListRepr(items []string) string {
return "[" + strings.Join(quoted, ", ") + "]"
}
-func canvasAccessibleForUser(ctx context.Context, subject permission.Subject, canvasID string) (bool, error) {
- err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationUse)
+func canvasAccessibleForUser(ctx context.Context, canvasID string) (bool, error) {
+ err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}, permission.OperationUse)
if errors.Is(err, permission.ErrResourceNotFound) || errors.Is(err, permission.ErrPermissionDenied) {
return false, nil
}
diff --git a/internal/service/dataset/ingestion.go b/internal/service/dataset/ingestion.go
index 59d7a46588..1e7424ea2e 100644
--- a/internal/service/dataset/ingestion.go
+++ b/internal/service/dataset/ingestion.go
@@ -48,7 +48,7 @@ func (d *DatasetService) GetIngestionSummary(ctx context.Context, datasetID, use
if datasetID == "" {
return nil, common.CodeDataError, errors.New(`lack of "Dataset ID"`)
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -171,7 +171,7 @@ func (d *DatasetService) ListIngestionMessages(ctx context.Context, datasetID, u
if limit < 0 || limit > maxIngestionMessagesLimit {
return nil, common.CodeArgumentError, fmt.Errorf("limit must be between 1 and %d", maxIngestionMessagesLimit)
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -233,7 +233,7 @@ func (d *DatasetService) ListSyncLogs(ctx context.Context, datasetID, userID str
if datasetID == "" {
return nil, common.CodeDataError, errors.New(`lack of "Dataset ID"`)
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -250,11 +250,10 @@ func (d *DatasetService) ListSyncLogs(ctx context.Context, datasetID, userID str
return nil, common.CodeServerError, fmt.Errorf("list dataset connectors for sync logs: %w", err)
}
checker := permission.NewDatabaseChecker(dao.DB)
- subject := permission.Subject{UserID: userID}
taskIDs := make([]string, 0)
for _, connector := range connectors {
connectorRef := permission.ResourceRef{Kind: permission.ResourceKindConnector, ID: connector.ID}
- scope, scopeErr := checker.Scope(ctx, subject, permission.ScopeQuery{
+ scope, scopeErr := checker.Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindSyncTask,
Parent: connectorRef,
Operation: permission.OperationRead,
@@ -292,7 +291,7 @@ func (d *DatasetService) ListIngestionLogs(ctx context.Context, datasetID, userI
if datasetID == "" {
return nil, common.CodeDataError, errors.New(`lack of "Dataset ID"`)
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -357,7 +356,7 @@ func (d *DatasetService) GetIngestionLog(ctx context.Context, datasetID, userID,
if logID == "" {
return nil, common.CodeDataError, errors.New(`lack of "Log ID"`)
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
diff --git a/internal/service/dataset/ingestion_messages_test.go b/internal/service/dataset/ingestion_messages_test.go
index 35dbbd9bd6..7347c4756b 100644
--- a/internal/service/dataset/ingestion_messages_test.go
+++ b/internal/service/dataset/ingestion_messages_test.go
@@ -151,13 +151,11 @@ func TestListSyncLogsReturnsOnlyCurrentlyLinkedDatasetConnectors(t *testing.T) {
}
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 {
+ if err := checker.CheckResource(ctx, 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"},
+ if err := checker.CheckDependency(ctx, 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)
diff --git a/internal/service/dataset/metadata.go b/internal/service/dataset/metadata.go
index ecc46d857b..9e8ce56b02 100644
--- a/internal/service/dataset/metadata.go
+++ b/internal/service/dataset/metadata.go
@@ -18,7 +18,7 @@ import (
func (d *DatasetService) UpdateDocumentMetadataConfig(ctx context.Context, userID, datasetID, documentID string, req map[string]interface{}) (*entity.Document, common.ErrorCode, error) {
userID = strings.TrimSpace(userID)
datasetID = strings.TrimSpace(datasetID)
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUpdate); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -72,7 +72,7 @@ func (d *DatasetService) UpdateDocumentMetadataConfig(ctx context.Context, userI
func (d *DatasetService) GetMetadataConfig(ctx context.Context, datasetID, userID string) (map[string]interface{}, common.ErrorCode, error) {
datasetID = strings.TrimSpace(datasetID)
userID = strings.TrimSpace(userID)
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -104,7 +104,7 @@ func (d *DatasetService) UpdateMetadataConfig(ctx context.Context, datasetID, us
datasetID = strings.TrimSpace(datasetID)
userID = strings.TrimSpace(userID)
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUpdate); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
diff --git a/internal/service/dataset/parse_type_required_test.go b/internal/service/dataset/parse_type_required_test.go
index d0545de845..cfc89d2564 100644
--- a/internal/service/dataset/parse_type_required_test.go
+++ b/internal/service/dataset/parse_type_required_test.go
@@ -18,9 +18,9 @@ func TestCreateDataset_RequiresParseType(t *testing.T) {
// No parse_type, no parser_id, no pipeline_id. The previous code silently
// defaulted to BuiltIn; now this must be rejected.
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-no-parse-type",
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected parse_type required error")
}
@@ -38,10 +38,10 @@ func TestCreateDataset_BuiltinRequiresParserID(t *testing.T) {
insertCreateDatasetTenant(t, "tenant-1")
parseType := 1
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-builtin-no-parser",
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected parser_id required error for BuiltIn mode")
}
@@ -59,10 +59,10 @@ func TestCreateDataset_PipelineRequiresPipelineID(t *testing.T) {
insertCreateDatasetTenant(t, "tenant-1")
parseType := 2
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-pipeline-no-id",
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected pipeline_id required error for Pipeline mode")
}
@@ -80,10 +80,10 @@ func TestCreateDataset_RejectsInvalidParseType(t *testing.T) {
insertCreateDatasetTenant(t, "tenant-1")
parseType := 3
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-bad-parse-type",
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil {
t.Fatal("expected invalid parse_type error")
}
@@ -102,11 +102,11 @@ func TestCreateDataset_BuiltinSucceedsWithParseType(t *testing.T) {
parseType := 1
parserID := "general"
- result, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{
+ result, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{
Name: "ds-builtin-ok",
ParseType: &parseType,
ParserID: &parserID,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil {
t.Fatalf("CreateDataset failed: %v", err)
}
diff --git a/internal/service/dataset/pipeline_version_binding_test.go b/internal/service/dataset/pipeline_version_binding_test.go
index 0ec6626ba6..336d8b59c7 100644
--- a/internal/service/dataset/pipeline_version_binding_test.go
+++ b/internal/service/dataset/pipeline_version_binding_test.go
@@ -84,7 +84,7 @@ func TestCreateDataset_BindsLatestPipelineVersion(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
canvasID := "0123456789abcdef0123456789abcdef"
versionID := "version0000000000000000000000aa"
@@ -99,7 +99,7 @@ func TestCreateDataset_BindsLatestPipelineVersion(t *testing.T) {
PipelineID: &canvasID,
PipelineVersionID: &versionID,
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -117,7 +117,7 @@ func TestCreateDataset_BuiltInHasNoPipelineVersion(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
parseType := 1
parserID := "general"
@@ -125,7 +125,7 @@ func TestCreateDataset_BuiltInHasNoPipelineVersion(t *testing.T) {
Name: "ds-builtin",
ParserID: &parserID,
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -276,7 +276,7 @@ func TestCreateDataset_BindsExplicitPipelineVersion(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
canvasID := "0123456789abcdef0123456789abcdef"
verOld := "version0000000000000000000000aa"
@@ -291,7 +291,7 @@ func TestCreateDataset_BindsExplicitPipelineVersion(t *testing.T) {
PipelineID: &canvasID,
PipelineVersionID: &verOld, // explicitly pin the older version
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%d", err, code)
}
@@ -310,7 +310,7 @@ func TestCreateDataset_RejectsForeignPipelineVersion(t *testing.T) {
db := setupServiceTestDB(t)
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
- ctx := t.Context()
+ ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
canvas1 := "0123456789abcdef0123456789abcdef"
canvas2 := "fedcba9876543210fedcba9876543210"
@@ -327,7 +327,7 @@ func TestCreateDataset_RejectsForeignPipelineVersion(t *testing.T) {
PipelineID: &canvas1,
PipelineVersionID: &verForeign, // belongs to canvas2
ParseType: &parseType,
- }, testDatasetSubject("tenant-1"))
+ })
if err == nil && code == common.CodeSuccess {
t.Fatalf("expected rejection of foreign pipeline version, got success")
}
diff --git a/internal/service/dataset/sdk_contract_test.go b/internal/service/dataset/sdk_contract_test.go
index 6e7f688cdf..6dad8f9760 100644
--- a/internal/service/dataset/sdk_contract_test.go
+++ b/internal/service/dataset/sdk_contract_test.go
@@ -29,7 +29,7 @@ func TestSDKDatasetUnicodeCharacterLimit(t *testing.T) {
pushServiceDB(t, db)
insertCreateDatasetTenant(t, "tenant-1")
name := strings.Repeat("数", n)
- _, code, err := testDatasetCreateService(t).CreateDataset(t.Context(), &service.CreateDatasetRequest{Name: name, ParseType: new(1), ParserID: new("general")}, testDatasetSubject("tenant-1"))
+ _, code, err := testDatasetCreateService(t).CreateDataset(withDatasetTestContext(t.Context(), "tenant-1", "tenant-1"), &service.CreateDatasetRequest{Name: name, ParseType: new(1), ParserID: new("general")})
if (err == nil) != (n == 128) {
t.Fatalf("create characters=%d code=%d err=%v", n, code, err)
}
diff --git a/internal/service/dataset/search.go b/internal/service/dataset/search.go
index 0dcf433c44..468c4fbc13 100644
--- a/internal/service/dataset/search.go
+++ b/internal/service/dataset/search.go
@@ -117,7 +117,7 @@ func (d *DatasetService) SearchDatasets(ctx context.Context, req *service.Search
var kbRecords []*entity.Knowledgebase
seenTenants := make(map[string]bool)
for _, datasetID := range datasetIDs {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationUse); err != nil {
common.Warn("SearchDatasets access denied", zap.String("datasetID", datasetID), zap.String("userID", userID))
_, permissionErr := permissionresponse.Normalize(err)
return nil, permissionErr
diff --git a/internal/service/dataset/setup_test.go b/internal/service/dataset/setup_test.go
index 6c360f13d0..f3c73dcb7a 100644
--- a/internal/service/dataset/setup_test.go
+++ b/internal/service/dataset/setup_test.go
@@ -99,7 +99,7 @@ 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})
+ return permission.WithIdentity(ctx, userID, tenantID)
}
func sptr(s string) *string { return &s }
diff --git a/internal/service/dataset/tags.go b/internal/service/dataset/tags.go
index c221377f9c..d514ee5c75 100644
--- a/internal/service/dataset/tags.go
+++ b/internal/service/dataset/tags.go
@@ -70,7 +70,7 @@ func (d *DatasetService) AggregateTags(ctx context.Context, datasetIDs []string,
}
authorized := make([]authorizedDataset, 0, len(orderedIDs))
for _, datasetID := range orderedIDs {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationRead); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
diff --git a/internal/service/dataset/update.go b/internal/service/dataset/update.go
index 6e03cd2d58..d8449c8177 100644
--- a/internal/service/dataset/update.go
+++ b/internal/service/dataset/update.go
@@ -200,7 +200,6 @@ func (d *DatasetService) UpdateDataset(ctx context.Context, datasetID, userID st
if isPipeline && effectivePipelineID != nil && strings.TrimSpace(*effectivePipelineID) != "" {
accessErr := permission.NewLockingDatabaseChecker(tx).CheckDependency(
ctx,
- permission.Subject{UserID: userID, TenantID: lockedKB.TenantID},
permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: lockedKB.ID},
permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: strings.TrimSpace(*effectivePipelineID)},
permission.OperationUpdate,
@@ -221,7 +220,6 @@ func (d *DatasetService) UpdateDataset(ctx context.Context, datasetID, userID st
if permissionValue != lockedKB.Permission {
accessErr := permission.NewLockingDatabaseChecker(tx).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID},
permission.OperationShare,
)
@@ -564,7 +562,6 @@ func (d *DatasetService) lockAccessibleDatasetForUpdate(ctx context.Context, tx
err = permission.NewLockingDatabaseChecker(tx).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID},
permission.OperationUpdate,
)
diff --git a/internal/service/dataset/update_test.go b/internal/service/dataset/update_test.go
index 19ec23f2bc..7dc0945eed 100644
--- a/internal/service/dataset/update_test.go
+++ b/internal/service/dataset/update_test.go
@@ -25,7 +25,6 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
- "ragflow/internal/permission"
"ragflow/internal/service"
"gorm.io/gorm"
@@ -986,7 +985,7 @@ func TestDatasetServiceDeleteDatasetsRejectsUnauthorizedID(t *testing.T) {
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"})
+ _, code, err := svc.DeleteDatasets(ctx, []string{normalizedID}, false)
if err == nil {
t.Fatal("expected unauthorized error")
}
@@ -1004,7 +1003,7 @@ func TestDatasetServiceDeleteDatasetsRejectsAllUnauthorized(t *testing.T) {
ctx := withDatasetTestContext(t.Context(), "tenant-1", "tenant-1")
svc := NewDatasetService()
- _, code, err := svc.DeleteDatasets(ctx, []string{"d94a8dc02c9711f0930f7fbc369eab6d"}, false, testDatasetSubject("tenant-1"))
+ _, code, err := svc.DeleteDatasets(ctx, []string{"d94a8dc02c9711f0930f7fbc369eab6d"}, false)
if err == nil {
t.Fatal("expected unauthorized error")
}
@@ -1023,7 +1022,7 @@ func TestDatasetServiceDeleteAllDatasetsRequiresTenantOwner(t *testing.T) {
insertDatasetUpdateTeamMember(t, "member-1", "tenant-1")
_, code, err := NewDatasetService().DeleteDatasets(
- withDatasetTestContext(t.Context(), "member-1", "tenant-1"), nil, true, permission.Subject{UserID: "member-1", TenantID: "tenant-1"},
+ withDatasetTestContext(t.Context(), "member-1", "tenant-1"), nil, true,
)
if err == nil {
t.Fatal("expected delete-all to be denied for a non-owner tenant member")
diff --git a/internal/service/document/document_apply_parser_config.go b/internal/service/document/document_apply_parser_config.go
index 1aa3725eeb..057b6e995a 100644
--- a/internal/service/document/document_apply_parser_config.go
+++ b/internal/service/document/document_apply_parser_config.go
@@ -48,15 +48,14 @@ func (s *DocumentService) ApplyDatasetParserConfig(ctx context.Context, userID,
return err
}
checker := permission.NewDatabaseChecker(tx)
- subject := permission.Subject{UserID: userID, TenantID: kb.TenantID}
ref := permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}
- if err := checker.CheckResource(ctx, subject, ref, permission.OperationUpdate); err != nil {
+ if err := checker.CheckResource(ctx, ref, permission.OperationUpdate); err != nil {
var normalized error
code, normalized = permissionresponse.NormalizeHidden(err)
return normalized
}
if kb.PipelineID != nil && strings.TrimSpace(*kb.PipelineID) != "" {
- if err := checker.CheckDependency(ctx, subject, ref,
+ if err := checker.CheckDependency(ctx, ref,
permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: *kb.PipelineID},
permission.OperationUpdate, permission.OperationUse); err != nil {
var normalized error
diff --git a/internal/service/document/document_applykb_chain_test.go b/internal/service/document/document_applykb_chain_test.go
index 664289761d..1b9cd46689 100644
--- a/internal/service/document/document_applykb_chain_test.go
+++ b/internal/service/document/document_applykb_chain_test.go
@@ -23,7 +23,6 @@ import (
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
- "ragflow/internal/permission"
"ragflow/internal/service"
datasetsvc "ragflow/internal/service/dataset"
)
@@ -336,7 +335,7 @@ func TestIngest_ApplyKB_RealCreatedDatasetChain(t *testing.T) {
},
},
},
- }, permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ })
if err != nil || code != common.CodeSuccess {
t.Fatalf("CreateDataset err=%v code=%v", err, code)
}
diff --git a/internal/service/document/document_artifact.go b/internal/service/document/document_artifact.go
index 0ecde2a717..097406b7e5 100644
--- a/internal/service/document/document_artifact.go
+++ b/internal/service/document/document_artifact.go
@@ -43,7 +43,7 @@ func (s *DocumentService) GetDocumentImage(ctx context.Context, userID, imageID
// composite image ID belongs to an indexed chunk of an accessible document.
func (s *DocumentService) GetDocumentImageForDocument(ctx context.Context, userID, docID, imageID string) ([]byte, error) {
doc, err := s.documentDAO.GetByID(ctx, dao.DB, docID)
- if err != nil || doc == nil || service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, doc.ID, doc.KbID, permission.OperationRead) != nil {
+ if err != nil || doc == nil || service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationRead) != nil {
return nil, ErrDocumentImageNotFound
}
bucket, objectKey, ok := strings.Cut(imageID, "-")
@@ -69,9 +69,9 @@ func (s *DocumentService) GetDocumentImageForDocument(ctx context.Context, userI
// GetDocumentThumbnail resolves the storage key exclusively from authorized
// document metadata.
-func (s *DocumentService) GetDocumentThumbnail(ctx context.Context, userID, docID string) ([]byte, error) {
+func (s *DocumentService) GetDocumentThumbnail(ctx context.Context, docID string) ([]byte, error) {
doc, err := s.documentDAO.GetByID(ctx, dao.DB, docID)
- if err != nil || doc == nil || service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, doc.ID, doc.KbID, permission.OperationRead) != nil || doc.Thumbnail == nil || *doc.Thumbnail == "" || strings.HasPrefix(*doc.Thumbnail, imgBase64Prefix) {
+ if err != nil || doc == nil || service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationRead) != nil || doc.Thumbnail == nil || *doc.Thumbnail == "" || strings.HasPrefix(*doc.Thumbnail, imgBase64Prefix) {
return nil, ErrDocumentImageNotFound
}
storageImpl := storage.GetStorageFactory().GetStorage()
@@ -235,7 +235,7 @@ func (s *DocumentService) sandboxArtifactAccessible(ctx context.Context, filenam
return false
}
for _, dialogID := range s.sandboxArtifactDialogIDsForUser(ctx, filename, userID) {
- if permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: dialogID}, permission.OperationRead) == nil {
+ if permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: dialogID}, permission.OperationRead) == nil {
return true
}
}
@@ -261,7 +261,7 @@ func shouldForceArtifactAttachment(ext, contentType string) bool {
return ok
}
-func (s *DocumentService) GetDocumentPreview(ctx context.Context, userID, docID string) (*DocumentPreview, error) {
+func (s *DocumentService) GetDocumentPreview(ctx context.Context, docID string) (*DocumentPreview, error) {
doc, err := s.documentDAO.GetByID(ctx, dao.DB, docID)
if err != nil || doc == nil {
return nil, ErrPreviewDocumentNotFound
@@ -269,7 +269,7 @@ func (s *DocumentService) GetDocumentPreview(ctx context.Context, userID, docID
// Keep access denial indistinguishable from a missing document so callers
// cannot probe document IDs.
- if service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, doc.ID, doc.KbID, permission.OperationRead) != nil {
+ if service.CheckDocumentAccess(ctx, doc.ID, doc.KbID, permission.OperationRead) != nil {
return nil, ErrPreviewDocumentNotFound
}
diff --git a/internal/service/document/document_crud.go b/internal/service/document/document_crud.go
index c78220b1b3..96812af2d4 100644
--- a/internal/service/document/document_crud.go
+++ b/internal/service/document/document_crud.go
@@ -220,7 +220,7 @@ func (s *DocumentService) DeleteDocuments(ctx context.Context, ids []string, del
// Deleting the entire dataset requires dataset-level access; deleting
// explicit documents also accepts direct document grants.
if deleteAll {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationDeleteContent); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationDeleteContent); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return 0, permissionErr
}
@@ -233,7 +233,7 @@ func (s *DocumentService) DeleteDocuments(ctx context.Context, ids []string, del
if len(ids) == 0 {
return 0, nil
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationDeleteContent); err != nil &&
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: datasetID}, permission.OperationDeleteContent); err != nil &&
!errors.Is(err, permission.ErrPermissionDenied) && !errors.Is(err, permission.ErrMembershipNotFound) {
_, permissionErr := permissionresponse.Normalize(err)
return 0, permissionErr
@@ -249,7 +249,7 @@ func (s *DocumentService) DeleteDocuments(ctx context.Context, ids []string, del
return 0, err
}
for _, doc := range documents {
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, doc.ID, datasetID, permission.OperationDeleteContent); err != nil {
+ if err := service.CheckDocumentAccess(ctx, doc.ID, datasetID, permission.OperationDeleteContent); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return 0, permissionErr
}
diff --git a/internal/service/document/document_dataset_update.go b/internal/service/document/document_dataset_update.go
index 1f3fc4074d..4fa1ad7a3d 100644
--- a/internal/service/document/document_dataset_update.go
+++ b/internal/service/document/document_dataset_update.go
@@ -53,7 +53,7 @@ func (s *DocumentService) BatchUpdateDocumentStatus(ctx context.Context, userID,
hasError = true
continue
}
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, doc.ID, datasetID, permission.OperationUpdate); err != nil {
+ if err := service.CheckDocumentAccess(ctx, doc.ID, datasetID, permission.OperationUpdate); err != nil {
result[docID] = map[string]string{"error": "Permission denied"}
if permissionresponse.IsPermissionError(err) {
permissionDenied = err
@@ -139,7 +139,7 @@ func (s *DocumentService) BatchUpdateDocumentStatus(ctx context.Context, userID,
}
func (s *DocumentService) UpdateDatasetDocument(ctx context.Context, userID, datasetID, documentID string, req *UpdateDatasetDocumentRequest, present map[string]bool) (*UpdateDatasetDocumentResponse, common.ErrorCode, error) {
- if err := service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, documentID, datasetID, permission.OperationUpdate); err != nil {
+ if err := service.CheckDocumentAccess(ctx, documentID, datasetID, permission.OperationUpdate); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return nil, code, permissionErr
}
@@ -246,7 +246,6 @@ func (s *DocumentService) UpdateDatasetDocument(ctx context.Context, userID, dat
if (sel != nil || present["parser_config"]) && isPipeline && effPipelineID != nil && strings.TrimSpace(*effPipelineID) != "" {
accessErr := permission.NewDatabaseChecker(dao.DB).CheckDependency(
ctx,
- permission.Subject{UserID: userID, TenantID: kb.TenantID},
permission.ResourceRef{Kind: permission.ResourceKindDocument, ID: doc.ID},
permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: strings.TrimSpace(*effPipelineID)},
permission.OperationUpdate,
diff --git a/internal/service/document/document_ingest.go b/internal/service/document/document_ingest.go
index 8f1c927690..b6d0aeafaf 100644
--- a/internal/service/document/document_ingest.go
+++ b/internal/service/document/document_ingest.go
@@ -66,7 +66,7 @@ func (s *DocumentService) Ingest(ctx context.Context, userID string, req *Ingest
if err != nil {
return common.CodeDataError, fmt.Errorf("dataset not found")
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID}, permission.OperationRun); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID}, permission.OperationRun); err != nil {
code, permissionErr := permissionresponse.Normalize(err)
return code, permissionErr
}
diff --git a/internal/service/document/document_list.go b/internal/service/document/document_list.go
index 79ab143731..551fdcabbb 100644
--- a/internal/service/document/document_list.go
+++ b/internal/service/document/document_list.go
@@ -151,7 +151,7 @@ func (s *DocumentService) GetThumbnails(ctx context.Context, userID string, docI
result := make(map[string]string, len(documents))
for _, document := range documents {
- if document == nil || service.CheckDocumentAccess(ctx, permission.Subject{UserID: userID}, document.ID, document.KbID, permission.OperationRead) != nil {
+ if document == nil || service.CheckDocumentAccess(ctx, document.ID, document.KbID, permission.OperationRead) != nil {
continue
}
diff --git a/internal/service/document/document_test.go b/internal/service/document/document_test.go
index c66786c1dc..a14633ab61 100644
--- a/internal/service/document/document_test.go
+++ b/internal/service/document/document_test.go
@@ -55,15 +55,15 @@ type recordingTaskPublisher struct {
}
func documentTestContext(ctx context.Context) context.Context {
- return permission.WithSubject(ctx, permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ return permission.WithIdentity(ctx, "user-1", "tenant-1")
}
func documentTestContextFor(ctx context.Context, tenantID string) context.Context {
- return permission.WithSubject(ctx, permission.Subject{UserID: tenantID, TenantID: tenantID})
+ return permission.WithIdentity(ctx, tenantID, tenantID)
}
func documentTestActorContext(ctx context.Context, userID, tenantID string) context.Context {
- return permission.WithSubject(ctx, permission.Subject{UserID: userID, TenantID: tenantID})
+ return permission.WithIdentity(ctx, userID, tenantID)
}
type runningTaskPublisher struct {
@@ -2886,7 +2886,7 @@ func TestGetDocumentPreview_DocumentNotFound(t *testing.T) {
svc := testDocumentService(t)
ctx := t.Context()
- _, err := svc.GetDocumentPreview(ctx, "user-1", "nonexistent")
+ _, err := svc.GetDocumentPreview(ctx, "nonexistent")
if !errors.Is(err, ErrPreviewDocumentNotFound) {
t.Errorf("expected ErrPreviewDocumentNotFound, got %v", err)
}
@@ -2936,7 +2936,7 @@ func TestGetDocumentPreview_AccessControl(t *testing.T) {
ctx := documentTestContext(t.Context())
// Dataset owner reads the original file.
- p, err := svc.GetDocumentPreview(ctx, "user-1", "doc-prev")
+ p, err := svc.GetDocumentPreview(ctx, "doc-prev")
if err != nil {
t.Fatalf("owner preview: %v", err)
}
@@ -2947,13 +2947,13 @@ func TestGetDocumentPreview_AccessControl(t *testing.T) {
// A member of the dataset's tenant reads it too.
seedDocumentPreviewMemberAccess(t, db)
memberCtx := documentTestActorContext(t.Context(), "user-2", "tenant-1")
- if _, err = svc.GetDocumentPreview(memberCtx, "user-2", "doc-prev"); err != nil {
+ if _, err = svc.GetDocumentPreview(memberCtx, "doc-prev"); err != nil {
t.Fatalf("team member preview: %v", err)
}
// An unrelated user gets the same answer as for a missing document.
strangerCtx := documentTestActorContext(t.Context(), "user-3", "tenant-1")
- _, err = svc.GetDocumentPreview(strangerCtx, "user-3", "doc-prev")
+ _, err = svc.GetDocumentPreview(strangerCtx, "doc-prev")
if !errors.Is(err, ErrPreviewDocumentNotFound) {
t.Fatalf("stranger preview: expected ErrPreviewDocumentNotFound, got %v", err)
}
@@ -2969,10 +2969,10 @@ func TestGetDocumentPreview_AccessControl(t *testing.T) {
}
insertTestPreviewDoc(t, db, mockStorage, "doc-prev-me", "kb-prev-me", "private body")
- if _, err = svc.GetDocumentPreview(ctx, "user-2", "doc-prev-me"); !errors.Is(err, ErrPreviewDocumentNotFound) {
+ if _, err = svc.GetDocumentPreview(memberCtx, "doc-prev-me"); !errors.Is(err, ErrPreviewDocumentNotFound) {
t.Fatalf("team member on private dataset: expected ErrPreviewDocumentNotFound, got %v", err)
}
- p, err = svc.GetDocumentPreview(ctx, "user-1", "doc-prev-me")
+ p, err = svc.GetDocumentPreview(ctx, "doc-prev-me")
if err != nil {
t.Fatalf("owner preview private dataset: %v", err)
}
@@ -2989,7 +2989,7 @@ func TestGetDocumentPreview_EmptyObject(t *testing.T) {
insertTestPreviewDoc(t, db, mockStorage, "doc-prev-empty", "kb-prev-empty", "")
svc := testDocumentService(t)
- _, err := svc.GetDocumentPreview(documentTestContext(t.Context()), "user-1", "doc-prev-empty")
+ _, err := svc.GetDocumentPreview(documentTestContext(t.Context()), "doc-prev-empty")
if !errors.Is(err, ErrPreviewFileEmpty) {
t.Fatalf("expected ErrPreviewFileEmpty, got %v", err)
}
@@ -3012,7 +3012,7 @@ func TestGetDocumentPreview_MissingObjectSurfacesStorageError(t *testing.T) {
}
svc := testDocumentService(t)
- _, err := svc.GetDocumentPreview(documentTestContext(t.Context()), "user-1", "doc-prev-miss")
+ _, err := svc.GetDocumentPreview(documentTestContext(t.Context()), "doc-prev-miss")
if err == nil {
t.Fatal("expected storage read error")
}
@@ -4965,13 +4965,14 @@ func TestGetDocumentThumbnailAuthorizesBeforeStorage(t *testing.T) {
}
svc := testDocumentService(t)
- if _, err := svc.GetDocumentThumbnail(ctx, "other-user", "doc-thumb"); !errors.Is(err, ErrDocumentImageNotFound) {
+ strangerCtx := documentTestActorContext(t.Context(), "other-user", "owner-1")
+ if _, err := svc.GetDocumentThumbnail(strangerCtx, "doc-thumb"); !errors.Is(err, ErrDocumentImageNotFound) {
t.Fatalf("unauthorized GetDocumentThumbnail() error = %v", err)
}
if store.getCalls != 0 {
t.Fatalf("storage Get called %d times after authorization denial", store.getCalls)
}
- got, err := svc.GetDocumentThumbnail(ctx, "user-1", "doc-thumb")
+ got, err := svc.GetDocumentThumbnail(ctx, "doc-thumb")
if err != nil || !bytes.Equal(got, image) {
t.Fatalf("authorized GetDocumentThumbnail() = %q, %v", got, err)
}
@@ -5429,7 +5430,7 @@ func TestFileDeleteRemovesLinkedDocument(t *testing.T) {
docSvc := testDocumentService(t)
fileSvc := file.NewFileService(docSvc)
- if err := fileSvc.DeleteFiles(ctx, "user-1", []string{"file-1"}); err != nil {
+ if err := fileSvc.DeleteFiles(ctx, []string{"file-1"}); err != nil {
t.Fatalf("DeleteFiles failed: %v", err)
}
diff --git a/internal/service/document/file2document.go b/internal/service/document/file2document.go
index 5b3f32d030..541bb4d379 100644
--- a/internal/service/document/file2document.go
+++ b/internal/service/document/file2document.go
@@ -113,7 +113,7 @@ func (s *File2DocumentService) LinkToDatasets(ctx context.Context, userID string
if file.Type == "folder" {
kind = permission.ResourceKindFolder
}
- return checker.CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ return checker.CheckResource(ctx, permission.ResourceRef{
Kind: kind,
ID: file.ID,
}, permission.OperationRead)
@@ -155,7 +155,7 @@ func (s *File2DocumentService) LinkToDatasets(ctx context.Context, userID string
// ── 5. Validate KB permissions ────────────────────────────────────────────
for _, kb := range kbMap {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindDataset, ID: kb.ID}, permission.OperationUpdate); err != nil {
_, permissionErr := permissionresponse.Normalize(err)
return permissionErr
}
diff --git a/internal/service/document_permission.go b/internal/service/document_permission.go
index d2896c6bfe..8f6ab7a4bf 100644
--- a/internal/service/document_permission.go
+++ b/internal/service/document_permission.go
@@ -10,9 +10,9 @@ import (
// CheckDocumentAccess keeps dataset grants effective for every document while
// allowing a direct document grant to expose that document independently.
-func CheckDocumentAccess(ctx context.Context, subject permission.Subject, documentID, datasetID string, operation permission.Operation) error {
+func CheckDocumentAccess(ctx context.Context, documentID, datasetID string, operation permission.Operation) error {
checker := permission.NewDatabaseChecker(dao.DB)
- datasetErr := checker.CheckResource(ctx, subject, permission.ResourceRef{
+ datasetErr := checker.CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDataset,
ID: datasetID,
}, operation)
@@ -22,7 +22,7 @@ func CheckDocumentAccess(ctx context.Context, subject permission.Subject, docume
if !errors.Is(datasetErr, permission.ErrPermissionDenied) && !errors.Is(datasetErr, permission.ErrMembershipNotFound) {
return datasetErr
}
- return checker.CheckResource(ctx, subject, permission.ResourceRef{
+ return checker.CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDocument,
ID: documentID,
}, operation)
diff --git a/internal/service/file/access.go b/internal/service/file/access.go
index f6e87a224e..cc5fec1cd5 100644
--- a/internal/service/file/access.go
+++ b/internal/service/file/access.go
@@ -16,37 +16,37 @@ func checkFileAccess(ctx context.Context, userID string, file *entity.File, oper
if file.Type == FileTypeFolder {
kind = permission.ResourceKindFolder
}
- return permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ return permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: kind,
ID: file.ID,
}, operation)
}
-func fileRequestSubject(ctx context.Context, identity string) (string, string, error) {
- subject, ok := permission.SubjectFromContext(ctx)
- if !ok {
+func fileRequestIdentity(ctx context.Context, identity string) (string, string, error) {
+ userID := permission.UserIDFromContext(ctx)
+ tenantID := permission.TenantIDFromContext(ctx)
+ if userID == "" && tenantID == "" {
return identity, identity, nil
}
- if subject.UserID == "" || subject.UserID != identity {
- return "", "", permission.ErrInvalidSubject
+ if userID == "" || userID != identity {
+ return "", "", permission.ErrIdentityMismatch
}
- tenantID := subject.TenantID
if tenantID == "" {
tenantID = identity
}
- return subject.UserID, tenantID, nil
+ return userID, tenantID, nil
}
func tenantFileContext(ctx context.Context, userID, tenantID string) (context.Context, error) {
- if subject, ok := permission.SubjectFromContext(ctx); ok {
- if subject.UserID != "" && subject.UserID != userID || subject.TenantID != "" && subject.TenantID != tenantID {
- return nil, permission.ErrInvalidSubject
- }
+ contextUserID := permission.UserIDFromContext(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if contextUserID != "" && contextUserID != userID || contextTenantID != "" && contextTenantID != tenantID {
+ return nil, permission.ErrIdentityMismatch
}
- return permission.WithSubject(ctx, permission.Subject{UserID: userID, TenantID: tenantID}), nil
+ return permission.WithIdentity(ctx, userID, tenantID), nil
}
-func (s *FileService) checkFileTreeAccess(ctx context.Context, userID string, file *entity.File, operation permission.Operation) error {
+func (s *FileService) checkFileTreeAccess(ctx context.Context, file *entity.File, operation permission.Operation) error {
if file == nil {
return permission.ErrResourceNotFound
}
@@ -74,7 +74,7 @@ func (s *FileService) checkFileTreeAccess(ctx context.Context, userID string, fi
}
refs = append(refs, permission.ResourceRef{Kind: kind, ID: entry.ID})
}
- accessible, err := checker.FilterResources(ctx, permission.Subject{UserID: userID}, refs, operation)
+ accessible, err := checker.FilterResources(ctx, refs, operation)
if err != nil {
return err
}
diff --git a/internal/service/file/file_browse_permission_test.go b/internal/service/file/file_browse_permission_test.go
index b9497fa5e0..51abd5bd0b 100644
--- a/internal/service/file/file_browse_permission_test.go
+++ b/internal/service/file/file_browse_permission_test.go
@@ -40,7 +40,7 @@ func seedFileBrowsing(t *testing.T) {
func TestTenantMemberSeesOnlyReadableFilesAndPaths(t *testing.T) {
seedFileBrowsing(t)
svc := testFileService()
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "reader", TenantID: "owner"})
+ ctx := permission.WithIdentity(t.Context(), "reader", "owner")
list, err := svc.ListFilesForTenant(ctx, "reader", "owner", "", 1, 1, nil, "")
if err != nil {
t.Fatalf("list shared tenant files: %v", err)
@@ -75,16 +75,18 @@ func TestTenantMemberSeesOnlyReadableFilesAndPaths(t *testing.T) {
func TestTenantFileBrowsingRejectsNonmember(t *testing.T) {
seedFileBrowsing(t)
svc := testFileService()
- if _, err := svc.ListFilesForTenant(t.Context(), "outsider", "owner", "", 1, 100, nil, ""); err == nil {
+ outsiderCtx := permission.WithIdentity(t.Context(), "outsider", "owner")
+ if _, err := svc.ListFilesForTenant(outsiderCtx, "outsider", "owner", "", 1, 100, nil, ""); err == nil {
t.Fatal("nonmember listed another tenant's files")
}
- if _, err := svc.GetAllParentFoldersForTenant(t.Context(), "outsider", "owner", "tags"); err == nil {
+ if _, err := svc.GetAllParentFoldersForTenant(outsiderCtx, "outsider", "owner", "tags"); err == nil {
t.Fatal("nonmember resolved another tenant's file path")
}
if err := dao.DB.Model(&entity.UserTenant{}).Where("id = ?", "reader-membership").Update("status", "0").Error; err != nil {
t.Fatal(err)
}
- if _, err := svc.ListFilesForTenant(t.Context(), "reader", "owner", "", 1, 100, nil, ""); err == nil {
+ readerCtx := permission.WithIdentity(t.Context(), "reader", "owner")
+ if _, err := svc.ListFilesForTenant(readerCtx, "reader", "owner", "", 1, 100, nil, ""); err == nil {
t.Fatal("inactive member listed another tenant's files")
}
}
@@ -92,10 +94,11 @@ func TestTenantFileBrowsingRejectsNonmember(t *testing.T) {
func TestTenantFileBrowsingRejectsForeignEntries(t *testing.T) {
seedFileBrowsing(t)
svc := testFileService()
- if _, err := svc.ListFilesForTenant(t.Context(), "reader", "owner", "foreign-root", 1, 100, nil, ""); !errors.Is(err, permission.ErrResourceNotFound) {
+ readerCtx := permission.WithIdentity(t.Context(), "reader", "owner")
+ if _, err := svc.ListFilesForTenant(readerCtx, "reader", "owner", "foreign-root", 1, 100, nil, ""); !errors.Is(err, permission.ErrResourceNotFound) {
t.Fatalf("foreign folder error = %v, want resource not found", err)
}
- if _, err := svc.GetAllParentFoldersForTenant(t.Context(), "reader", "owner", "foreign-tags"); !errors.Is(err, permission.ErrResourceNotFound) {
+ if _, err := svc.GetAllParentFoldersForTenant(readerCtx, "reader", "owner", "foreign-tags"); !errors.Is(err, permission.ErrResourceNotFound) {
t.Fatalf("foreign file error = %v, want resource not found", err)
}
}
diff --git a/internal/service/file/file_delete.go b/internal/service/file/file_delete.go
index ca87ba2fb2..eba80af8fd 100644
--- a/internal/service/file/file_delete.go
+++ b/internal/service/file/file_delete.go
@@ -16,7 +16,7 @@ import (
// DeleteFiles deletes files and folders by ID after authorizing every entry in
// each selected folder tree.
-func (s *FileService) DeleteFiles(ctx context.Context, userID string, fileIDs []string) error {
+func (s *FileService) DeleteFiles(ctx context.Context, fileIDs []string) error {
files, err := s.fileDAO.GetByIDs(ctx, dao.DB, fileIDs)
if err != nil {
return err
@@ -37,7 +37,7 @@ func (s *FileService) DeleteFiles(ctx context.Context, userID string, fileIDs []
if file.ParentID == file.ID {
return errors.New("root folder cannot be deleted")
}
- if err = s.checkFileTreeAccess(ctx, userID, file, permission.OperationDelete); err != nil {
+ if err = s.checkFileTreeAccess(ctx, file, permission.OperationDelete); err != nil {
return err
}
}
diff --git a/internal/service/file/file_delete_test.go b/internal/service/file/file_delete_test.go
index c93fa12073..9c437056bb 100644
--- a/internal/service/file/file_delete_test.go
+++ b/internal/service/file/file_delete_test.go
@@ -134,7 +134,7 @@ func TestDeleteFilesAuthorizesEveryDescendantBeforeDeleting(t *testing.T) {
}
}
- err := testFileService().DeleteFiles(fileTestContext(t, "user-1", "user-1"), "user-1", []string{"folder"})
+ err := testFileService().DeleteFiles(fileTestContext(t, "user-1", "user-1"), []string{"folder"})
if !errors.Is(err, permission.ErrPermissionDenied) {
t.Fatalf("DeleteFiles error = %v, want permission denied", err)
}
@@ -164,7 +164,7 @@ func TestFileService_CheckFileTreeAccessBatchesWideSubtrees(t *testing.T) {
}
root := &entity.File{ID: "tree-root", ParentID: "tree-root", TenantID: "tenant-1", CreatedBy: "owner", Name: "/", Type: FileTypeFolder}
- if err := testFileService().checkFileTreeAccess(fileTestContext(t, "owner", "tenant-1"), "owner", root, permission.OperationDelete); err != nil {
+ if err := testFileService().checkFileTreeAccess(fileTestContext(t, "owner", "tenant-1"), root, permission.OperationDelete); err != nil {
t.Fatalf("check permissions for wide subtree: %v", err)
}
}
diff --git a/internal/service/file/file_folder.go b/internal/service/file/file_folder.go
index bdbc61752e..f409a962cd 100644
--- a/internal/service/file/file_folder.go
+++ b/internal/service/file/file_folder.go
@@ -46,7 +46,7 @@ func (s *FileService) ListFiles(ctx context.Context, tenantID, pfID string, page
// ListFilesForTenant allows active tenant members to browse the tenant's files.
func (s *FileService) ListFilesForTenant(ctx context.Context, userID, tenantID, pfID string, page, pageSize int, terms []dao.OrderTerm, keywords string) (*ListFilesResponse, error) {
if userID != tenantID {
- if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, tenantID, permission.TenantMember); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
return nil, err
}
}
@@ -60,7 +60,7 @@ func (s *FileService) ListFilesForTenant(ctx context.Context, userID, tenantID,
func (s *FileService) listFiles(ctx context.Context, userID, tenantID, pfID string, page, pageSize int, terms []dao.OrderTerm, keywords string) (*ListFilesResponse, error) {
if tenantID == "" {
- return nil, permission.ErrInvalidSubject
+ return nil, permission.ErrInvalidPermission
}
// If pfID is empty, get root folder and initialize dataset docs
if pfID == "" {
@@ -108,7 +108,7 @@ func (s *FileService) listFiles(ctx context.Context, userID, tenantID, pfID stri
// folders do not need to materialize every candidate ID.
excludeSkills := folder.ID == folder.ParentID
checker := permission.NewDatabaseChecker(dao.DB)
- visibilityScope, err := checker.QueryScope(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ScopeQuery{
+ visibilityScope, err := checker.QueryScope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindFile,
Parent: permission.ResourceRef{Kind: permission.ResourceKindFolder, ID: folder.ID},
Operation: permission.OperationRead,
@@ -134,7 +134,7 @@ func (s *FileService) listFiles(ctx context.Context, userID, tenantID, pfID stri
refsByFileID[file.ID] = ref
refs = append(refs, ref)
}
- accesses, err := checker.FilterAccesses(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, refs, permission.OperationRead)
+ accesses, err := checker.FilterAccesses(ctx, refs, permission.OperationRead)
if err != nil {
return nil, err
}
@@ -338,10 +338,10 @@ func (s *FileService) GetAllParentFolders(ctx context.Context, userID, fileID st
// The file and every ancestor must belong to tenantID.
func (s *FileService) GetAllParentFoldersForTenant(ctx context.Context, userID, tenantID, fileID string) ([]map[string]interface{}, error) {
if tenantID == "" {
- return nil, permission.ErrInvalidSubject
+ return nil, permission.ErrInvalidPermission
}
if userID != tenantID {
- if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, tenantID, permission.TenantMember); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
return nil, err
}
}
@@ -425,7 +425,7 @@ func (s *FileService) createFolderRecursive(ctx context.Context, parentFolder *e
if createErr != nil {
return createErr
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindFolder, ID: newFolder.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindFolder, ID: newFolder.ID})
})
if err != nil {
return nil, err
@@ -444,11 +444,11 @@ func (s *FileService) getUniqueFilename(ctx context.Context, name, parentID, ten
// CreateFolder creates a new folder or virtual file
func (s *FileService) CreateFolder(ctx context.Context, userID, name, parentID, fileType string) (map[string]interface{}, error) {
- userID, tenantID, err := fileRequestSubject(ctx, userID)
+ userID, tenantID, err := fileRequestIdentity(ctx, userID)
if err != nil {
return nil, err
}
- if err = permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "file", permission.ActionWrite); err != nil {
+ if err = permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "file", permission.ActionWrite); err != nil {
return nil, err
}
// "/" is the root folder name and the path separator used by recursive
@@ -510,7 +510,7 @@ func (s *FileService) CreateFolder(ctx context.Context, userID, name, parentID,
if fileType == FileTypeFolder {
kind = permission.ResourceKindFolder
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: kind, ID: folder.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: kind, ID: folder.ID})
})
if err != nil {
return nil, fmt.Errorf("failed to create folder: %w", err)
@@ -545,7 +545,7 @@ func (s *FileService) MoveFiles(ctx context.Context, userID string, srcFileIDs [
if file.TenantID == "" {
return errors.New("tenant not found")
}
- if err := s.checkFileTreeAccess(ctx, userID, file, permission.OperationUpdate); err != nil {
+ if err := s.checkFileTreeAccess(ctx, file, permission.OperationUpdate); err != nil {
return err
}
}
diff --git a/internal/service/file/file_folder_test.go b/internal/service/file/file_folder_test.go
index 7eb573b7f9..f05392388e 100644
--- a/internal/service/file/file_folder_test.go
+++ b/internal/service/file/file_folder_test.go
@@ -18,8 +18,9 @@ import (
func TestFileService_CreateFolder_RejectsSlashInName(t *testing.T) {
svc := testFileService()
+ ctx := permission.WithIdentity(context.Background(), "tenant1", "")
for _, name := range []string{"/", "a/b", "dir/sub/"} {
- _, err := svc.CreateFolder(context.Background(), "tenant1", name, "pf1", FileTypeFolder)
+ _, err := svc.CreateFolder(ctx, "tenant1", name, "pf1", FileTypeFolder)
if err == nil || !strings.Contains(err.Error(), `cannot contain "/"`) {
t.Fatalf("CreateFolder(%q) error = %v, want slash validation error", name, err)
}
@@ -235,7 +236,7 @@ func fileTestContext(t *testing.T, userID, tenantID string, memberIDs ...string)
if err := testsupport.PrepareEnterprisePermissionFixture(dao.DB, tenantID, members...); err != nil {
t.Fatalf("prepare permission fixture: %v", err)
}
- return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})
+ return permission.WithIdentity(t.Context(), userID, tenantID)
}
func insertFolderTestFile(t *testing.T, id, parentID, name string) {
@@ -274,7 +275,7 @@ func TestFileService_AncestryMissingIDReturnsNotFound(t *testing.T) {
setupFolderTestDB(t)
svc := testFileService()
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(t.Context(), "user-1", "tenant-1")
for name, call := range map[string]func() error{
"GetParentFolder": func() error { _, err := svc.GetParentFolder(ctx, "user-1", "missing-file"); return err },
"GetAllParentFolders": func() error { _, err := svc.GetAllParentFolders(ctx, "user-1", "missing-file"); return err },
@@ -298,7 +299,7 @@ func TestFileService_DatabaseErrorIsNotReportedAsNotFound(t *testing.T) {
}
svc := testFileService()
- ctx := permission.WithSubject(t.Context(), permission.Subject{UserID: "user-1", TenantID: "tenant-1"})
+ ctx := permission.WithIdentity(t.Context(), "user-1", "tenant-1")
for name, call := range map[string]func() error{
"ListFiles": func() error { _, err := svc.ListFiles(ctx, "tenant-1", "any", 1, 10, nil, ""); return err },
"GetParentFolder": func() error { _, err := svc.GetParentFolder(ctx, "user-1", "any"); return err },
diff --git a/internal/service/file/file_upload.go b/internal/service/file/file_upload.go
index f352418d55..1d6f1ca235 100644
--- a/internal/service/file/file_upload.go
+++ b/internal/service/file/file_upload.go
@@ -25,12 +25,12 @@ func DeploymentUploadMaxBytes() int64 {
// UploadFile uploads files to a folder
func (s *FileService) UploadFile(ctx context.Context, tenantID, parentID string, files []*multipart.FileHeader, maxBytes int64) ([]map[string]interface{}, error) {
- userID, currentTenantID, err := fileRequestSubject(ctx, tenantID)
+ userID, currentTenantID, err := fileRequestIdentity(ctx, tenantID)
if err != nil {
return nil, err
}
tenantID = currentTenantID
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "file", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "file", permission.ActionWrite); err != nil {
return nil, err
}
if parentID == "" {
@@ -159,7 +159,7 @@ func (s *FileService) UploadFile(ctx context.Context, tenantID, parentID string,
if err := s.fileDAO.Insert(ctx, tx, fileRecord); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindFile, ID: fileRecord.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindFile, ID: fileRecord.ID})
}); err != nil {
_ = storageImpl.Remove(ctx, lastFolder.ID, location)
return nil, fmt.Errorf("failed to insert file record: %w", err)
diff --git a/internal/service/identity.go b/internal/service/identity.go
index cde34666c2..ee14466d7a 100644
--- a/internal/service/identity.go
+++ b/internal/service/identity.go
@@ -33,15 +33,15 @@ type Identity struct {
// Explicit Identity values remain available to background work without a
// request context.
func ResolveIdentity(ctx context.Context) (Identity, error) {
- subject, ok := permission.SubjectFromContext(ctx)
- if !ok || strings.TrimSpace(subject.UserID) == "" {
+ userID := strings.TrimSpace(permission.UserIDFromContext(ctx))
+ if userID == "" {
return Identity{}, permission.ErrUnauthenticated
}
- tenantID, err := requireCurrentTenantID(ctx, subject.UserID)
+ tenantID, err := requireCurrentTenantID(ctx, userID)
if err != nil {
return Identity{}, err
}
- return Identity{UserID: strings.TrimSpace(subject.UserID), TenantID: tenantID}, nil
+ return Identity{UserID: userID, TenantID: tenantID}, nil
}
diff --git a/internal/service/mcp.go b/internal/service/mcp.go
index 4fda9f2d0d..c338084d2a 100644
--- a/internal/service/mcp.go
+++ b/internal/service/mcp.go
@@ -128,7 +128,7 @@ func (s *MCPService) CreateMCPServer(ctx context.Context, userID string, req Cre
code, normalized := permissionresponse.Normalize(err)
return nil, code, normalized
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "mcp", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "mcp", permission.ActionWrite); err != nil {
code, normalized := permissionresponse.Normalize(err)
return nil, code, normalized
}
@@ -166,7 +166,7 @@ func (s *MCPService) CreateMCPServer(ctx context.Context, userID string, req Cre
if err := s.mcpServerDAO.CreateMCPServer(ctx, tx, server); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: server.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: server.ID})
}); err != nil {
return nil, common.CodeDataError, errors.New("failed to create MCP server")
}
@@ -369,7 +369,7 @@ func importedMCPHeaders(raw interface{}) (map[string]string, map[string]interfac
}
func (s *MCPService) GetMCPServer(ctx context.Context, userID, mcpID string) (*entity.MCPServer, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationRead); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationRead); err != nil {
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
}
@@ -394,7 +394,7 @@ func (s *MCPService) ExportMCPServer(ctx context.Context, userID, mcpID string)
// UpdateMCPServer updates an MCP server the caller can manage.
func (s *MCPService) UpdateMCPServer(ctx context.Context, userID, mcpID string, req UpdateMCPServerRequest) (*entity.MCPServer, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationUpdate); err != nil {
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
}
@@ -553,14 +553,14 @@ func (s *MCPService) ListMCPServers(ctx context.Context, userID, requestedTenant
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
}
- } else if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, permission.TenantMember); err != nil {
+ } else if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
}
checker := permission.NewDatabaseChecker(dao.DB)
- subject := permission.Subject{UserID: userID, TenantID: tenantID}
- queryScope, err := checker.QueryScope(ctx, subject, permission.ScopeQuery{
+ queryScope, err := checker.QueryScope(ctx, permission.ScopeQuery{
+ TenantID: tenantID,
Kind: permission.ResourceKindMCPServer,
Operation: permission.OperationRead,
})
@@ -584,7 +584,7 @@ func (s *MCPService) ListMCPServers(ctx context.Context, userID, requestedTenant
for _, server := range servers[offset:end] {
refs = append(refs, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: server.ID})
}
- accesses, err := checker.ResolveAccesses(ctx, subject, refs)
+ accesses, err := checker.ResolveAccesses(ctx, refs)
if err != nil {
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
@@ -628,7 +628,7 @@ func (s *MCPService) ListMCPServers(ctx context.Context, userID, requestedTenant
// DeleteMCPServer deletes an MCP server the caller can manage.
func (s *MCPService) DeleteMCPServer(ctx context.Context, userID, mcpID string) (bool, common.ErrorCode, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationDelete); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationDelete); err != nil {
code, normalized := permissionresponse.NormalizeHidden(err)
return false, code, normalized
}
@@ -732,7 +732,7 @@ func (s *MCPService) ImportServers(ctx context.Context, userID string, servers m
_, normalized := permissionresponse.Normalize(err)
return nil, normalized
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "mcp", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "mcp", permission.ActionWrite); err != nil {
_, normalized := permissionresponse.Normalize(err)
return nil, normalized
}
@@ -837,7 +837,7 @@ func (s *MCPService) ImportServers(ctx context.Context, userID string, servers m
if err := s.mcpServerDAO.CreateMCPServer(ctx, tx, server); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: server.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: server.ID})
}); err != nil {
results = append(results, ImportResult{Server: serverName, Success: false, Message: "Failed to create MCP server."})
continue
@@ -877,7 +877,7 @@ func (s *MCPService) TestServer(ctx context.Context, userID, mcpID string, req *
return nil, ErrMCPInvalidType
}
if mcpID != mcpServerPreviewID {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMCPServer, ID: mcpID}, permission.OperationUpdate); err != nil {
_, normalized := permissionresponse.NormalizeHidden(err)
return nil, normalized
}
diff --git a/internal/service/memory.go b/internal/service/memory.go
index 7bdf9baba9..276c1a2737 100644
--- a/internal/service/memory.go
+++ b/internal/service/memory.go
@@ -412,7 +412,7 @@ type MemoryFiltersResponse struct {
}
func (s *MemoryService) ListMemoryFilters(ctx context.Context, userID string) (*MemoryFiltersResponse, error) {
- memoryScope, err := permission.NewDatabaseChecker(s.db).Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ memoryScope, err := permission.NewDatabaseChecker(s.db).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindMemory,
Operation: permission.OperationRead,
})
@@ -502,7 +502,7 @@ func (s *MemoryService) CreateMemory(ctx context.Context, userID string, req *Cr
if err != nil {
return nil, err
}
- if err := permission.NewDatabaseChecker(s.db).CheckFeature(ctx, permission.Subject{UserID: userID}, "memory", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(s.db).CheckFeature(ctx, "memory", permission.ActionWrite); err != nil {
return nil, err
}
// Resolve tenant model IDs, mirroring Python's ensure_tenant_model_ids_for_params.
@@ -595,7 +595,7 @@ func (s *MemoryService) CreateMemory(ctx context.Context, userID string, req *Cr
if err := s.memoryDAO.Create(ctx, tx, memory); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memory.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memory.ID})
}); err != nil {
return nil, errors.New("could not create new memory")
}
@@ -626,7 +626,7 @@ func (s *MemoryService) CreateMemory(ctx context.Context, userID string, req *Cr
// resp, err := service.UpdateMemory("tenant123", "memory456", req)
func (s *MemoryService) UpdateMemory(ctx context.Context, userID string, memoryID string, req *UpdateMemoryRequest) (*CreateMemoryResponse, error) {
updateDict := make(map[string]interface{})
- if err := permission.NewDatabaseChecker(s.db).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID}, permission.OperationUpdate); err != nil {
+ if err := permission.NewDatabaseChecker(s.db).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID}, permission.OperationUpdate); err != nil {
return nil, err
}
@@ -663,7 +663,7 @@ func (s *MemoryService) UpdateMemory(ctx context.Context, userID string, memoryI
return nil, fmt.Errorf("unknown permission '%s'", *req.Permissions)
}
if strings.ToLower(strings.TrimSpace(currentMemory.Permissions)) != string(perm) {
- if err := permission.NewDatabaseChecker(s.db).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID}, permission.OperationShare); err != nil {
+ if err := permission.NewDatabaseChecker(s.db).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID}, permission.OperationShare); err != nil {
return nil, err
}
}
@@ -1377,7 +1377,7 @@ func (s *MemoryService) filterAccessibleMemories(ctx context.Context, userID str
for _, memoryID := range memoryIDs {
refs = append(refs, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID})
}
- accessible, err := permission.NewDatabaseChecker(s.db).FilterResources(ctx, permission.Subject{UserID: userID}, refs, permission.OperationUse)
+ accessible, err := permission.NewDatabaseChecker(s.db).FilterResources(ctx, refs, permission.OperationUse)
if err != nil {
return nil, err
}
@@ -1663,7 +1663,7 @@ func (s *MemoryService) memoryWithAccess(ctx context.Context, userID, memoryID s
if err := ctx.Err(); err != nil {
return nil, err
}
- if err := permission.NewDatabaseChecker(s.db).CheckResource(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID}, operation); err != nil {
+ if err := permission.NewDatabaseChecker(s.db).CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID}, operation); err != nil {
return nil, err
}
memory, err := s.memoryDAO.GetByIDWithContext(ctx, s.db, memoryID)
@@ -1707,7 +1707,7 @@ func (s *MemoryService) ListMemories(ctx context.Context, userID string, tenantI
query.Entry = &canvasRef
query.EntryOp = permission.OperationRun
}
- memoryScope, err := permission.NewDatabaseChecker(s.db).Scope(ctx, permission.Subject{UserID: userID}, query)
+ memoryScope, err := permission.NewDatabaseChecker(s.db).Scope(ctx, query)
if err != nil {
return nil, err
}
@@ -1728,7 +1728,7 @@ func (s *MemoryService) ListMemories(ctx context.Context, userID string, tenantI
modelNameCache := make(map[string]string)
checker := permission.NewDatabaseChecker(s.db)
for _, m := range memories {
- access, err := checker.ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := checker.ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindMemory,
ID: m.ID,
})
@@ -1823,7 +1823,7 @@ func (s *MemoryService) GetMemoryConfig(ctx context.Context, userID, memoryID st
if err != nil {
return nil, err
}
- access, err := permission.NewDatabaseChecker(s.db).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(s.db).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindMemory,
ID: memoryID,
})
diff --git a/internal/service/memory_saver_adapter.go b/internal/service/memory_saver_adapter.go
index 73aabfbae5..43189da975 100644
--- a/internal/service/memory_saver_adapter.go
+++ b/internal/service/memory_saver_adapter.go
@@ -54,8 +54,10 @@ func (a *memorySaverAdapter) Save(ctx context.Context, req component.MemorySaveR
}
canvasID, _ := state.GetSysString("canvas_id")
userID, _ := state.GetSysString("user_id")
+ tenantID, _ := state.GetSysString("tenant_id")
canvasID = strings.TrimSpace(canvasID)
userID = strings.TrimSpace(userID)
+ tenantID = strings.TrimSpace(tenantID)
authorizationUserID = userID
if canvasID == "" {
return fmt.Errorf("%w: canvas id is required to use memory from an agent", permission.ErrInvalidPermission)
@@ -63,6 +65,17 @@ func (a *memorySaverAdapter) Save(ctx context.Context, req component.MemorySaveR
if userID == "" {
return permission.ErrUnauthenticated
}
+ contextUserID := permission.UserIDFromContext(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if contextUserID != "" && contextUserID != userID {
+ return permission.ErrIdentityMismatch
+ }
+ if contextTenantID != "" && tenantID != "" && contextTenantID != tenantID {
+ return permission.ErrIdentityMismatch
+ }
+ if contextUserID == "" || contextTenantID == "" {
+ ctx = permission.WithIdentity(ctx, userID, tenantID)
+ }
checker := permission.NewDatabaseChecker(a.svc.db)
entry := permission.ResourceRef{Kind: permission.ResourceKindCanvas, ID: canvasID}
for _, memoryID := range req.MemoryIDs {
@@ -70,7 +83,7 @@ func (a *memorySaverAdapter) Save(ctx context.Context, req component.MemorySaveR
if memoryID == "" {
continue
}
- if err := checker.CheckDependency(ctx, permission.Subject{UserID: userID}, entry,
+ if err := checker.CheckDependency(ctx, entry,
permission.ResourceRef{Kind: permission.ResourceKindMemory, ID: memoryID},
permission.OperationRun, permission.OperationUse); err != nil {
return fmt.Errorf("memory %q: %w", memoryID, err)
diff --git a/internal/service/memory_saver_adapter_test.go b/internal/service/memory_saver_adapter_test.go
index 754824f0dd..a5f6b180f1 100644
--- a/internal/service/memory_saver_adapter_test.go
+++ b/internal/service/memory_saver_adapter_test.go
@@ -65,8 +65,8 @@ func TestMemorySaverAuthorizesWithAuthenticatedCanvasCaller(t *testing.T) {
state.Sys["canvas_id"] = canvas.ID
state.Sys["user_id"] = "caller"
ctx = runtime.WithState(ctx, state)
- ownerCtx := permission.WithSubject(ctx, permission.Subject{UserID: "canvas-owner", TenantID: "canvas-owner"})
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ownerCtx, permission.Subject{UserID: "canvas-owner"}, permission.ResourceRef{
+ ownerCtx := permission.WithIdentity(ctx, "canvas-owner", "canvas-owner")
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(permission.WithIdentity(ownerCtx, "canvas-owner", ""), permission.ResourceRef{
Kind: permission.ResourceKindMemory, ID: memory.ID,
}, permission.OperationUse); err != nil {
t.Fatalf("canvas owner should be able to use memory: %v", err)
diff --git a/internal/service/model_factory.go b/internal/service/model_factory.go
index b3b46edf19..5d4f79a00c 100644
--- a/internal/service/model_factory.go
+++ b/internal/service/model_factory.go
@@ -491,9 +491,10 @@ func normalizeIdentity(identity Identity) Identity {
func identityFromContext(ctx context.Context, identity Identity) Identity {
identity = normalizeIdentity(identity)
if identity.UserID == "" {
- if subject, ok := permission.SubjectFromContext(ctx); ok && strings.TrimSpace(subject.UserID) != "" &&
- (strings.TrimSpace(subject.TenantID) == "" || strings.TrimSpace(subject.TenantID) == identity.TenantID) {
- identity.UserID = strings.TrimSpace(subject.UserID)
+ userID := strings.TrimSpace(permission.UserIDFromContext(ctx))
+ contextTenantID := strings.TrimSpace(permission.TenantIDFromContext(ctx))
+ if userID != "" && (contextTenantID == "" || contextTenantID == identity.TenantID) {
+ identity.UserID = userID
}
}
return identity
@@ -512,7 +513,14 @@ func (f *ModelFactory) authorize(ctx context.Context, access Identity) error {
if access.UserID == "" || access.UserID == access.TenantID {
return nil
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: access.UserID}, access.TenantID, permission.TenantMember); err != nil {
+ contextUserID := permission.UserIDFromContext(ctx)
+ if contextUserID != "" && access.UserID != "" && contextUserID != access.UserID {
+ return fmt.Errorf("%w: user %s has no access to tenant %s: %w", errModelConfigUnavailable, access.UserID, access.TenantID, permission.ErrIdentityMismatch)
+ }
+ if contextUserID == "" && access.UserID != "" {
+ ctx = permission.WithIdentity(ctx, access.UserID, permission.TenantIDFromContext(ctx))
+ }
+ if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, access.TenantID, permission.TenantMember); err != nil {
return fmt.Errorf("%w: user %s has no access to tenant %s: %w", errModelConfigUnavailable, access.UserID, access.TenantID, err)
}
return nil
@@ -748,12 +756,23 @@ func (s *ModelFactory) resolveModelIdentity(ctx context.Context, access Identity
return nil, fmt.Errorf("%w: tenant model %q is disabled", errModelConfigUnavailable, modelRef)
}
if access.UserID != "" {
+ contextUserID := permission.UserIDFromContext(ctx)
+ contextTenantID := permission.TenantIDFromContext(ctx)
+ if (contextUserID != "" && contextUserID != access.UserID) ||
+ (contextTenantID != "" && contextTenantID != access.TenantID) {
+ return nil, fmt.Errorf("%w: model access identity does not match authenticated identity", permission.ErrIdentityMismatch)
+ }
+ if contextUserID == "" || contextTenantID == "" {
+ if contextTenantID == "" {
+ contextTenantID = access.TenantID
+ }
+ ctx = permission.WithIdentity(ctx, access.UserID, contextTenantID)
+ }
checker := permission.NewDatabaseChecker(dao.DB)
- subject := permission.Subject{UserID: access.UserID}
- if err := checker.CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindModelProvider, ID: provider.ID}, permission.OperationRead); err != nil {
+ if err := checker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindModelProvider, ID: provider.ID}, permission.OperationRead); err != nil {
return nil, fmt.Errorf("%w: user %s cannot read model provider %q: %w", errModelConfigUnavailable, access.UserID, provider.ProviderName, err)
}
- if err := checker.CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID}, permission.OperationUse); err != nil {
+ if err := checker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID}, permission.OperationUse); err != nil {
return nil, fmt.Errorf("%w: user %s cannot use model instance %q: %w", errModelConfigUnavailable, access.UserID, instance.InstanceName, err)
}
checkedModels := candidates
@@ -767,7 +786,7 @@ func (s *ModelFactory) resolveModelIdentity(ctx context.Context, access Identity
if !strings.EqualFold(candidate.Status, "active") {
continue
}
- if err := checker.CheckResource(ctx, subject, permission.ResourceRef{Kind: permission.ResourceKindModel, ID: candidate.ID}, permission.OperationUse); err != nil {
+ if err := checker.CheckResource(ctx, permission.ResourceRef{Kind: permission.ResourceKindModel, ID: candidate.ID}, permission.OperationUse); err != nil {
return nil, fmt.Errorf("%w: user %s cannot use model %q: %w", errModelConfigUnavailable, access.UserID, modelRef, err)
}
}
diff --git a/internal/service/model_service.go b/internal/service/model_service.go
index c4b5bb5bf7..f397219458 100644
--- a/internal/service/model_service.go
+++ b/internal/service/model_service.go
@@ -112,7 +112,7 @@ type CheckConnectionRequest struct {
func (m *ModelProviderService) AddModelProvider(ctx context.Context, providerName, userID string) (common.ErrorCode, error) {
providerName = strings.TrimSpace(providerName)
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "model_provider", permission.ActionEnable); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "model_provider", permission.ActionEnable); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return code, normalizedErr
}
@@ -166,7 +166,7 @@ func (m *ModelProviderService) ListProvidersOfTenant(ctx context.Context, userID
}
accessibleProviders, err := permission.NewDatabaseChecker(dao.DB).FilterResources(
ctx,
- permission.Subject{UserID: userID},
+
providerRefs,
permission.OperationRead,
)
@@ -266,7 +266,6 @@ func (m *ModelProviderService) DeleteModelProvider(ctx context.Context, userID,
for _, instance := range instances {
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationDelete,
); err != nil {
@@ -280,7 +279,6 @@ func (m *ModelProviderService) DeleteModelProvider(ctx context.Context, userID,
for _, model := range models {
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModel, ID: model.ID},
permission.OperationDelete,
); err != nil {
@@ -350,7 +348,7 @@ func (m *ModelProviderService) ResolveSavedProviderModelConfig(ctx context.Conte
}
return SavedProviderModelConfig{}, err
}
- access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindModelInstance,
ID: instance.ID,
})
@@ -768,7 +766,6 @@ func (m *ModelProviderService) resolveProviderInTenant(ctx context.Context, user
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelProvider, ID: provider.ID},
operation,
); err != nil {
@@ -840,7 +837,6 @@ func (m *ModelProviderService) CreateProviderInstance(ctx context.Context, provi
}
return common.CodeNotFound, fmt.Errorf("provider '%s' does not exist", providerIDOrName)
}
- tenantID := provider.TenantID
instanceID := common.GenerateToken()
extra := make(map[string]string)
@@ -864,7 +860,7 @@ func (m *ModelProviderService) CreateProviderInstance(ctx context.Context, provi
if err := m.modelInstanceDAO.Create(ctx, tx, tenantModelInstance); err != nil {
return err
}
- if err := permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{
Kind: permission.ResourceKindModelInstance, ID: tenantModelInstance.ID,
}); err != nil {
return err
@@ -951,7 +947,7 @@ func (m *ModelProviderService) CreateNameOnlyProviderInstance(ctx context.Contex
if err := m.modelInstanceDAO.Create(ctx, tx, tenantModelInstance); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: provider.TenantID}, permission.ResourceRef{
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{
Kind: permission.ResourceKindModelInstance, ID: tenantModelInstance.ID,
})
})
@@ -1039,7 +1035,7 @@ func (m *ModelProviderService) ListProviderInstances(ctx context.Context, provid
instanceRefs = append(instanceRefs, permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID})
}
checker := permission.NewDatabaseChecker(dao.DB)
- instanceAccesses, err := checker.ResolveAccesses(ctx, permission.Subject{UserID: userID}, instanceRefs)
+ instanceAccesses, err := checker.ResolveAccesses(ctx, instanceRefs)
if err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
@@ -1107,7 +1103,7 @@ func (m *ModelProviderService) ShowProviderInstance(ctx context.Context, provide
}
return nil, common.CodeNotFound, fmt.Errorf("no instance found for provider '%s' and instance '%s'", providerName, instanceIDOrName)
}
- access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindModelInstance,
ID: instance.ID,
})
@@ -1174,7 +1170,6 @@ func (m *ModelProviderService) resolveAuthorizedInstance(ctx context.Context, us
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
operation,
); err != nil {
@@ -1254,14 +1249,13 @@ func (m *ModelProviderService) CheckConnection(ctx context.Context, providerName
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelProvider, ID: provider.ID},
permission.OperationRead,
); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return code, normalizedErr
}
- instanceAccess, err = permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{UserID: userID}, permission.ResourceRef{
+ instanceAccess, err = permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindModelInstance,
ID: instance.ID,
})
@@ -1379,7 +1373,6 @@ func (m *ModelProviderService) updateModelVerifyResults(ctx context.Context, use
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationUpdate,
); err != nil {
@@ -1394,7 +1387,6 @@ func (m *ModelProviderService) updateModelVerifyResults(ctx context.Context, use
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelProvider, ID: provider.ID},
permission.OperationRead,
); err != nil {
@@ -1413,7 +1405,6 @@ func (m *ModelProviderService) updateModelVerifyResults(ctx context.Context, use
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModel, ID: modelObj.ID},
permission.OperationUpdate,
); err != nil {
@@ -1867,7 +1858,7 @@ func (m *ModelProviderService) ListModelsForUserInTenant(ctx context.Context, us
}
// Mirror Python's ensure_*_from_env calls.
- if permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, permission.TenantOwner) == nil {
+ if permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantOwner) == nil {
_ = m.ensureMineruFromEnv(ctx, userID, tenantID)
_ = m.ensureMonkeyOCRv2FromEnv(ctx, userID, tenantID)
_ = m.ensureMonkeyOCRFromEnv(ctx, userID, tenantID)
@@ -1885,7 +1876,7 @@ func (m *ModelProviderService) ListModelsForUserInTenant(ctx context.Context, us
if err != nil {
return nil, common.CodeServerError, fmt.Errorf("get tenant owner for model listing: %w", err)
}
- providerScope, err := checker.QueryScope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ providerScope, err := checker.QueryScope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindModelProvider,
Operation: permission.OperationRead,
})
@@ -1926,7 +1917,7 @@ func (m *ModelProviderService) ListModelsForUserInTenant(ctx context.Context, us
// the service layer. Model access for a tenant is limited to its owner's
// provider configuration; personal model settings remain in the provider
// management endpoints.
- modelScope, err := checker.QueryScope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ modelScope, err := checker.QueryScope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindModel,
Operation: permission.OperationRead,
})
@@ -2095,7 +2086,7 @@ func (m *ModelProviderService) resolveModelListTenant(ctx context.Context, userI
return nil, code, normalizedErr
}
} else {
- if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, permission.TenantMember); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
code, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, code, normalizedErr
}
@@ -2339,7 +2330,6 @@ func (m *ModelProviderService) AlterProviderInstance(ctx context.Context, userID
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationUpdate,
); err != nil {
@@ -2371,7 +2361,6 @@ func (m *ModelProviderService) AlterProviderInstance(ctx context.Context, userID
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModel, ID: model.ID},
operation,
); err != nil {
@@ -2386,7 +2375,6 @@ func (m *ModelProviderService) AlterProviderInstance(ctx context.Context, userID
if _, exists := existingModelMap[model.ModelName]; !exists {
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationCreate,
); err != nil {
@@ -2541,7 +2529,6 @@ func (m *ModelProviderService) DropProviderInstances(ctx context.Context, provid
instanceIDs = append(instanceIDs, instance.ID)
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationDelete,
); err != nil {
@@ -2555,7 +2542,6 @@ func (m *ModelProviderService) DropProviderInstances(ctx context.Context, provid
for _, model := range models {
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModel, ID: model.ID},
permission.OperationDelete,
); err != nil {
@@ -2610,7 +2596,6 @@ func (m *ModelProviderService) DropInstanceModels(ctx context.Context, providerI
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationRead,
); err != nil {
@@ -2649,7 +2634,6 @@ func (m *ModelProviderService) DropInstanceModels(ctx context.Context, providerI
if _, ok := requestedNames[obj.ModelName]; ok {
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModel, ID: obj.ID},
permission.OperationDelete,
); err != nil {
@@ -2686,7 +2670,6 @@ func (m *ModelProviderService) ListInstanceModels(ctx context.Context, providerN
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationRead,
); err != nil {
@@ -2703,7 +2686,7 @@ func (m *ModelProviderService) ListInstanceModels(ctx context.Context, providerN
for _, model := range modelObjs {
modelRefs = append(modelRefs, permission.ResourceRef{Kind: permission.ResourceKindModel, ID: model.ID})
}
- resourceAccesses, err := permission.NewDatabaseChecker(dao.DB).ResolveAccesses(ctx, permission.Subject{UserID: userID}, modelRefs)
+ resourceAccesses, err := permission.NewDatabaseChecker(dao.DB).ResolveAccesses(ctx, modelRefs)
if err != nil {
_, normalizedErr := permissionresponse.NormalizeHidden(err)
return nil, normalizedErr
@@ -2799,7 +2782,6 @@ func (m *ModelProviderService) AlterModel(ctx context.Context, providerName, ins
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationRead,
); err != nil {
@@ -2833,7 +2815,6 @@ func (m *ModelProviderService) AlterModel(ctx context.Context, providerName, ins
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModel, ID: model.ID},
permission.OperationUpdate,
); err != nil {
@@ -3032,7 +3013,6 @@ func (m *ModelProviderService) AddModel(ctx context.Context, request *AddModelRe
}
if err = permission.NewDatabaseChecker(dao.DB).CheckResource(
ctx,
- permission.Subject{UserID: userID},
permission.ResourceRef{Kind: permission.ResourceKindModelInstance, ID: instance.ID},
permission.OperationCreate,
); err != nil {
diff --git a/internal/service/search.go b/internal/service/search.go
index 39c29aee12..1e10fd120a 100644
--- a/internal/service/search.go
+++ b/internal/service/search.go
@@ -74,7 +74,7 @@ type SearchShareDetail struct {
// ListSearches list search apps with advanced filtering (equivalent to list_search_app)
func (s *SearchService) ListSearches(ctx context.Context, keywords string, page, pageSize int, terms []dao.OrderTerm, ownerIDs []string) (*ListSearchAppsResponse, error) {
- scope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.Subject{}, permission.ScopeQuery{
+ scope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindSearchApp,
Operation: permission.OperationRead,
})
@@ -94,7 +94,7 @@ func (s *SearchService) ListSearches(ctx context.Context, keywords string, page,
searchApps := make([]map[string]interface{}, len(searches))
checker := permission.NewDatabaseChecker(dao.DB)
for i, search := range searches {
- access, err := checker.ResolveAccess(ctx, permission.Subject{}, permission.ResourceRef{
+ access, err := checker.ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindSearchApp,
ID: search.ID,
})
@@ -157,7 +157,7 @@ func (s *SearchService) CreateSearch(ctx context.Context, name string, descripti
if err != nil {
return nil, err
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: identity.UserID}, "search", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "search", permission.ActionWrite); err != nil {
return nil, err
}
if err := common.ValidateName(name); err != nil {
@@ -203,7 +203,7 @@ func (s *SearchService) CreateSearch(ctx context.Context, name string, descripti
if err := s.searchDAO.Create(ctx, tx, search); err != nil {
return err
}
- return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.Subject{UserID: identity.UserID, TenantID: identity.TenantID}, permission.ResourceRef{Kind: permission.ResourceKindSearchApp, ID: search.ID})
+ return permission.NewDatabaseChecker(tx).GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindSearchApp, ID: search.ID})
}); err != nil {
return nil, fmt.Errorf("failed to create search: %w", err)
}
@@ -214,7 +214,7 @@ func (s *SearchService) CreateSearch(ctx context.Context, name string, descripti
}
func (s *SearchService) GetSearchDetail(ctx context.Context, searchID string) (*entity.Search, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindSearchApp,
ID: searchID,
}, permission.OperationRead); err != nil {
@@ -257,7 +257,7 @@ func (s *SearchService) GetSearchShareDetail(ctx context.Context, searchID strin
// DeleteSearch deletes a search app by ID
func (s *SearchService) DeleteSearch(ctx context.Context, searchID string) error {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindSearchApp,
ID: searchID,
}, permission.OperationDelete); err != nil {
@@ -315,7 +315,7 @@ func (s *SearchService) PrepareCompletion(ctx context.Context, searchID string,
}
for _, datasetID := range datasetIDs {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindDataset,
ID: datasetID,
}, permission.OperationUse); err != nil {
@@ -522,7 +522,7 @@ type UpdateSearchRequest struct {
}
func (s *SearchService) UpdateSearch(ctx context.Context, searchID string, req *UpdateSearchRequest) (*entity.Search, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindSearchApp,
ID: searchID,
}, permission.OperationUpdate); err != nil {
@@ -596,7 +596,7 @@ func (s *SearchService) UpdateSearch(ctx context.Context, searchID string, req *
// GetDetail returns Search App configuration to a caller that is executing it.
func (s *SearchService) GetDetail(ctx context.Context, searchID string) (map[string]interface{}, error) {
- if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.Subject{}, permission.ResourceRef{
+ if err := permission.NewDatabaseChecker(dao.DB).CheckResource(ctx, permission.ResourceRef{
Kind: permission.ResourceKindSearchApp,
ID: searchID,
}, permission.OperationRun); err != nil {
@@ -618,7 +618,7 @@ func (s *SearchService) GetDetail(ctx context.Context, searchID string) (map[str
"update_time": search.UpdateTime,
"search_config": map[string]interface{}(search.SearchConfig),
}
- access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.Subject{}, permission.ResourceRef{
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
Kind: permission.ResourceKindSearchApp,
ID: search.ID,
})
diff --git a/internal/service/skill_space.go b/internal/service/skill_space.go
index e950676b83..e0c1e44f59 100644
--- a/internal/service/skill_space.go
+++ b/internal/service/skill_space.go
@@ -40,16 +40,16 @@ func resolveSkillSpaceTenantID(ctx context.Context, userID, spaceID string, oper
return requireCurrentTenantID(ctx, userID)
}
- checker := permission.NewDatabaseChecker(dao.DB)
- subject := permission.Subject{UserID: userID}
- ref := permission.ResourceRef{Kind: permission.ResourceKindSkillSpace, ID: spaceID}
- if err := checker.CheckResource(ctx, subject, ref, operation); err != nil {
- return "", err
- }
- access, err := checker.ResolveAccess(ctx, subject, ref)
+ access, err := permission.NewDatabaseChecker(dao.DB).ResolveAccess(ctx, permission.ResourceRef{
+ Kind: permission.ResourceKindSkillSpace,
+ ID: spaceID,
+ })
if err != nil {
return "", err
}
+ if !access.Allows(operation) {
+ return "", permission.ErrPermissionDenied
+ }
return access.TenantID, nil
}
@@ -179,7 +179,7 @@ func (s *SkillSpaceService) CreateSpace(ctx context.Context, userID string, req
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
}
- if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, permission.Subject{UserID: userID}, "file", permission.ActionWrite); err != nil {
+ if err := permission.NewDatabaseChecker(dao.DB).CheckFeature(ctx, "file", permission.ActionWrite); err != nil {
code, normalized := permissionresponse.NormalizeHidden(err)
return nil, code, normalized
}
@@ -295,10 +295,10 @@ func (s *SkillSpaceService) CreateSpace(ctx context.Context, userID string, req
return fmt.Errorf("failed to create space: %w", err)
}
checker := permission.NewDatabaseChecker(tx)
- if err := checker.GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindFolder, ID: folderID}); err != nil {
+ if err := checker.GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindFolder, ID: folderID}); err != nil {
return err
}
- return checker.GrantResourceOwner(ctx, permission.Subject{UserID: userID, TenantID: tenantID}, permission.ResourceRef{Kind: permission.ResourceKindSkillSpace, ID: spaceID})
+ return checker.GrantResourceOwner(ctx, permission.ResourceRef{Kind: permission.ResourceKindSkillSpace, ID: spaceID})
}); err != nil {
common.Error("Failed to create skill space", err)
return nil, common.CodeOperatingError, err
@@ -325,7 +325,7 @@ func (s *SkillSpaceService) CreateSpace(ctx context.Context, userID string, req
// ListSpaces lists skill spaces the caller can read.
func (s *SkillSpaceService) ListSpaces(ctx context.Context, userID string) (map[string]interface{}, common.ErrorCode, error) {
- spaceScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.Subject{UserID: userID}, permission.ScopeQuery{
+ spaceScope, err := permission.NewDatabaseChecker(dao.DB).Scope(ctx, permission.ScopeQuery{
Kind: permission.ResourceKindSkillSpace,
Operation: permission.OperationRead,
})
@@ -554,12 +554,13 @@ func (s *SkillSpaceService) asyncDeleteSpace(ctx context.Context, spaceID, folde
default:
ctxFS, cancelFS := context.WithTimeout(ctx, 60*time.Second)
defer cancelFS()
- err := s.fileService.DeleteFiles(ctxFS, actingUserID, []string{folderID})
+ ctxFS = permission.WithIdentity(ctxFS, actingUserID, tenantID)
+ err := s.fileService.DeleteFiles(ctxFS, []string{folderID})
if err != nil {
common.Error(fmt.Sprintf("Failed to delete space folder via Go FileService during async delete, spaceID=%s, error=%v", spaceID, err), nil)
// Retry once with a delay (same ctxFS, still valid)
time.Sleep(5 * time.Second)
- if retryErr := s.fileService.DeleteFiles(ctxFS, actingUserID, []string{folderID}); retryErr != nil {
+ if retryErr := s.fileService.DeleteFiles(ctxFS, []string{folderID}); retryErr != nil {
common.Error(fmt.Sprintf("Retry failed to delete space folder, marking space as deleted anyway, spaceID=%s, error=%v", spaceID, retryErr), nil)
// Mark as deleted even if folder deletion fails - orphaned folders can be cleaned up later
} else {
diff --git a/internal/service/skill_space_test.go b/internal/service/skill_space_test.go
index 1afc340242..fbe8ed21d1 100644
--- a/internal/service/skill_space_test.go
+++ b/internal/service/skill_space_test.go
@@ -330,7 +330,8 @@ func TestDeleteSpaceRestartsCleanupLeftInTheDeletingState(t *testing.T) {
t.Fatalf("create space: %v", err)
}
- code, err := NewSkillSpaceService(nil).DeleteSpace(context.Background(), "owner-1", space.ID, nil)
+ ctx := permission.WithIdentity(context.Background(), "owner-1", "tenant-1")
+ code, err := NewSkillSpaceService(nil).DeleteSpace(ctx, "owner-1", space.ID, nil)
if err != nil || code != common.CodeSuccess {
t.Fatalf("DeleteSpace = (%v, %v), want success", code, err)
}
diff --git a/internal/service/tenant.go b/internal/service/tenant.go
index f5f3414928..759dffcfee 100644
--- a/internal/service/tenant.go
+++ b/internal/service/tenant.go
@@ -60,7 +60,7 @@ func tenantMemberPermission(ctx context.Context, db *gorm.DB, userID, tenantID s
requirement = permission.TenantOwner
}
checker := permission.NewDatabaseChecker(db)
- if err := checker.CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, requirement); err != nil {
+ if err := checker.CheckTenant(ctx, tenantID, requirement); err != nil {
return nil, 0, err
}
var communityMembership entity.UserTenant
diff --git a/internal/service/tenant_context.go b/internal/service/tenant_context.go
index 31750e8d9b..a7d5e543fc 100644
--- a/internal/service/tenant_context.go
+++ b/internal/service/tenant_context.go
@@ -27,16 +27,18 @@ func requireCurrentTenantID(ctx context.Context, userID string) (string, error)
if strings.TrimSpace(userID) == "" {
return "", permission.ErrUnauthenticated
}
- if subject, ok := permission.SubjectFromContext(ctx); ok {
- if subject.UserID != "" && subject.UserID != userID {
- return "", permission.ErrInvalidSubject
+ contextUserID := strings.TrimSpace(permission.UserIDFromContext(ctx))
+ if contextUserID != "" && contextUserID != userID {
+ return "", permission.ErrIdentityMismatch
+ }
+ if tenantID := strings.TrimSpace(permission.TenantIDFromContext(ctx)); tenantID != "" {
+ if contextUserID == "" {
+ ctx = permission.WithIdentity(ctx, userID, tenantID)
}
- if tenantID := strings.TrimSpace(subject.TenantID); tenantID != "" {
- if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, permission.TenantMember); err != nil {
- return "", err
- }
- return tenantID, nil
+ if err := permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, tenantID, permission.TenantMember); err != nil {
+ return "", err
}
+ return tenantID, nil
}
tenantID, handled, err := resolveDefaultTenantIDEE(ctx, userID)
if err != nil {
diff --git a/internal/service/tenant_test.go b/internal/service/tenant_test.go
index 1e50ef1927..0ec3d64dcd 100644
--- a/internal/service/tenant_test.go
+++ b/internal/service/tenant_test.go
@@ -26,6 +26,7 @@ import (
"ragflow/internal/dao"
"ragflow/internal/entity"
"ragflow/internal/entity/models"
+ "ragflow/internal/permission"
)
func setupTenantPermissionTestDB(t *testing.T) *gorm.DB {
@@ -59,7 +60,7 @@ func TestListMembersAuthCheck(t *testing.T) {
seedTenantMembership(t, db, "member", "user-abc", "tenant-xyz", "normal")
seedTenantMembership(t, db, "owner", "owner-user", "tenant-xyz", "owner")
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "user-abc", "tenant-xyz")
_, code, err := s.ListMembers(ctx, "user-abc", "tenant-xyz")
if err == nil {
t.Fatal("expected error for non-owner, got nil")
@@ -75,7 +76,7 @@ func TestAddMemberAuthCheck(t *testing.T) {
seedTenantMembership(t, db, "member", "user-abc", "tenant-xyz", "normal")
seedTenantMembership(t, db, "owner", "owner-user", "tenant-xyz", "owner")
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "user-abc", "tenant-xyz")
_, code, err := s.AddMember(ctx, "user-abc", "tenant-xyz", &AddMemberRequest{Email: "[email protected]"})
if err == nil {
t.Fatal("expected error for non-owner, got nil")
@@ -90,7 +91,7 @@ func TestAddMemberEmailRequired(t *testing.T) {
db := setupTenantPermissionTestDB(t)
seedTenantMembership(t, db, "owner", "owner-user", "tenant-xyz", "owner")
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "owner-user", "tenant-xyz")
_, code, err := s.AddMember(ctx, "owner-user", "tenant-xyz", &AddMemberRequest{Email: ""})
if err == nil {
t.Fatal("expected error for empty email, got nil")
@@ -105,7 +106,7 @@ func TestRemoveMemberAuthCheck(t *testing.T) {
db := setupTenantPermissionTestDB(t)
seedTenantMembership(t, db, "owner", "owner-user", "tenant-xyz", "owner")
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "user-abc", "tenant-xyz")
code, err := s.RemoveMember(ctx, "user-abc", "tenant-xyz", "user-def")
if err == nil {
t.Fatal("expected error, got nil")
@@ -120,7 +121,7 @@ func TestRemoveMemberSelfAllowed(t *testing.T) {
db := setupTenantPermissionTestDB(t)
seedTenantMembership(t, db, "member", "user-abc", "tenant-xyz", "normal")
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- ctx := t.Context()
+ ctx := permission.WithIdentity(t.Context(), "user-abc", "tenant-xyz")
code, err := s.RemoveMember(ctx, "user-abc", "tenant-xyz", "user-abc")
if code != common.CodeSuccess {
t.Errorf("expected CodeSuccess, got %v: %v", code, err)
@@ -145,7 +146,7 @@ func TestDeclineOwnTenantInviteAllowed(t *testing.T) {
}
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- code, err := s.RemoveMember(t.Context(), "invitee-user", "tenant-xyz", "invitee-user")
+ code, err := s.RemoveMember(permission.WithIdentity(t.Context(), "invitee-user", "tenant-xyz"), "invitee-user", "tenant-xyz", "invitee-user")
if err != nil || code != common.CodeSuccess {
t.Fatalf("RemoveMember(invitation self-decline) = (%v, %v), want success", code, err)
}
@@ -163,7 +164,7 @@ func TestRemoveMemberCannotRemoveTenantOwner(t *testing.T) {
seedTenantMembership(t, db, "owner", "owner-user", "tenant-xyz", "owner")
s := &TenantService{userTenantDAO: dao.NewUserTenantDAO()}
- code, err := s.RemoveMember(t.Context(), "owner-user", "tenant-xyz", "owner-user")
+ code, err := s.RemoveMember(permission.WithIdentity(t.Context(), "owner-user", "tenant-xyz"), "owner-user", "tenant-xyz", "owner-user")
if err == nil || code != common.CodeArgumentError {
t.Fatalf("RemoveMember(owner) = (%v, %v), want argument error", code, err)
}
diff --git a/internal/service/test_helpers_test.go b/internal/service/test_helpers_test.go
index 8900e5d25f..04fb5cb184 100644
--- a/internal/service/test_helpers_test.go
+++ b/internal/service/test_helpers_test.go
@@ -129,7 +129,7 @@ func serviceTestContext(t *testing.T, userID, tenantID string, additionalMemberI
}
}
}
- return permission.WithSubject(t.Context(), permission.Subject{UserID: userID, TenantID: tenantID})
+ return permission.WithIdentity(t.Context(), userID, tenantID)
}
func getAPIConversationForTest(t *testing.T, db *gorm.DB, id string) *entity.API4Conversation {