Merge pull request #3 from robertavram/robertavram-fixes-1

Azure signing fixes
robertavram · Nov 3, 2015 · 14577e0 · 14577e0
2 parents 6d44833 + 35218ab
commit 14577e0
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/storages/backends/azure_storage.py b/storages/backends/azure_storage.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 import os.path
 import mimetypes
 import time
@@ -19,6 +19,7 @@
     # azure-storage 0.20.0
     from azure.storage.blob.blobservice import BlobService
     from azure.common import AzureMissingResourceHttpError
+    from azure.storage import AccessPolicy, SharedAccessPolicy
 except ImportError:
     from azure.storage import BlobService, AccessPolicy, SharedAccessPolicy
     from azure import WindowsAzureMissingResourceError as AzureMissingResourceHttpError
@@ -100,15 +101,15 @@ def _save(self, name, content):
 
     def url(self, name):
         if hasattr(self.connection, 'make_blob_url'):
-            if auto_sign:
+            if self.auto_sign:
                 access_policy = AccessPolicy()
-                access_policy.start = (datetime.utcnow() + datetime.timedelta(seconds=-120)).strftime('%Y-%m-%dT%H:%M:%SZ')
-                access_policy.expiry = (datetime.utcnow() + datetime.timedelta(seconds=ap_expiry)).strftime('%Y-%m-%dT%H:%M:%SZ')
-                access_policy.permission = azure_access_policy_permission
+                access_policy.start = (datetime.utcnow() + timedelta(seconds=-120)).strftime('%Y-%m-%dT%H:%M:%SZ')
+                access_policy.expiry = (datetime.utcnow() + timedelta(seconds=self.ap_expiry)).strftime('%Y-%m-%dT%H:%M:%SZ')
+                access_policy.permission = self.azure_access_policy_permission
                 sap = SharedAccessPolicy(access_policy)
 
                 sas_token = self.connection.generate_shared_access_signature(
-                    azure_container,
+                    self.azure_container,
                     blob_name=name,
                     shared_access_policy=sap,
                 )