Try this patch. With the new Content-MD5 branch too, calculating md5
before encrypting is a really really bad idea - that's just broken design.
Encryption should be done long we calculate the MD5 of the thing being
uploaded.
Ugh. Once we fix this, we need to somehow indicate (I'd propose using a
new metadata value to denote encryption) whether encryption was done before
or after MD5 was calculated. :-(
diff --git a/S3/S3.py b/S3/S3.py
index 46068b8..121dee1 100644
--- a/S3/S3.py
+++ b/S3/S3.py
@@ -1148,10 +1148,14 @@ class S3(object):
response["md5"] = response["headers"]["etag"]
md5_hash = response["headers"]["etag"]
- try:
- md5_hash = response["s3cmd-attrs"]["md5"]
- except KeyError:
- pass
+ if not 'x-amz-meta-s3tools-gpgenc' in response["headers"]:
+ # we can't trust our stored md5 because we
+ # encrypted the file after calculating it but before
+ # uploading it.
+ try:
+ md5_hash = response["s3cmd-attrs"]["md5"]
+ except KeyError:
+ pass
response["md5match"] = md5_hash.find(response["md5"]) >= 0
response["elapsed"] = timestamp_end - timestamp_start
On Tue, Apr 22, 2014 at 11:41 AM, Abrao Grynglas <abr...@yahoo.com> wrote:
> Using the s3cmd version 1.5.0-beta1, I receive a "MD5 signatures do not
> match" when downloading a file (no multipart involved) that was previously
> uploaded with GPG encryption.
>
> It seems that the problem is caused by line 1026 in S3.py replacing the
> etag md5 value with the md5 value from s3cmd-attrs, which is the md5
> before file encryption.
>
> Could somebody please take a look at it?
>
>
>
> ------------------------------------------------------------------------------
> Start Your Social Network Today - Download eXo Platform
> Build your Enterprise Intranet with eXo Platform Software
> Java Based Open Source Intranet - Social, Extensible, Cloud Ready
> Get Started Now And Turn Your Intranet Into A Collaboration Platform
> http://p.sf.net/sfu/ExoPlatform
> _______________________________________________
> S3tools-general mailing list
> S3tools-general@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/s3tools-general
>
>
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
S3tools-general mailing list
S3tools-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/s3tools-general
