girder-large-image 1.35.5.dev2__tar.gz → 1.35.5.dev4__tar.gz

{girder_large_image-1.35.5.dev2 → girder_large_image-1.35.5.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-large-image
-Version: 1.35.5.dev2
+Version: 1.35.5.dev4
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,9 +19,9 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: girder<5,>=3.1.18
 Requires-Dist: girder-jobs<5,>=3.0.3
-Requires-Dist: large_image>=1.35.5.dev2
+Requires-Dist: large_image>=1.35.5.dev4
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.35.5.dev2; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.35.5.dev4; extra == "tasks"
 Requires-Dist: girder-worker[girder]<5,>=0.6.0; extra == "tasks"
 Dynamic: author
 Dynamic: author-email

{girder_large_image-1.35.5.dev2 → girder_large_image-1.35.5.dev4}/girder_large_image/__init__.py

@@ -596,9 +596,13 @@ def yamlConfigFile(folder, name, user):
     """
     addConfig = None
     last = False
+    isGlobalConfig = False
     while folder:
         item = Item().findOne({'folderId': folder['_id'], 'name': name})
-        if item:
+        # If the user can't access the folder and it is not a global config mechanism,
+        # skip this folder. Keep walking up the chain to merge other publically available
+        # configuration in the hierarchy.
+        if item and (isGlobalConfig or Folder().hasAccess(folder, user, AccessType.READ)):
             for file in Item().childFiles(item):
                 if file['size'] > 10 * 1024 ** 2:
                     logger.info('Not loading %s -- too large', file['name'])
@@ -627,6 +631,7 @@ def yamlConfigFile(folder, name, user):
                     'parentId': folder['parentId'],
                     'parentCollection': folder['parentCollection'],
                     'name': '.config'})
+                isGlobalConfig = True
             else:
                 last = 'setting'
             if not folder or last == 'setting':
@@ -635,8 +640,10 @@ def yamlConfigFile(folder, name, user):
                     break
                 folder = Folder().load(folderId, force=True)
                 last = True
+                isGlobalConfig = True
         else:
-            folder = Folder().load(folder['parentId'], user=user, level=AccessType.READ)
+            folder = Folder().load(folder['parentId'], force=True)
+            isGlobalConfig = False
 
     addConfig = {} if addConfig is None else addConfig
     addSettingsToConfig(addConfig, user, name)

{girder_large_image-1.35.5.dev2 → girder_large_image-1.35.5.dev4}/girder_large_image.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-large-image
-Version: 1.35.5.dev2
+Version: 1.35.5.dev4
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,9 +19,9 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: girder<5,>=3.1.18
 Requires-Dist: girder-jobs<5,>=3.0.3
-Requires-Dist: large_image>=1.35.5.dev2
+Requires-Dist: large_image>=1.35.5.dev4
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.35.5.dev2; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.35.5.dev4; extra == "tasks"
 Requires-Dist: girder-worker[girder]<5,>=0.6.0; extra == "tasks"
 Dynamic: author
 Dynamic: author-email

{girder_large_image-1.35.5.dev2 → girder_large_image-1.35.5.dev4}/girder_large_image.egg-info/requires.txt

@@ -1,7 +1,7 @@
 girder<5,>=3.1.18
 girder-jobs<5,>=3.0.3
-large_image>=1.35.5.dev2
+large_image>=1.35.5.dev4
 
 [tasks]
-large-image-tasks[girder]>=1.35.5.dev2
+large-image-tasks[girder]>=1.35.5.dev4
 girder-worker[girder]<5,>=0.6.0

{girder_large_image-1.35.5.dev2 → girder_large_image-1.35.5.dev4}/test_girder/test_large_image.py

@@ -666,6 +666,38 @@ def testYAMLConfigFileInherit(server, admin, user, fsAssetstore):
     assert resp.json['keyE'] == 'value7'
 
 
+@pytest.mark.usefixtures('unbindLargeImage')
+@pytest.mark.plugin('large_image')
+def testYAMLConfigFileSkipPrivate(server, admin, user, fsAssetstore):
+    collection = Collection().createCollection(
+        'collection A', admin, public=False)
+    colFolderA = Folder().createFolder(
+        collection, 'folder A', parentType='collection',
+        creator=admin, public=True)
+    colFolderB = Folder().createFolder(
+        colFolderA, 'folder B', parentType='folder',
+        creator=admin, public=False)
+    colFolderC = Folder().createFolder(
+        colFolderB, 'folder C', parentType='folder',
+        creator=admin, public=True)
+    # Public config
+    utilities.uploadText(
+        json.dumps({
+            'keyA': 'publicValue',
+        }), admin, fsAssetstore, colFolderA, 'sample.json',
+    )
+    # Private config
+    utilities.uploadText(
+        json.dumps({
+            'keyA': 'privateValue',
+        }), admin, fsAssetstore, colFolderB, 'sample.json',
+    )
+    resp = server.request(
+        path='/folder/%s/yaml_config/sample.json' % str(colFolderC['_id']), user=None)
+    assert utilities.respStatus(resp) == 200
+    assert resp.json['keyA'] == 'publicValue'
+
+
 @pytest.mark.singular
 @pytest.mark.usefixtures('unbindLargeImage')
 @pytest.mark.plugin('large_image')