accerrrightserror now points to the file which does not have access

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_storage/export_data_async_jobs.py

@@ -15,5 +15,5 @@ class InvalidFileIdentifierError(StorageRpcBaseError):
 
 class AccessRightError(StorageRpcBaseError):
     msg_template: str = (
-        "User {user_id} does not have access to one or multiple files in {paths_to_download} with location {location_id}"
+        "User {user_id} does not have access to file {file_id} with location {location_id}"
     )

services/storage/src/simcore_service_storage/api/_worker_tasks/_simcore_s3.py

@@ -4,15 +4,13 @@
 
 from aws_library.s3._models import S3ObjectKey
 from celery import Task  # type: ignore[import-untyped]
-from models_library.api_schemas_storage.export_data_async_jobs import AccessRightError
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
 from models_library.progress_bar import ProgressReport
 from models_library.projects_nodes_io import StorageFileID
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from servicelib.logging_utils import log_context
 from servicelib.progress_bar import ProgressBarData
-from simcore_service_storage.exceptions.errors import ProjectAccessRightError
 
 from ...dsm import get_dsm_provider
 from ...modules.celery.models import TaskID, TaskId
@@ -69,6 +67,9 @@ async def export_data(
     user_id: UserID,
     paths_to_export: list[S3ObjectKey],
 ) -> StorageFileID:
+    """
+    AccessRightError: in case user can't access project
+    """
     with log_context(
         _logger,
         logging.INFO,
@@ -94,13 +95,6 @@ async def _progress_cb(report: ProgressReport) -> None:
             description=f"'{task_id}' export data",
             progress_report_cb=_progress_cb,
         ) as progress_bar:
-            try:
-                return await dsm.create_s3_export(
-                    user_id, paths_to_export, progress_bar=progress_bar
-                )
-            except ProjectAccessRightError as err:
-                raise AccessRightError(
-                    user_id=user_id,
-                    paths_to_download=paths_to_export,
-                    location_id=SimcoreS3DataManager.get_location_id(),
-                ) from err
+            return await dsm.create_s3_export(
+                user_id, paths_to_export, progress_bar=progress_bar
+            )

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -19,6 +19,7 @@
 )
 from aws_library.s3._models import S3ObjectKey
 from fastapi import FastAPI
+from models_library.api_schemas_storage.export_data_async_jobs import AccessRightError
 from models_library.api_schemas_storage.storage_schemas import (
     UNDEFINED_SIZE,
     UNDEFINED_SIZE_TYPE,
@@ -1256,12 +1257,21 @@ async def create_s3_export(
             with contextlib.suppress(ValueError):
                 project_id = ProjectID(Path(object_key).parts[0])
 
-            accessible_projects_ids = await get_accessible_project_ids(
-                get_db_engine(self.app), user_id=user_id, project_id=project_id
-            )
+            try:
+                accessible_projects_ids = await get_accessible_project_ids(
+                    get_db_engine(self.app), user_id=user_id, project_id=project_id
+                )
+            except ProjectAccessRightError as err:
+                raise AccessRightError(
+                    user_id=user_id,
+                    file_id=object_key,
+                    location_id=SimcoreS3DataManager.get_location_id(),
+                ) from err
             if project_id is None or project_id not in accessible_projects_ids:
-                raise ProjectAccessRightError(
-                    access_right="read", project_id=project_id
+                raise AccessRightError(
+                    user_id=user_id,
+                    file_id=object_key,
+                    location_id=SimcoreS3DataManager.get_location_id(),
                 )
 
         for object_key in object_keys: