Merge pull request #307 from Azure/dev

Dev to Master

Author: zezha-msft

ChangeLog.md

@@ -2,6 +2,10 @@
 
 > See [BreakingChanges](BreakingChanges.md) for a detailed list of API breaks.
 
+## Version 0.34.3:
+- All: Made the socket timeout configurable. Increased the default socket timeout to 20 seconds.
+- All: Fixed a bug where SAS tokens were being duplicated on retries
+
 ## Version 0.34.2:
 
 ### All:

azure/storage/_auth.py

@@ -113,6 +113,10 @@ def __init__(self, sas_token):
         self.sas_token = sas_token
 
     def sign_request(self, request):
+        # if 'sig=' is present, then the request has already been signed
+        # as is the case when performing retries
+        if 'sig=' in request.path:
+            return
         if '?' in request.path:
             request.path += '&'
         else:

azure/storage/_connection.py

@@ -47,8 +47,8 @@
 }
 
 class _ServiceParameters(object):
-    def __init__(self, service, account_name=None, account_key=None, sas_token=None, 
-                 is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE, 
+    def __init__(self, service, account_name=None, account_key=None, sas_token=None,
+                 is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE,
                  custom_domain=None):
 
         self.account_name = account_name
@@ -83,36 +83,37 @@ def __init__(self, service, account_name=None, account_key=None, sas_token=None,
                 self.protocol = self.protocol if parsed_url.scheme is '' else parsed_url.scheme
             else:
                 if not self.account_name:
-                    raise ValueError(_ERROR_STORAGE_MISSING_INFO)         
+                    raise ValueError(_ERROR_STORAGE_MISSING_INFO)
                 self.primary_endpoint = '{}.{}.{}'.format(self.account_name, service, endpoint_suffix)
-            
+
             # Setup the secondary endpoint
             if self.account_name:
                 self.secondary_endpoint = '{}-secondary.{}.{}'.format(self.account_name, service, endpoint_suffix)
             else:
                 self.secondary_endpoint = None
 
     @staticmethod
-    def get_service_parameters(service, account_name=None, account_key=None, sas_token=None, is_emulated=None, 
-                 protocol=None, endpoint_suffix=None, custom_domain=None, request_session=None, 
-                 connection_string=None):
+    def get_service_parameters(service, account_name=None, account_key=None, sas_token=None, is_emulated=None,
+                 protocol=None, endpoint_suffix=None, custom_domain=None, request_session=None,
+                 connection_string=None, socket_timeout=None):
         if connection_string:
             params = _ServiceParameters._from_connection_string(connection_string, service)
         elif is_emulated:
             params = _ServiceParameters(service, is_emulated=True)
         elif account_name:
             params = _ServiceParameters(service,
-                                      account_name=account_name, 
-                                      account_key=account_key, 
-                                      sas_token=sas_token, 
-                                      is_emulated=is_emulated, 
-                                      protocol=protocol, 
+                                      account_name=account_name,
+                                      account_key=account_key,
+                                      sas_token=sas_token,
+                                      is_emulated=is_emulated,
+                                      protocol=protocol,
                                       endpoint_suffix=endpoint_suffix,
                                       custom_domain=custom_domain)
         else:
             raise ValueError(_ERROR_STORAGE_MISSING_INFO)
 
         params.request_session = request_session
+        params.socket_timeout = socket_timeout
         return params
 
     @staticmethod
@@ -136,10 +137,10 @@ def _from_connection_string(connection_string, service):
         endpoint = config.get(_CONNECTION_ENDPONTS[service])
 
         return _ServiceParameters(service,
-                                  account_name=account_name, 
-                                  account_key=account_key, 
-                                  sas_token=sas_token, 
-                                  is_emulated=is_emulated, 
-                                  protocol=protocol, 
+                                  account_name=account_name,
+                                  account_key=account_key,
+                                  sas_token=sas_token,
+                                  is_emulated=is_emulated,
+                                  protocol=protocol,
                                   endpoint_suffix=endpoint_suffix,
                                   custom_domain=endpoint)

azure/storage/_constants.py

@@ -15,7 +15,7 @@
 import platform
 
 __author__ = 'Microsoft Corp. <[email protected]>'
-__version__ = '0.34.2'
+__version__ = '0.34.3'
 
 # x-ms-version for storage service.
 X_MS_VERSION = '2016-05-31'
@@ -36,8 +36,8 @@
 DEV_ACCOUNT_NAME = 'devstoreaccount1'
 DEV_ACCOUNT_KEY = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=='
 
-# Socket timeout in seconds is 11
-SOCKET_TIMEOUT = 11
+# Socket timeout in seconds
+DEFAULT_SOCKET_TIMEOUT = 20
 
 #Encryption constants
 _ENCRYPTION_PROTOCOL_V1 = '1.0'

azure/storage/blob/appendblobservice.py

@@ -74,7 +74,7 @@ class AppendBlobService(BaseBlobService):
 
     def __init__(self, account_name=None, account_key=None, sas_token=None, 
                  is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE,
-                 custom_domain=None, request_session=None, connection_string=None):
+                 custom_domain=None, request_session=None, connection_string=None, socket_timeout=None):
         '''
         :param str account_name:
             The storage account name. This is used to authenticate requests 
@@ -110,11 +110,14 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             request session. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        :param int socket_timeout:
+            If specified, this will override the default socket timeout. The timeout specified is in seconds.
+            See DEFAULT_SOCKET_TIMEOUT in _constants.py for the default value.
         '''
         self.blob_type = _BlobTypes.AppendBlob
         super(AppendBlobService, self).__init__(
             account_name, account_key, sas_token, is_emulated, protocol, endpoint_suffix, 
-            custom_domain, request_session, connection_string)
+            custom_domain, request_session, connection_string, socket_timeout)
 
     def create_blob(self, container_name, blob_name, content_settings=None,
                     metadata=None, lease_id=None,

azure/storage/blob/baseblobservice.py

@@ -150,7 +150,7 @@ class BaseBlobService(StorageClient):
 
     def __init__(self, account_name=None, account_key=None, sas_token=None, 
                  is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE,
-                 custom_domain=None, request_session=None, connection_string=None):
+                 custom_domain=None, request_session=None, connection_string=None, socket_timeout=None):
         '''
         :param str account_name:
             The storage account name. This is used to authenticate requests 
@@ -186,6 +186,9 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             request session. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format
+        :param int socket_timeout:
+            If specified, this will override the default socket timeout. The timeout specified is in seconds.
+            See DEFAULT_SOCKET_TIMEOUT in _constants.py for the default value.
         '''
         service_params = _ServiceParameters.get_service_parameters(
             'blob',
@@ -197,7 +200,8 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             endpoint_suffix=endpoint_suffix,
             custom_domain=custom_domain,
             request_session=request_session,
-            connection_string=connection_string)
+            connection_string=connection_string,
+            socket_timeout=socket_timeout)
 
         super(BaseBlobService, self).__init__(service_params)
 

azure/storage/blob/blockblobservice.py

@@ -104,7 +104,7 @@ class BlockBlobService(BaseBlobService):
 
     def __init__(self, account_name=None, account_key=None, sas_token=None,
                  is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE,
-                 custom_domain=None, request_session=None, connection_string=None):
+                 custom_domain=None, request_session=None, connection_string=None, socket_timeout=None):
         '''
         :param str account_name:
             The storage account name. This is used to authenticate requests
@@ -140,11 +140,14 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             request session. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        :param int socket_timeout:
+            If specified, this will override the default socket timeout. The timeout specified is in seconds.
+            See DEFAULT_SOCKET_TIMEOUT in _constants.py for the default value.
         '''
         self.blob_type = _BlobTypes.BlockBlob
         super(BlockBlobService, self).__init__(
             account_name, account_key, sas_token, is_emulated, protocol, endpoint_suffix,
-            custom_domain, request_session, connection_string)
+            custom_domain, request_session, connection_string, socket_timeout)
 
     def put_block(self, container_name, blob_name, block, block_id,
                   validate_content=False, lease_id=None, timeout=None):

azure/storage/blob/pageblobservice.py

@@ -88,7 +88,7 @@ class PageBlobService(BaseBlobService):
 
     def __init__(self, account_name=None, account_key=None, sas_token=None, 
                  is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE,
-                 custom_domain=None, request_session=None, connection_string=None):
+                 custom_domain=None, request_session=None, connection_string=None, socket_timeout=None):
         '''
         :param str account_name:
             The storage account name. This is used to authenticate requests 
@@ -124,11 +124,14 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             request session. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        :param int socket_timeout:
+            If specified, this will override the default socket timeout. The timeout specified is in seconds.
+            See DEFAULT_SOCKET_TIMEOUT in _constants.py for the default value.
         '''
         self.blob_type = _BlobTypes.PageBlob
         super(PageBlobService, self).__init__(
             account_name, account_key, sas_token, is_emulated, protocol, endpoint_suffix, 
-            custom_domain, request_session, connection_string)
+            custom_domain, request_session, connection_string, socket_timeout)
 
     def create_blob(
         self, container_name, blob_name, content_length, content_settings=None,

azure/storage/file/fileservice.py

@@ -124,7 +124,7 @@ class FileService(StorageClient):
 
     def __init__(self, account_name=None, account_key=None, sas_token=None, 
                  protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE, 
-                 request_session=None, connection_string=None):
+                 request_session=None, connection_string=None, socket_timeout=None):
         '''
         :param str account_name:
             The storage account name. This is used to authenticate requests 
@@ -149,6 +149,9 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             request session. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        :param int socket_timeout:
+            If specified, this will override the default socket timeout. The timeout specified is in seconds.
+            See DEFAULT_SOCKET_TIMEOUT in _constants.py for the default value.
         '''
         service_params = _ServiceParameters.get_service_parameters(
             'file',
@@ -158,7 +161,8 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             protocol=protocol, 
             endpoint_suffix=endpoint_suffix,
             request_session=request_session,
-            connection_string=connection_string)
+            connection_string=connection_string,
+            socket_timeout=socket_timeout)
 
         super(FileService, self).__init__(service_params)
 

azure/storage/queue/queueservice.py

@@ -132,7 +132,7 @@ class QueueService(StorageClient):
 
     def __init__(self, account_name=None, account_key=None, sas_token=None, 
                  is_emulated=False, protocol=DEFAULT_PROTOCOL, endpoint_suffix=SERVICE_HOST_BASE,
-                 request_session=None, connection_string=None):
+                 request_session=None, connection_string=None, socket_timeout=None):
         '''
         :param str account_name:
             The storage account name. This is used to authenticate requests 
@@ -161,6 +161,9 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             request session. See
             http://azure.microsoft.com/en-us/documentation/articles/storage-configure-connection-string/
             for the connection string format.
+        :param int socket_timeout:
+            If specified, this will override the default socket timeout. The timeout specified is in seconds.
+            See DEFAULT_SOCKET_TIMEOUT in _constants.py for the default value.
         '''
         service_params = _ServiceParameters.get_service_parameters(
             'queue',
@@ -171,7 +174,8 @@ def __init__(self, account_name=None, account_key=None, sas_token=None,
             protocol=protocol, 
             endpoint_suffix=endpoint_suffix,
             request_session=request_session,
-            connection_string=connection_string)
+            connection_string=connection_string,
+            socket_timeout=socket_timeout)
 
         super(QueueService, self).__init__(service_params)