Merge pull request #56 from bloodeagle40234/fix-signature

fix signature generation

swift3/middleware.py

@@ -287,7 +287,8 @@ def canonical_string(req):
     if '?' in path:
         path, args = path.split('?', 1)
         params = []
-        for key, value in urlparse.parse_qsl(args, keep_blank_values=True):
+        for key, value in sorted(urlparse.parse_qsl(args,
+                                          keep_blank_values=True)):
             if key in ALLOWED_SUB_RESOURCES:
                 params.append('%s=%s' % (key, value) if value else key)
         if params:

swift3/test/unit/test_swift3.py

@@ -17,6 +17,7 @@ import unittest
 from datetime import datetime
 import cgi
 import hashlib
+import base64
 
 import xml.dom.minidom
 import simplejson
@@ -684,5 +685,16 @@ class TestSwift3(unittest.TestCase):
         self.assertEquals(req.headers['Authorization'], 'AWS Z:X')
         self.assertEquals(req.headers['Date'], 'Y')
 
+    def test_token_generation(self):
+        req = Request.blank('/bucket/object?uploadId=123456789abcdef'
+                            '&partNumber=1',
+                            environ={'REQUEST_METHOD': 'PUT'})
+        req.headers['Authorization'] = 'AWS X:Y'
+        resp = self.app(req.environ, start_response)
+        self.assertEquals(base64.urlsafe_b64decode(
+                              req.headers['X-Auth-Token']),
+                              'PUT\n\n\n/bucket/object?partNumber=1'
+                              '&uploadId=123456789abcdef')
+
 if __name__ == '__main__':
     unittest.main()