Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(api): enforce dataset service API token scope (#44840)

Guishi Wangb5722ed5572c
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index 18a77dcaea6..582d2e1e62b 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -47,6 +47,7 @@ from models.account import Account
from models.dataset import DatasetPermissionEnum
from models.enums import TagType
from models.provider_ids import ModelProviderID
+from services.auth.resource_access_token_contracts import DatasetServiceApiGrant
from services.enterprise import rbac_service as enterprise_rbac_service
from services.knowledge.dataset_read_service import load_dataset_detail, load_dataset_details
from services.knowledge.dataset_service import DatasetPermissionService, DatasetService, DocumentService
@@ -433,7 +434,13 @@ class DatasetListApi(DatasetApiResource):
service_api_ns.models[DatasetListResponse.__name__],
)
@with_session(write=False)
- def get(self, session: Session, tenant_id):
+ def get(
+ self,
+ session: Session,
+ tenant_id,
+ *,
+ dataset_grant: DatasetServiceApiGrant,
+ ):
"""Resource for getting datasets."""
query_params: dict[str, str | list[str]] = dict(request.args.to_dict())
if "tag_ids" in request.args:
@@ -452,6 +459,7 @@ class DatasetListApi(DatasetApiResource):
query.tag_ids,
query.include_all,
tags=application_services().tags,
+ service_api_grant=dataset_grant,
)
# check embedding setting
assert isinstance(current_user, Account)
diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py
index 08769351a4d..33ab171a408 100644
--- a/api/controllers/service_api/wraps.py
+++ b/api/controllers/service_api/wraps.py
@@ -40,7 +40,7 @@ from services.api_token_service import (
record_token_usage,
)
from services.app_service import AppService
-from services.auth.resource_access_token_contracts import is_resource_access_token
+from services.auth.resource_access_token_contracts import DatasetServiceApiGrant, is_resource_access_token
from services.feature_service import FeatureService
from services.knowledge_rate_limit_service import KnowledgeRateLimitExceededError, enforce_knowledge_rate_limit
@@ -330,12 +330,14 @@ def cloud_edition_billing_rate_limit_check[**P, R](
def validate_dataset_token[R](view: Callable[..., R]) -> Callable[..., R]:
+ view_parameters = inspect.signature(view).parameters
positional_parameters = [
parameter
- for parameter in inspect.signature(view).parameters.values()
+ for parameter in view_parameters.values()
if parameter.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)
]
expects_bound_instance = bool(positional_parameters and positional_parameters[0].name in {"self", "cls"})
+ accepts_dataset_grant = "dataset_grant" in view_parameters
@wraps(view)
def decorated(*args: object, **kwargs: object) -> R:
@@ -354,10 +356,11 @@ def validate_dataset_token[R](view: Callable[..., R]) -> Callable[..., R]:
auth_token = peek_service_api_bearer_token()
if auth_token and is_resource_access_token(auth_token):
with resource_access_token_errors():
- tenant_id = application_services().resource_access_tokens.resolve_tenant_for_dataset_service_api(
+ dataset_grant = application_services().resource_access_tokens.resolve_datasets_for_service_api(
token=auth_token,
dataset_id=str(dataset_id) if dataset_id else None,
)
+ tenant_id = dataset_grant.tenant_id
else:
api_token = validate_and_get_api_token("dataset")
tenant_id = api_token.tenant_id
@@ -381,6 +384,11 @@ def validate_dataset_token[R](view: Callable[..., R]) -> Callable[..., R]:
raise Unauthorized("API key is no longer valid.")
if not scope.allows_dataset(str(dataset_id) if dataset_id else None):
raise Forbidden("The API key is not authorized to access this knowledge base.")
+ dataset_grant = DatasetServiceApiGrant(
+ token_id=str(api_token.id),
+ tenant_id=tenant_id,
+ dataset_ids=None,
+ )
if dataset_id:
dataset_id = str(dataset_id)
@@ -418,6 +426,9 @@ def validate_dataset_token[R](view: Callable[..., R]) -> Callable[..., R]:
else:
raise Unauthorized("Tenant does not exist.")
+ if accepts_dataset_grant:
+ kwargs["dataset_grant"] = dataset_grant
+
if expects_bound_instance:
if not args:
raise TypeError("validate_dataset_token expected a bound resource instance.")
diff --git a/api/services/auth/resource_access_token_contracts.py b/api/services/auth/resource_access_token_contracts.py
index 68f60f73592..e4963b663df 100644
--- a/api/services/auth/resource_access_token_contracts.py
+++ b/api/services/auth/resource_access_token_contracts.py
@@ -57,6 +57,19 @@ class ResourceAccessTokenGrant:
app_ids: frozenset[str]
+@dataclass(frozen=True, slots=True)
+class DatasetServiceApiGrant:
+ """Authorized Dataset Service API scope.
+
+ ``dataset_ids=None`` denotes an unrestricted legacy workspace key. A
+ concrete set is always a hard resource boundary.
+ """
+
+ token_id: str
+ tenant_id: str
+ dataset_ids: frozenset[str] | None
+
+
class ResourceAccessTokenInputError(Exception):
pass
diff --git a/api/services/knowledge/dataset_service.py b/api/services/knowledge/dataset_service.py
index 420c86f6c58..4e30880da7a 100644
--- a/api/services/knowledge/dataset_service.py
+++ b/api/services/knowledge/dataset_service.py
@@ -68,6 +68,7 @@ from models.workflow import Workflow
from repositories.knowledge import dataset_api_key_bindings
from repositories.knowledge.dataset_read_repository import get_dataset_doc_form, get_latest_dataset_process_rule
from repositories.knowledge.segment_repository import query_child_chunks
+from services.auth.resource_access_token_contracts import DatasetServiceApiGrant
from services.document_indexing_proxy.document_indexing_task_proxy import DocumentIndexingTaskProxy
from services.document_indexing_proxy.duplicate_document_indexing_task_proxy import DuplicateDocumentIndexingTaskProxy
from services.enterprise import rbac_service as enterprise_rbac_service
@@ -154,17 +155,27 @@ class DatasetService:
creator_ids: list[str] | None = None,
*,
tags: TagTargetQuery,
+ service_api_grant: DatasetServiceApiGrant | None = None,
):
- """Return visible datasets for a tenant using the injected read session."""
+ """Return datasets under account or Dataset Service API visibility.
+
+ Service API callers skip account ACLs while retaining the tenant boundary.
+ A resource-scoped grant further restricts the query to its authorized IDs.
+ """
query = select(Dataset).where(Dataset.tenant_id == tenant_id).order_by(Dataset.created_at.desc(), Dataset.id)
- if dify_config.RBAC_ENABLED and accessible_dataset_ids is not None:
+ if service_api_grant is not None:
+ if service_api_grant.tenant_id != tenant_id:
+ raise ValueError("Dataset Service API grant does not match the requested workspace.")
+ if service_api_grant.dataset_ids is not None:
+ query = query.where(Dataset.id.in_(service_api_grant.dataset_ids))
+ elif dify_config.RBAC_ENABLED and accessible_dataset_ids is not None:
accessible_filter: ColumnElement[bool] = Dataset.id.in_(accessible_dataset_ids)
if user:
accessible_filter = sa.or_(Dataset.maintainer == user.id, accessible_filter)
query = query.where(accessible_filter)
- if user:
+ if service_api_grant is None and user:
# get permitted dataset ids
dataset_permission = session.scalars(
select(DatasetPermission).where(
@@ -217,7 +228,7 @@ class DatasetService:
),
)
)
- else:
+ elif service_api_grant is None:
if dify_config.RBAC_ENABLED:
# Without an account we cannot resolve RBAC resource visibility.
query = query.where(sa.false())
diff --git a/api/services/resource_access_token_service.py b/api/services/resource_access_token_service.py
index d7f7d45ccd5..c6a4406b3fc 100644
--- a/api/services/resource_access_token_service.py
+++ b/api/services/resource_access_token_service.py
@@ -5,6 +5,7 @@ from typing import Protocol
from constants.resource_access_token import ResourceAccessTokenResourceType
from machinery.context import RequestContext
from services.auth.resource_access_token_contracts import (
+ DatasetServiceApiGrant,
ResourceAccessTokenAccess,
ResourceAccessTokenCreateResult,
ResourceAccessTokenForbiddenError,
@@ -116,18 +117,34 @@ class ResourceAccessTokenService:
self._tokens.record_usage(access.tenant_id, access.token_id)
return ResourceAccessTokenGrant(access.token_id, access.tenant_id, frozenset({apps[0].id}))
- def resolve_tenant_for_dataset_service_api(self, *, token: str, dataset_id: str | None) -> str:
- """With no dataset id, authorize the collection route using any knowledge binding."""
+ def resolve_datasets_for_service_api(self, *, token: str, dataset_id: str | None) -> DatasetServiceApiGrant:
+ """Resolve the enabled knowledge bases a resource token may reach.
+
+ Collection routes receive every live knowledge binding so their queries can
+ stay within the token's resource scope. Resource routes receive exactly the
+ requested binding.
+ """
access = self._tokens.access_by_secret(token)
- if not any(
- r.type == ResourceAccessTokenResourceType.KNOWLEDGE and (not dataset_id or r.id == dataset_id)
+ if not access.workspace_active:
+ raise ResourceAccessTokenForbiddenError("workspace unavailable")
+ datasets = tuple(
+ r
for r in access.resources
- ):
+ if r.type == ResourceAccessTokenResourceType.KNOWLEDGE
+ and r.exists
+ and r.enabled
+ and (not dataset_id or r.id == dataset_id)
+ )
+ if not datasets:
raise ResourceAccessTokenForbiddenError(
"Resource access token is not allowed to access this knowledge base."
)
self._tokens.record_usage(access.tenant_id, access.token_id)
- return access.tenant_id
+ return DatasetServiceApiGrant(
+ token_id=access.token_id,
+ tenant_id=access.tenant_id,
+ dataset_ids=frozenset(dataset.id for dataset in datasets),
+ )
@staticmethod
def _normalize_name(name: str) -> str:
diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_dataset.py b/api/tests/unit_tests/controllers/service_api/dataset/test_dataset.py
index c27294cdd04..b8e671c3da9 100644
--- a/api/tests/unit_tests/controllers/service_api/dataset/test_dataset.py
+++ b/api/tests/unit_tests/controllers/service_api/dataset/test_dataset.py
@@ -27,6 +27,7 @@ from models.account import Account, Tenant, TenantAccountRole
from models.dataset import AppDatasetJoin, Dataset, DatasetMetadata, DatasetPermissionEnum, Document
from models.enums import PermissionEnum, TagType
from models.model import App, Tag, TagBinding
+from services.auth.resource_access_token_contracts import DatasetServiceApiGrant
"""Unit tests for Service API dataset controller behavior.
@@ -95,6 +96,10 @@ def make_dataset(
return dataset
+def make_dataset_service_grant(tenant_id: str, dataset_ids: frozenset[str] | None = None) -> DatasetServiceApiGrant:
+ return DatasetServiceApiGrant(token_id="test-token", tenant_id=tenant_id, dataset_ids=dataset_ids)
+
+
DATASET_DETAIL_KEYS = {
"id",
"name",
@@ -229,7 +234,12 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?page=1&limit=20", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert set(response) == {"data", "has_more", "limit", "total", "page"}
@@ -258,11 +268,18 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?tag_ids=tag-a&tag_ids=tag-b", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ dataset_grant = make_dataset_service_grant(tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=dataset_grant,
+ )
page, limit, session, tenant_id, user, keyword, tag_ids, include_all = (
mock_dataset_svc.get_datasets.call_args.args
)
assert user is account
+ assert mock_dataset_svc.get_datasets.call_args.kwargs["service_api_grant"] is dataset_grant
assert status == 200
assert response["total"] == 1
@@ -276,6 +293,37 @@ class TestDatasetApisCases:
False,
)
+ @patch("controllers.service_api.dataset.dataset.create_plugin_provider_manager")
+ @patch("controllers.service_api.dataset.dataset.DatasetService")
+ def test_list_datasets_preserves_resource_token_scope(
+ self,
+ mock_dataset_svc: MagicMock,
+ mock_provider_mgr: MagicMock,
+ app: Flask,
+ account: Account,
+ tenant: Tenant,
+ controller_session: Session,
+ ) -> None:
+ from controllers.service_api.dataset.dataset import DatasetListApi
+
+ mock_dataset_svc.get_datasets.return_value = ([make_dataset(controller_session, tenant, account)], 1)
+ mock_provider_mgr.return_value.get_configurations.return_value.get_models.return_value = list[object]()
+
+ with app.test_request_context("/datasets", method="GET"):
+ api = DatasetListApi()
+ dataset_grant = make_dataset_service_grant(
+ tenant.id,
+ frozenset({"dataset-a", "dataset-b"}),
+ )
+ unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=dataset_grant,
+ )
+
+ assert mock_dataset_svc.get_datasets.call_args.kwargs["service_api_grant"] is dataset_grant
+
@patch("controllers.service_api.dataset.dataset.create_plugin_provider_manager")
@patch("controllers.service_api.dataset.dataset.DatasetService")
def test_list_datasets_has_more_false_on_last_page_exact_limit(
@@ -297,7 +345,12 @@ class TestDatasetApisCases:
with app.test_request_context(f"/datasets?page=1&limit={page_size}", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert response["has_more"] is False
@@ -327,7 +380,12 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?page=1&limit=200", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert response["has_more"] is True
@@ -357,7 +415,12 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?page=1&limit=0", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert response["limit"] == 1
@@ -385,7 +448,12 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?page=8&limit=0", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert response["has_more"] is False
@@ -414,7 +482,12 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?page=1&limit=-1", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert response["limit"] == 1
@@ -442,7 +515,12 @@ class TestDatasetApisCases:
with app.test_request_context("/datasets?page=0&limit=20", method="GET"):
api = DatasetListApi()
- response, status = unwrap(api.get)(api, controller_session, tenant_id=tenant.id)
+ response, status = unwrap(api.get)(
+ api,
+ controller_session,
+ tenant_id=tenant.id,
+ dataset_grant=make_dataset_service_grant(tenant.id),
+ )
assert status == 200
assert response["page"] == 1
diff --git a/api/tests/unit_tests/controllers/service_api/test_wraps.py b/api/tests/unit_tests/controllers/service_api/test_wraps.py
index 856e186f75d..785db646281 100644
--- a/api/tests/unit_tests/controllers/service_api/test_wraps.py
+++ b/api/tests/unit_tests/controllers/service_api/test_wraps.py
@@ -873,8 +873,12 @@ class TestValidateDatasetToken:
sqlite_session.commit()
@validate_dataset_token
- def protected_view(tenant_id):
- return {"success": True, "tenant_id": tenant_id}
+ def protected_view(tenant_id, dataset_grant=None):
+ return {
+ "success": True,
+ "tenant_id": tenant_id,
+ "dataset_grant": dataset_grant,
+ }
# Act
with (
@@ -886,6 +890,8 @@ class TestValidateDatasetToken:
# Assert
assert result["success"] is True
assert result["tenant_id"] == tenant.id
+ assert result["dataset_grant"].tenant_id == tenant.id
+ assert result["dataset_grant"].dataset_ids is None
assert account.current_tenant_id == tenant.id
@patch("controllers.service_api.wraps.user_logged_in")
@@ -936,8 +942,13 @@ class TestValidateDatasetToken:
sqlite_session.commit()
@validate_dataset_token
- def protected_view(tenant_id, dataset_id=None):
- return {"success": True, "tenant_id": tenant_id, "dataset_id": dataset_id}
+ def protected_view(tenant_id, dataset_id=None, dataset_grant=None):
+ return {
+ "success": True,
+ "tenant_id": tenant_id,
+ "dataset_id": dataset_id,
+ "dataset_grant": dataset_grant,
+ }
with (
app.test_request_context("/", method="GET", headers={"Authorization": f"Bearer {access_token.token}"}),
@@ -947,6 +958,7 @@ class TestValidateDatasetToken:
assert result["tenant_id"] == tenant.id
assert result["dataset_id"] == dataset.id
+ assert result["dataset_grant"].dataset_ids == frozenset({dataset.id})
sqlite_session.expire_all()
assert sqlite_session.get(ResourceAccessToken, access_token.id).last_used_at is not None
diff --git a/api/tests/unit_tests/services/knowledge/test_dataset_service.py b/api/tests/unit_tests/services/knowledge/test_dataset_service.py
index f4bd9699b25..95cf2a6d3ab 100644
--- a/api/tests/unit_tests/services/knowledge/test_dataset_service.py
+++ b/api/tests/unit_tests/services/knowledge/test_dataset_service.py
@@ -55,6 +55,7 @@ from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus, Pr
from models.model import UploadFile
from models.source import DataSourceOauthBinding
from repositories.knowledge.segment_repository import SQLAlchemySegmentRepository
+from services.auth.resource_access_token_contracts import DatasetServiceApiGrant
from services.enterprise import rbac_service
from services.entities.knowledge_entities.rag_pipeline_entities import (
IconInfo,
@@ -701,6 +702,86 @@ class TestDatasetServiceDatasetCases:
assert total == 1
assert [dataset.id for dataset in datasets] == [shared.id]
+ @pytest.mark.parametrize("rbac_enabled", [False, True])
+ def test_get_datasets_workspace_scope_skips_account_acl_and_honors_resource_scope(
+ self,
+ application_tags,
+ config_overrides: Callable[..., None],
+ sqlite_session: Session,
+ rbac_enabled: bool,
+ ) -> None:
+ user = _dataset_service_dataset_account(role=TenantAccountRole.NORMAL)
+ shared = _dataset_service_dataset_dataset(
+ dataset_id="shared", name="Shared", permission=DatasetPermissionEnum.ALL_TEAM
+ )
+ private = _dataset_service_dataset_dataset(
+ dataset_id="private",
+ name="Private",
+ maintainer="other",
+ permission=DatasetPermissionEnum.ONLY_ME,
+ )
+ partial = _dataset_service_dataset_dataset(
+ dataset_id="partial",
+ name="Partial",
+ maintainer="other",
+ permission=DatasetPermissionEnum.PARTIAL_TEAM,
+ )
+ foreign = _dataset_service_dataset_dataset(dataset_id="foreign", tenant_id="tenant-2", name="Foreign")
+ sqlite_session.add_all([shared, private, partial, foreign])
+ sqlite_session.commit()
+
+ config_overrides(RBAC_ENABLED=rbac_enabled)
+ workspace_grant = DatasetServiceApiGrant(
+ token_id="workspace-token",
+ tenant_id="tenant-1",
+ dataset_ids=None,
+ )
+ datasets, total = _dataset_service_dataset_DatasetService.get_datasets(
+ page=1,
+ per_page=20,
+ session=sqlite_session,
+ tenant_id="tenant-1",
+ user=user,
+ tags=application_tags,
+ service_api_grant=workspace_grant,
+ )
+
+ assert total == 3
+ assert {dataset.id for dataset in datasets} == {"shared", "private", "partial"}
+
+ restricted, restricted_total = _dataset_service_dataset_DatasetService.get_datasets(
+ page=1,
+ per_page=20,
+ session=sqlite_session,
+ tenant_id="tenant-1",
+ user=user,
+ include_all=True,
+ tags=application_tags,
+ service_api_grant=DatasetServiceApiGrant(
+ token_id="resource-token",
+ tenant_id="tenant-1",
+ dataset_ids=frozenset({private.id, foreign.id}),
+ ),
+ )
+
+ assert restricted_total == 1
+ assert [dataset.id for dataset in restricted] == [private.id]
+
+ with pytest.raises(ValueError, match="does not match"):
+ _dataset_service_dataset_DatasetService.get_datasets(
+ page=1,
+ per_page=20,
+ session=sqlite_session,
+ tenant_id="tenant-1",
+ user=user,
+ tags=application_tags,
+ service_api_grant=DatasetServiceApiGrant(
+ token_id="foreign-token",
+ tenant_id="tenant-2",
+ dataset_ids=None,
+ ),
+ )
+
def test_get_datasets_by_ids_intersects_requested_and_accessible_ids(
self, config_overrides: Callable[..., None], sqlite_session: Session
) -> None:
diff --git a/api/tests/unit_tests/services/test_resource_access_token_service.py b/api/tests/unit_tests/services/test_resource_access_token_service.py
index 67b4ca7f50c..17822bf9578 100644
--- a/api/tests/unit_tests/services/test_resource_access_token_service.py
+++ b/api/tests/unit_tests/services/test_resource_access_token_service.py
@@ -166,5 +166,59 @@ def test_dataset_scope_never_uses_an_app_binding(
"token", "workspace", True, (BoundResource(ResourceType.APP, "dataset", True, True),)
)
with pytest.raises(ResourceAccessTokenForbiddenError):
- service.resolve_tenant_for_dataset_service_api(token="secret", dataset_id="dataset")
+ service.resolve_datasets_for_service_api(token="secret", dataset_id="dataset")
+ assert store.usage_calls == []
+
+
+def test_dataset_collection_scope_returns_only_live_enabled_knowledge_bindings(
+ service: ResourceAccessTokenService, store: FakeResourceAccessTokenStore
+) -> None:
+ store.access = ResourceAccessTokenAccess(
+ "token",
+ "workspace",
+ True,
+ (
+ BoundResource(ResourceType.KNOWLEDGE, "allowed", True, True),
+ BoundResource(ResourceType.KNOWLEDGE, "disabled", True, False),
+ BoundResource(ResourceType.KNOWLEDGE, "deleted", False, True),
+ BoundResource(ResourceType.APP, "app", True, True),
+ ),
+ )
+
+ grant = service.resolve_datasets_for_service_api(token="secret", dataset_id=None)
+
+ assert grant.tenant_id == "workspace"
+ assert grant.dataset_ids == frozenset({"allowed"})
+ assert store.usage_calls == [("workspace", "token")]
+
+
+def test_dataset_scope_requires_the_requested_knowledge_binding(
+ service: ResourceAccessTokenService, store: FakeResourceAccessTokenStore
+) -> None:
+ store.access = ResourceAccessTokenAccess(
+ "token",
+ "workspace",
+ True,
+ (BoundResource(ResourceType.KNOWLEDGE, "allowed", True, True),),
+ )
+
+ with pytest.raises(ResourceAccessTokenForbiddenError):
+ service.resolve_datasets_for_service_api(token="secret", dataset_id="other")
+
+ assert store.usage_calls == []
+
+
+def test_dataset_scope_rejects_inactive_workspace_without_recording_usage(
+ service: ResourceAccessTokenService, store: FakeResourceAccessTokenStore
+) -> None:
+ store.access = ResourceAccessTokenAccess(
+ "token",
+ "workspace",
+ False,
+ (BoundResource(ResourceType.KNOWLEDGE, "dataset", True, True),),
+ )
+
+ with pytest.raises(ResourceAccessTokenForbiddenError, match="workspace unavailable"):
+ service.resolve_datasets_for_service_api(token="secret", dataset_id=None)
+
assert store.usage_calls == []