girder 5.0.20.dev10__tar.gz → 5.0.21.dev4__tar.gz

{girder-5.0.20.dev10 → girder-5.0.21.dev4}/.circleci/publish_npm.sh

@@ -3,9 +3,9 @@ set -e
 # Publish npm packages for selected locations
 # NPM_AUTH_TOKEN must be set by the build environment
 
-export NPM_CONFIG_PREFIX="$HOME/.npm-global"
+export npm_config_prefix="$HOME/.npm-global"
 npm install -g 'npm@^11.5.1'
-export PATH="$NPM_CONFIG_PREFIX/bin:$PATH"
+export PATH="$npm_config_prefix/bin:$PATH"
 hash -r
 npm --version
 

{girder-5.0.20.dev10/girder.egg-info → girder-5.0.21.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.20.dev10
+Version: 5.0.21.dev4
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.20.dev10 → girder-5.0.21.dev4}/girder/api/v1/resource.py

@@ -15,6 +15,13 @@ from ..rest import setContentDisposition, setResponseHeader
 # Plugins can modify this set to allow other types to be searched
 allowedSearchTypes = {'collection', 'file', 'folder', 'group', 'item', 'user'}
 allowedDeleteTypes = {'collection', 'file', 'folder', 'group', 'item', 'user'}
+# The access level and token scope needed to delete each type, matching the
+# type-specific delete endpoints.  Types not listed require admin access and
+# the DATA_OWN scope.
+_deleteTypeAccess = {
+    'file': (AccessType.WRITE, TokenScope.DATA_WRITE),
+    'item': (AccessType.WRITE, TokenScope.DATA_WRITE),
+}
 
 
 class Resource(BaseResource):
@@ -183,7 +190,7 @@ class Resource(BaseResource):
             yield zip.footer()
         return stream
 
-    @access.user(scope=TokenScope.DATA_OWN)
+    @access.user(scope=TokenScope.DATA_WRITE)
     @autoDescribeRoute(
         Description('Delete a set of items, folders, or other resources.')
         .jsonParam('resources', 'A JSON-encoded set of resources to delete. Each '
@@ -195,11 +202,14 @@ class Resource(BaseResource):
         .errorResponse('Invalid resources format.')
         .errorResponse('No resources specified.')
         .errorResponse('Resource not found.')
-        .errorResponse('Admin access was denied for a resource.', 403)
+        .errorResponse('Write or admin access was denied for a resource.', 403)
     )
     def delete(self, resources, progress):
         user = self.getCurrentUser()
         self._validateResourceSet(resources, allowedDeleteTypes)
+        for kind in resources:
+            self.ensureTokenScopes(_deleteTypeAccess.get(
+                kind, (AccessType.ADMIN, TokenScope.DATA_OWN))[1])
         total = sum([len(resources[key]) for key in resources])
         with ProgressContext(
                 progress, user=user, title='Deleting resources',
@@ -208,8 +218,9 @@ class Resource(BaseResource):
             current = 0
             for kind in resources:
                 model = self._getResourceModel(kind, 'remove')
+                level = _deleteTypeAccess.get(kind, (AccessType.ADMIN, TokenScope.DATA_OWN))[0]
                 for id in resources[kind]:
-                    doc = model.load(id=id, user=user, level=AccessType.ADMIN, exc=True)
+                    doc = model.load(id=id, user=user, level=level, exc=True)
 
                     # Don't do a subtree count if we weren't asked for progress
                     if progress:

{girder-5.0.20.dev10 → girder-5.0.21.dev4/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.20.dev10
+Version: 5.0.21.dev4
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.20.dev10 → girder-5.0.21.dev4}/girder.egg-info/scm_file_list.json

@@ -1065,6 +1065,7 @@
     "test/test_path_utilities.py",
     "test/test_plugin_registry.py",
     "test/test_position_endpoint.py",
+    "test/test_resource.py",
     "test/test_rest_exception_handling.py",
     "test/test_rest_utils.py",
     "test/test_settings.py",
@@ -1080,6 +1081,7 @@
     "test/worker/test_check_local_worker.py",
     "test/worker/test_docker_io.py",
     "test/worker/test_docker_nvidia.py",
+    "test/worker/test_docker_tasks.py",
     "test/worker/test_docker_transforms.py",
     "test/worker/test_girder_plugin.py",
     "test/worker/test_utils.py",

girder-5.0.21.dev4/girder.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.0.20",
+  "distance": 4,
+  "node": "g0d5fe405ad1504f475b3860f7b2302e68110c8d7",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-10-26"
+}

girder-5.0.20.dev10/girder.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.0.19",
-  "distance": 10,
-  "node": "g102caf3130742541e561c8c6c9401eee79fe1c78",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-10-23"
-}