Merge pull request #295 from CloudVE/fix_for_aws_signed_url

Misc fixes for signed url generation

cloudbridge/providers/aws/resources.py

@@ -872,12 +872,8 @@ class AWSBucketObject(BaseBucketObject):
         self._obj.delete()
 
     def generate_url(self, expires_in, writable=False):
-        if writable:
-            return self._provider.s3_conn.meta.client.generate_presigned_post(
-                self._obj.bucket_name, self.id, ExpiresIn=expires_in
-            )
         return self._provider.s3_conn.meta.client.generate_presigned_url(
-            'get_object',
+            'put_object' if writable else 'get_object',
             Params={'Bucket': self._obj.bucket_name, 'Key': self.id},
             ExpiresIn=expires_in)
 

cloudbridge/providers/azure/azure_client.py

@@ -465,11 +465,7 @@ class AzureClient(object):
             permission=BlobSasPermissions(read=True, write=writable), expiry=expiry,
             user_delegation_key=delegation_key
         )
-        url = (
-            f"https://{self.storage_account}.blob.core.windows.net/"
-            f"{container_name}/{blob_name}?{sas}"
-        )
-
+        url = f"https://{self.storage_account}.blob.core.windows.net/{container_name}/{blob_name}?{sas}"
         return url
 
     def create_empty_disk(self, disk_name, params):

cloudbridge/providers/openstack/resources.py

@@ -1317,7 +1317,7 @@ class OpenStackBucketObject(BaseBucketObject):
         return result
 
     def generate_url(self, expires_in, writable=False):
-        http_method = "POST" if writable else "GET"
+        http_method = "PUT" if writable else "GET"
         # Set a temp url key on the object (http://bit.ly/2NBiXGD)
         temp_url_key = "cloudbridge-tmp-url-key"
         self._provider.swift.post_account(

docs/topics/object_storage.rst

@@ -116,8 +116,7 @@ With your signed URL, you or someone on your team can upload a file like this
     import requests
 
     content = b"Hello world!"
-    # Example for AWS
-    requests.put(url["url"], data=url["fields"], files={"file": ("my-file.txt", content)})
-
-    # Example for GCP/Azure
+    # Only Azure requires the x-ms-blob-type header to be present, but there's no harm
+    # in sending this in for all providers.
+    headers = {'x-ms-blob-type': 'BlockBlob'}
     requests.put(url, data=content)

tests/test_object_store_service.py

@@ -210,12 +210,17 @@ class CloudObjectStoreServiceTestCase(ProviderTestBase):
                     raise self.skipTest(
                         "Skipping rest of test - mock providers can't"
                         " access generated url")
-                else:
-                    requests.put(url, data=content)
+
+                # Only Azure requires the x-ms-blob-type header to be present, but there's no harm
+                # in sending this in for all providers.
+                headers = {'x-ms-blob-type': 'BlockBlob'}
+                response = requests.put(url, headers=headers, data=content)
+                response.raise_for_status()
 
                 obj = test_bucket.objects.get(obj_name)
-                obj_content = [content for content in obj.iter_content()]
-                self.assertEqual(obj_content[0], content)
+                target_stream = BytesIO()
+                obj.save_content(target_stream)
+                self.assertEqual(target_stream.getvalue(), content)
 
     @helpers.skipIfNoService(['storage.buckets'])
     def test_upload_download_bucket_content_from_file(self):