Merge lp:~fujita-tomonori-deactivatedaccount/swift/s3-auth into lp:~hudson-openstack/swift/trunk

[FUJITA Tomonori]

Fix swift3 authentication bug about the Date and X-Amz-Date handling.

[John Dickinson (notmyname)]

lgtm

review: Approve

[David Goetz (david-goetz)]

looks good

review: Approve

=== modified file 'swift/common/middleware/swift3.py'
--- swift/common/middleware/swift3.py	2011-05-05 20:48:22 +0000
+++ swift/common/middleware/swift3.py	2011-07-11 11:33:29 +0000
@@ -128,13 +128,23 @@
     """
     Canonicalize a request to a token that can be signed.
     """
+    amz_headers = {}
+
     buf = "%s\n%s\n%s\n" % (req.method, req.headers.get('Content-MD5', ''),
             req.headers.get('Content-Type') or '')
-    if 'Date' in req.headers:
-        buf += "%s\n" % req.headers['Date']
+
     for amz_header in sorted((key.lower() for key in req.headers
                               if key.lower().startswith('x-amz-'))):
-        buf += "%s:%s\n" % (amz_header, req.headers[amz_header])
+        amz_headers[amz_header] = req.headers[amz_header]
+
+    if 'x-amz-date' in amz_headers:
+        buf += "\n"
+    elif 'Date' in req.headers:
+        buf += "%s\n" % req.headers['Date']
+
+    for k in sorted(key.lower() for key in amz_headers):
+        buf += "%s:%s\n" % (k, amz_headers[k])
+
     path = req.path_qs
     if '?' in path:
         path, args = path.split('?', 1)

=== modified file 'test/unit/common/middleware/test_swift3.py'
--- test/unit/common/middleware/test_swift3.py	2011-05-05 21:02:08 +0000
+++ test/unit/common/middleware/test_swift3.py	2011-07-11 11:33:29 +0000
@@ -573,6 +573,15 @@
         verify('7506d97002c7d2de922cc0ec34af8846', '/bucket/object',
                 {'Content-Type': None, 'X-Amz-Something': 'test'})
 
+        verify('28f76d6162444a193b612cd6cb20e0be', '/bucket/object',
+                {'Content-Type': None,
+                 'X-Amz-Date': 'Mon, 11 Jul 2011 10:52:57 +0000',
+                 'Date': 'Tue, 12 Jul 2011 10:52:57 +0000'})
+
+        verify('ed6971e3eca5af4ee361f05d7c272e49', '/bucket/object',
+                {'Content-Type': None,
+                 'Date': 'Tue, 12 Jul 2011 10:52:57 +0000'})
+
         req1 = Request.blank('/', headers=
                 {'Content-Type': None, 'X-Amz-Something': 'test'})
         req2 = Request.blank('/', headers=