No longer use blob file path to read files but use the zope api instaed.

This will fix an issue reading non existing files when using a non shared blobs dir: https://relstorage.readthedocs.io/en/latest/relstorage-options.html#blobs
In this case, the blobs-directory only aces as a cache. File may be there but not necessarly. If using the zope api, files will be synced as soon as they're needed.

Author: elioschmutz

changes/TI-3545.bugfix

@@ -0,0 +1 @@
+Properly check permissions for the transfer responsible ui listing action. [elioschmutz]

opengever/base/tests/test_utils.py

@@ -144,20 +144,20 @@ def test_escapes_none_returns_none(self):
 class TestChecksum(TestCase):
 
     def test_md5_checksum(self):
-        filename = os.path.join(os.path.dirname(__file__), 'data', 'test.txt')
-        alg, chksum = file_checksum(filename)
+        with open(os.path.join(os.path.dirname(__file__), 'data', 'test.txt'), 'rb') as file_:
+            alg, chksum = file_checksum(file_)
         self.assertEqual(alg, u'MD5')
         self.assertEqual(chksum, 'a51445bd8ffce9a6b90199f3fd72715a')
 
     def test_md5_checksum_with_multiple_chunks(self):
-        filename = os.path.join(os.path.dirname(__file__), 'data', 'test.txt')
-        alg, chksum = file_checksum(filename, chunksize=100)
+        with open(os.path.join(os.path.dirname(__file__), 'data', 'test.txt'), 'rb') as file_:
+            alg, chksum = file_checksum(file_, chunksize=100)
         self.assertEqual(alg, u'MD5')
         self.assertEqual(chksum, 'a51445bd8ffce9a6b90199f3fd72715a')
 
     def test_sha256_checksum(self):
-        filename = os.path.join(os.path.dirname(__file__), 'data', 'test.txt')
-        alg, chksum = file_checksum(filename, algorithm=u'SHA256')
+        with open(os.path.join(os.path.dirname(__file__), 'data', 'test.txt'), 'rb') as file_:
+            alg, chksum = file_checksum(file_, algorithm=u'SHA256')
         self.assertEqual(alg, u'SHA256')
         self.assertEqual(chksum, '2cbe78150099d95789ceb5606818eeefccc7228cedd9bbe9cf7ce6af7071abd2')
 

opengever/base/utils.py

@@ -149,15 +149,17 @@ def to_html_xweb_intelligent(text):
     )
 
 
-def file_checksum(filename, chunksize=65536, algorithm=u'MD5'):
-    """Calculates a checksum for the given file."""
+def file_checksum(file_obj, chunksize=65536, algorithm=u'MD5'):
+    """Calculates a checksum for the given file object."""
+    if not file_obj.mode == 'rb':
+        raise Exception("Must read the file in byte mode")
+
     h = getattr(hashlib, algorithm.lower())()
-    with open(filename, 'rb') as f:
-        chunk = f.read(chunksize)
-        while len(chunk) > 0:
-            h.update(chunk)
-            chunk = f.read(chunksize)
-        return algorithm, h.hexdigest()
+    chunk = file_obj.read(chunksize)
+    while len(chunk) > 0:
+        h.update(chunk)
+        chunk = file_obj.read(chunksize)
+    return algorithm, h.hexdigest()
 
 
 def make_persistent(data):

opengever/disposition/ech0160/model/file.py

@@ -24,5 +24,6 @@ def binding(self):
         datei = arelda.dateiSIP(id=self.id)
         datei.name = self.name
         datei.originalName = self.filename
-        datei.pruefalgorithmus, datei.pruefsumme = file_checksum(self.filepath)
+        with self.file.open() as file_:
+            datei.pruefalgorithmus, datei.pruefsumme = file_checksum(file_)
         return datei

opengever/disposition/ech0160/model/folder.py

@@ -45,7 +45,8 @@ def binding(self):
         return ordner
 
     def add_to_zip(self, zipfile):
-        for file_ in self.files:
-            zipfile.write(file_.filepath, os.path.join(self.path, file_.name))
+        for ech_0160_file in self.files:
+            with ech_0160_file.file.open() as file_:
+                zipfile.writestr(os.path.join(self.path, ech_0160_file.name), file_.read())
         for folder in self.folders:
             folder.add_to_zip(zipfile)

opengever/disposition/ech0160/sippackage.py

@@ -136,9 +136,12 @@ def add_schema_files(self, zipfile):
             filename = os.path.join(schemas_path, schema)
             arcname = os.path.join(
                 self.get_folder_name(), 'header', 'xsd', schema)
+
             zipfile.write(filename, arcname)
 
-            checksum_alg, checksum = file_checksum(filename)
+            with open(filename, 'rb') as file_:
+                checksum_alg, checksum = file_checksum(file_)
+
             self.xsd.append(arelda.dateiSIP(
                 schema,
                 schema,

opengever/ech0147/model.py

@@ -146,7 +146,8 @@ def add_to_zip(self, zipfile):
         for dossier in self.dossiers:
             dossier.add_to_zip(zipfile)
         for document in self.documents:
-            zipfile.write(document.blobpath, document.path)
+            with document.obj.get_file().open() as file_:
+                zipfile.writestr(document.path, file_.read())
 
 
 class Dossier(object):
@@ -220,15 +221,15 @@ def add_to_zip(self, zipfile):
         for dossier in self.dossiers:
             dossier.add_to_zip(zipfile)
         for document in self.documents:
-            zipfile.write(document.blobpath, document.path)
+            with document.obj.get_file().open() as file_:
+                zipfile.writestr(document.path, file_.read())
 
 
 class Document(object):
 
     def __init__(self, obj, base_path):
         self.obj = obj
         self.path = os.path.join(base_path, self.obj.get_file().filename)
-        self.blobpath = self.obj.get_file()._blob.committed()
 
     def binding(self):
         d = ech0147t0.documentType()
@@ -242,7 +243,8 @@ def binding(self):
         f = ech0147t0.fileType()
         f.pathFileName = self.path
         f.mimeType = self.obj.get_file().contentType
-        f.hashCodeAlgorithm, f.hashCode = file_checksum(self.blobpath)
+        with self.obj.get_file().open() as file_:
+            f.hashCodeAlgorithm, f.hashCode = file_checksum(file_)
         d.files.append(f)
 
         c_obj = IClassification(self.obj)

opengever/ech0147/tests/test_model.py

@@ -9,11 +9,11 @@
 
 class DummyZipFile(object):
     def __init__(self):
-        self.filenames = []
+        self.data = []
         self.arcnames = []
 
-    def write(self, filename, arcname):
-        self.filenames.append(filename)
+    def writestr(self, arcname, data):
+        self.data.append(data)
         self.arcnames.append(arcname)
 
 

opengever/wopi/browser/wopi.py

@@ -146,8 +146,8 @@ def check_file_info(self):
         modified_iso9601 = (
             modified_dt.replace(tzinfo=None) - modified_dt.utcoffset()
         ).isoformat() + 'Z'
-        _alg, sha256_checksum = file_checksum(
-            self.obj.file._blob.committed(), algorithm=u'SHA256')
+        with self.obj.get_file().open() as file_:
+            _alg, sha256_checksum = file_checksum(file_, algorithm=u'SHA256')
         data = {
             'BaseFileName': self.obj.file.filename,
             'OwnerId': self.obj.Creator() or self.obj.getOwner().getId(),