improve check

fractal-analytics-platform · Sep 24, 2024 · 43ca6aa · 43ca6aa
1 parent 77e45e5
commit 43ca6aa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/fractal_server/app/routes/api/v1/_aux_functions.py b/fractal_server/app/routes/api/v1/_aux_functions.py
@@ -368,8 +368,11 @@ async def _get_task_check_owner(
                 ),
             )
         else:
-            verify_user_has_settings(user)
-            owner = user.username or user.settings.slurm_user
+            if user.username:
+                owner = user.username
+            else:
+                verify_user_has_settings(user)
+                owner = user.settings.slurm_user
             if owner != task.owner:
                 raise HTTPException(
                     status_code=status.HTTP_403_FORBIDDEN,

diff --git a/fractal_server/app/routes/api/v2/_aux_functions.py b/fractal_server/app/routes/api/v2/_aux_functions.py
@@ -363,8 +363,11 @@ async def _get_task_check_owner(
                 ),
             )
         else:
-            verify_user_has_settings(user)
-            owner = user.username or user.settings.slurm_user
+            if user.username:
+                owner = user.username
+            else:
+                verify_user_has_settings(user)
+                owner = user.settings.slurm_user
             if owner != task.owner:
                 raise HTTPException(
                     status_code=status.HTTP_403_FORBIDDEN,

diff --git a/fractal_server/app/routes/api/v2/task_collection_custom.py b/fractal_server/app/routes/api/v2/task_collection_custom.py
@@ -113,8 +113,11 @@ async def collect_task_custom(
         package_root = Path(task_collect.package_root)
 
     # Set task.owner attribute
-    verify_user_has_settings(user)
-    owner = user.username or user.settings.slurm_user
+    if user.username:
+        owner = user.username
+    else:
+        verify_user_has_settings(user)
+        owner = user.settings.slurm_user
     if owner is None:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,