girder-worker 0.10.2.dev4__tar.gz → 0.10.2.dev8__tar.gz

{girder-worker-0.10.2.dev4 → girder-worker-0.10.2.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-worker
-Version: 0.10.2.dev4
+Version: 0.10.2.dev8
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.

{girder-worker-0.10.2.dev4 → girder-worker-0.10.2.dev8}/girder_worker/docker/transforms/__init__.py

@@ -1,12 +1,12 @@
-import sys
-import uuid
+import abc
 import os
+import stat
+import sys
 import tempfile
-import abc
+import uuid
 
 from girder_worker_utils.transform import Transform
 
-
 TEMP_VOLUME_MOUNT_PREFIX = '/mnt/girder_worker'
 
 
@@ -130,6 +130,12 @@ class _TemporaryVolumeBase(BindMountVolume):
             # os.chmod.
             os.chmod(host_dir, mode)
         self._host_path = tempfile.mkdtemp(dir=host_dir)
+        try:
+            # this is permissive as a worker may be running as a different user
+            # and could otherwise not read or create files.
+            os.chmod(self._host_path, 0o777 | stat.S_ISGID)
+        except Exception:
+            pass
         self._container_path = os.path.join(TEMP_VOLUME_MOUNT_PREFIX, uuid.uuid4().hex)
 
 
@@ -150,7 +156,7 @@ class TemporaryVolume(_TemporaryVolumeBase, metaclass=_TemporaryVolumeMetaClass)
     """
     # Note that this mode is explicitly set with os.chmod. What you
     # set, is what you get - no os.makedirs umask shenanigans.
-    def __init__(self, host_dir=None, mode=0o755):
+    def __init__(self, host_dir=None, mode=0o777):
         super().__init__(None, None)
         self.host_dir = host_dir
         self._mode = mode

{girder-worker-0.10.2.dev4 → girder-worker-0.10.2.dev8}/girder_worker/docker/transforms/girder.py

@@ -11,6 +11,30 @@ from girder_worker_utils.transforms.girder_io import (
 from . import TemporaryVolume, Connect, NamedOutputPipe, _maybe_transform
 
 
+def setPermissions(path, dirmode=0o777, filemode=0o644):
+    """
+    Set permissions on download assets so that workers can have full read
+    access to them regardless of user.  For directories, they have full general
+    access.
+    """
+    if os.path.isfile(path):
+        try:
+            os.chmod(path, filemode)
+        except Exception:
+            pass
+    else:
+        for dirpath, _, filenames in os.walk(path):
+            try:
+                os.chmod(dirpath, dirmode)
+            except Exception:
+                pass
+            for filename in filenames:
+                try:
+                    os.chmod(os.path.join(dirpath, filename), filemode)
+                except Exception:
+                    pass
+
+
 class ProgressPipe(Transform):
     """
     This can be used to stream progress information out of a running docker container as
@@ -98,6 +122,7 @@ class GirderFileIdToVolume(GirderClientTransform):
         rel_path, self._file_path = self._create_file_path(dir)
 
         self.gc.downloadFile(self._file_id, self._file_path)
+        setPermissions(self._file_path)
 
         # Return the path inside the container
         return os.path.join(self._volume.container_path, rel_path)
@@ -155,6 +180,7 @@ class GirderFolderIdToVolume(GirderClientTransform):
         rel_path, self._folder_path = self._create_folder_path(dir)
 
         self.gc.downloadFolderRecursive(self._folder_id, self._folder_path)
+        setPermissions(self._folder_path)
 
         # Return the path inside the container
         return os.path.join(self._volume.container_path, rel_path)
@@ -201,6 +227,7 @@ class GirderItemIdToVolume(GirderClientTransform):
         rel_path, self._item_path = self._create_item_path(self._volume.host_path)
 
         self.gc.downloadItem(self._item_id, self._item_path)
+        setPermissions(self._item_path)
 
         # downloadItem always puts the item underneath the dest at its transformed name,
         # so we find where it placed it with listdir

{girder-worker-0.10.2.dev4 → girder-worker-0.10.2.dev8}/girder_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-worker
-Version: 0.10.2.dev4
+Version: 0.10.2.dev8
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.