From fc8ca970606ca8b59a5f2de7f98276211c9ea77c Mon Sep 17 00:00:00 2001 From: Nikolas Nyby Date: Thu, 20 Jun 2019 13:59:08 -0400 Subject: [PATCH] Fix file seek error in boto3 - closes #382 This is the solution from @charlesthk here: https://github.com/jschneier/django-storages/issues/382#issuecomment-377174808 --- storages/backends/s3boto3.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py index 6a977537e..22d6e2744 100644 --- a/storages/backends/s3boto3.py +++ b/storages/backends/s3boto3.py @@ -509,6 +509,19 @@ def _save(self, name, content): return cleaned_name def _save_content(self, obj, content, parameters): + """ + We create a clone of the content file as when this is passed to boto3 it wrongly closes + the file upon upload where as the storage backend expects it to still be open + """ + # Seek our content back to the start + content.seek(0, os.SEEK_SET) + + # Create a temporary file that will write to disk after a specified size + content_autoclose = SpooledTemporaryFile() + + # Write our original content into our copy that will be closed by boto3 + content_autoclose.write(content.read()) + # only pass backwards incompatible arguments if they vary from the default put_parameters = parameters.copy() if parameters else {} if self.encryption: @@ -518,8 +531,13 @@ def _save_content(self, obj, content, parameters): if self.default_acl: put_parameters['ACL'] = self.default_acl content.seek(0, os.SEEK_SET) + # Upload the object which will auto close the content_autoclose instance obj.upload_fileobj(content, ExtraArgs=put_parameters) + # Cleanup if this is fixed upstream our duplicate should always close + if not content_autoclose.closed: + content_autoclose.close() + def delete(self, name): name = self._normalize_name(self._clean_name(name)) self.bucket.Object(self._encode_name(name)).delete()