[Storage] Modified StorageRetryPolicy to skip AzureSigningError from bad storage account key

sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies.py

@@ -31,7 +31,7 @@
     SansIOHTTPPolicy,
 )
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .models import LocationMode
 
@@ -542,6 +542,8 @@ def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies_async.py

@@ -13,7 +13,7 @@
 from azure.core.exceptions import AzureError
 from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy, AsyncHTTPPolicy
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .policies import is_retry, StorageRetryPolicy
 
@@ -127,6 +127,8 @@ async def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-blob/tests/test_blob_client.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 
 import platform
+import time
 from datetime import datetime, timedelta
 
 import pytest
@@ -19,6 +20,7 @@
     VERSION,
 )
 from azure.storage.blob._shared.base_client import create_configuration
+from azure.storage.blob._shared.authentication import AzureSigningError
 
 from devtools_testutils import recorded_by_proxy
 from devtools_testutils.storage import StorageRecordedTestCase

sdk/storage/azure-storage-blob/tests/test_blob_client_async.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 
 import platform
+import time
 from datetime import datetime, timedelta
 
 import pytest
@@ -20,6 +21,7 @@
     ContainerClient,
     BlobServiceClient
 )
+from azure.storage.blob._shared.authentication import AzureSigningError
 
 from devtools_testutils.aio import recorded_by_proxy_async
 from devtools_testutils.storage.aio import AsyncStorageRecordedTestCase

sdk/storage/azure-storage-blob/tests/test_retry.py

@@ -15,7 +15,9 @@
     ServiceResponseError
 )
 from azure.core.pipeline.transport import RequestsTransport
+from azure.storage.blob._shared.authentication import AzureSigningError
 from azure.storage.blob import (
+    BlobClient,
     BlobServiceClient,
     ExponentialRetry,
     LinearRetry,
@@ -550,4 +552,29 @@ def test_streaming_retry(self, **kwargs):
                 blob.download_blob()
             assert iterator_mock.__next__.call_count == count[0] == 3
 
+    @BlobPreparer()
+    def test_invalid_storage_account_key(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = "a"
+
+        # Arrange
+        blob_client = self._create_storage_service(
+            BlobClient,
+            storage_account_name,
+            storage_account_key,
+            container_name="foo",
+            blob_name="bar"
+        )
+
+        retry_counter = RetryCounter()
+        retry_callback = retry_counter.simple_count
+
+        # Act
+        with pytest.raises(AzureSigningError) as e:
+            blob_client.get_blob_properties(retry_hook=retry_callback)
+
+        # Assert
+        assert "Invalid base64-encoded string" in e.value.message
+        assert retry_counter.count == 0
+
     # ------------------------------------------------------------------------------

sdk/storage/azure-storage-blob/tests/test_retry_async.py

@@ -19,8 +19,9 @@
 )
 from azure.core.pipeline.transport import AioHttpTransport
 from azure.storage.blob import LocationMode
+from azure.storage.blob._shared.authentication import AzureSigningError
 from azure.storage.blob._shared.policies_async import ExponentialRetry, LinearRetry
-from azure.storage.blob.aio import BlobServiceClient
+from azure.storage.blob.aio import BlobClient, BlobServiceClient
 
 from devtools_testutils import ResponseCallback, RetryCounter
 from devtools_testutils.aio import recorded_by_proxy_async
@@ -529,4 +530,29 @@ async def test_streaming_retry(self, **kwargs):
             await blob.download_blob()
         assert stream_reader_read_mock.call_count == count[0] == 4
 
+    @BlobPreparer()
+    async def test_invalid_storage_account_key(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = "a"
+
+        # Arrange
+        blob_client = self._create_storage_service(
+            BlobClient,
+            storage_account_name,
+            storage_account_key,
+            container_name="foo",
+            blob_name="bar"
+        )
+
+        retry_counter = RetryCounter()
+        retry_callback = retry_counter.simple_count
+
+        # Act
+        with pytest.raises(AzureSigningError) as e:
+            await blob_client.get_blob_properties(retry_hook=retry_callback)
+
+        # Assert
+        assert "Invalid base64-encoded string" in e.value.message
+        assert retry_counter.count == 0
+
 # ------------------------------------------------------------------------------

sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/policies.py

@@ -31,7 +31,7 @@
     SansIOHTTPPolicy,
 )
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .models import LocationMode
 
@@ -544,6 +544,8 @@ def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/policies_async.py

@@ -13,7 +13,7 @@
 from azure.core.exceptions import AzureError
 from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy, AsyncHTTPPolicy
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .policies import is_retry, StorageRetryPolicy
 
@@ -127,6 +127,8 @@ async def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/policies.py

@@ -31,7 +31,7 @@
     SansIOHTTPPolicy,
 )
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .models import LocationMode
 
@@ -541,6 +541,8 @@ def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/policies_async.py

@@ -13,7 +13,7 @@
 from azure.core.exceptions import AzureError
 from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy, AsyncHTTPPolicy
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .policies import is_retry, StorageRetryPolicy
 
@@ -127,6 +127,8 @@ async def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-queue/azure/storage/queue/_shared/policies.py

@@ -31,7 +31,7 @@
     SansIOHTTPPolicy,
 )
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .models import LocationMode
 
@@ -547,6 +547,8 @@ def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-queue/azure/storage/queue/_shared/policies_async.py

@@ -13,7 +13,7 @@
 from azure.core.exceptions import AzureError
 from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy, AsyncHTTPPolicy
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .policies import is_retry, StorageRetryPolicy
 
@@ -127,6 +127,8 @@ async def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining: