svn commit: r1091023 - /incubator/libcloud/trunk/libcloud/storage/drivers/s3.py

[to...@apache.org]

Author: tomaz
Date: Mon Apr 11 11:02:05 2011
New Revision: 1091023

URL: http://svn.apache.org/viewvc?rev=1091023&view=rev
Log:
1. Create signature properly if "x-amz-" headers are provided
2. Only send LocationC1.onstraint payload to the server when calling
create_container if the driver's region is not "US Standard"

M    s3.py

Modified:
    incubator/libcloud/trunk/libcloud/storage/drivers/s3.py

Modified: incubator/libcloud/trunk/libcloud/storage/drivers/s3.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/storage/drivers/s3.py?rev=1091023&r1=1091022&r2=1091023&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/storage/drivers/s3.py (original)
+++ incubator/libcloud/trunk/libcloud/storage/drivers/s3.py Mon Apr 11 11:02:05 2011
@@ -107,11 +107,14 @@ class S3Connection(ConnectionUserAndKey)
         """
         special_header_keys = [ 'content-md5', 'content-type', 'date' ]
         special_header_values = { 'date': '' }
+        amz_header_values = {}
 
         headers_copy = copy.deepcopy(headers)
         for key, value in headers_copy.iteritems():
             if key.lower() in special_header_keys:
                 special_header_values[key.lower()] = value.lower().strip()
+            elif key.lower().startswith('x-amz-'):
+                amz_header_values[key.lower()] = value.lower().strip()
 
         if not special_header_values.has_key('content-md5'):
             special_header_values['content-md5'] = ''
@@ -131,7 +134,21 @@ class S3Connection(ConnectionUserAndKey)
             buf.append(value)
         string_to_sign = '\n'.join(buf)
 
-        string_to_sign = '%s\n%s' % (string_to_sign, path)
+        keys_sorted = amz_header_values.keys()
+        keys_sorted.sort()
+
+        amz_header_string = []
+        for key in keys_sorted:
+            value = amz_header_values[key]
+            amz_header_string.append('%s:%s' % (key, value))
+        amz_header_string = '\n'.join(amz_header_string)
+
+        values_to_sign = []
+        for value in [ string_to_sign, amz_header_string, path]:
+            if value:
+                values_to_sign.append(value)
+
+        string_to_sign = '\n'.join(values_to_sign)
         b64_hmac = base64.b64encode(
             hmac.new(secret_key, string_to_sign, digestmod=sha1).digest()
         )
@@ -193,13 +210,18 @@ class S3StorageDriver(StorageDriver):
                                       object_name=object_name)
 
     def create_container(self, container_name):
-        root = Element('CreateBucketConfiguration')
-        child = SubElement(root, 'LocationConstraint')
-        child.text = self.ex_location_name
+        if self.ex_location_name:
+            root = Element('CreateBucketConfiguration')
+            child = SubElement(root, 'LocationConstraint')
+            child.text = self.ex_location_name
+            data = tostring(root)
+        else:
+            data = None
 
         response = self.connection.request('/%s' % (container_name),
-                                           data=tostring(root),
+                                           data=data,
                                            method='PUT')
+
         if response.status == httplib.OK:
             container = Container(name=container_name, extra=None, driver=self)
             return container