Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions openrag/services/orchestrators/indexing_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from pathlib import Path
from typing import TYPE_CHECKING, Any

from core.utils.exceptions import PartitionNotFoundError, ValidationError
from core.utils.exceptions import AuthError, PartitionNotFoundError, ValidationError
from core.utils.filename import extract_temporal_fields
from core.utils.logging import get_logger
from core.utils.partition_limits import max_partitions_for_user
Expand Down Expand Up @@ -123,7 +123,10 @@ async def _ensure_editor_access_after_create_race(self, partition: str, user: di
members = await self._partition_service.list_members(partition)
membership = next((m for m in members if m.get("user_id") == user.get("id")), None)
if membership is None or _ROLE_HIERARCHY.get(membership.get("role", ""), 0) < _ROLE_HIERARCHY["editor"]:
raise PermissionError(f"Editor role required for partition: {partition}")
# AuthError (status 403) so the global handler returns a clean
# Forbidden; a builtin PermissionError would fall through to the
# catch-all handler and surface as a 500.
raise AuthError(f"Editor role required for partition: {partition}")

def _resolve_indexation_dispatch_config(self, partition: str) -> tuple[dict | None, str | None]:
partitions = self._partition_configs()
Expand Down
6 changes: 4 additions & 2 deletions tests/unit/services/orchestrators/test_indexing_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from core.config.indexation_pipeline import IndexationPipelineConfig
from core.config.retrieval_pipeline import RetrievalPipelineConfig
from core.models.preset import PartitionConfig
from core.utils.exceptions import PartitionNotFoundError, ValidationError
from core.utils.exceptions import AuthError, PartitionNotFoundError, ValidationError
from services.orchestrators.indexing_service import IndexingService


Expand Down Expand Up @@ -418,7 +418,7 @@ async def test_add_file_rejects_partition_exists_race_without_membership(tmp_pat
psvc = RaceLostPartitionService(config, grant_owner=False)
svc = _service(disp=disp, config=config, partition_service=psvc)

with pytest.raises(PermissionError, match="Editor role required"):
with pytest.raises(AuthError, match="Editor role required") as exc_info:
await svc.add_file(
file_path=str(f),
file_id="f1",
Expand All @@ -429,6 +429,8 @@ async def test_add_file_rejects_partition_exists_race_without_membership(tmp_pat
user={"id": 7},
)

# Maps to a clean 403 Forbidden, not the catch-all 500.
assert exc_info.value.status_code == 403
assert disp.dispatched == []


Expand Down
Loading