Fixed decompression implementation for blob client-side encryption

Author: weirongw23-msft

sdk/storage/azure-storage-blob/azure/storage/blob/_download.py

@@ -423,8 +423,8 @@ def _get_encryption_data_request(self) -> None:
         # Save current request cls
         download_cls = self._request_options.pop('cls', None)
 
-        # Decompression does not work with client-side encryption
-        self._request_options.pop('decompress', None)
+        # Temporarily removing this for the get properties request
+        decompress = self._request_options.pop('decompress', None)
 
         # Adjust cls for get_properties
         self._request_options['cls'] = deserialize_blob_properties
@@ -438,6 +438,10 @@ def _get_encryption_data_request(self) -> None:
         # Restore cls for download
         self._request_options['cls'] = download_cls
 
+        # Decompression does not work with client-side encryption
+        if decompress is not None:
+            self._request_options['decompress'] = False
+
     @property
     def _download_complete(self):
         if is_encryption_v2(self._encryption_data):

sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py

@@ -293,8 +293,8 @@ async def _get_encryption_data_request(self) -> None:
         # Save current request cls
         download_cls = self._request_options.pop('cls', None)
 
-        # Decompression does not work with client-side encryption
-        self._request_options.pop('decompress', None)
+        # Temporarily removing this for the get properties request
+        decompress = self._request_options.pop('decompress', None)
 
         # Adjust cls for get_properties
         self._request_options['cls'] = deserialize_blob_properties
@@ -308,6 +308,10 @@ async def _get_encryption_data_request(self) -> None:
         # Restore cls for download
         self._request_options['cls'] = download_cls
 
+        # Decompression does not work with client-side encryption
+        if decompress is not None:
+            self._request_options['decompress'] = False
+
     async def _setup(self) -> None:
         if self._encryption_options.get("key") is not None or self._encryption_options.get("resolver") is not None:
             await self._get_encryption_data_request()

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

@@ -208,10 +208,11 @@ def test_decompression_with_encryption(self, **kwargs):
 
         blob = self.bsc.get_blob_client(self.container_name, self._get_blob_reference())
         compressed_data = b'\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcaH\xcd\xc9\xc9WH+\xca\xcfUH\xaf\xca,\x00\x00\x00\x00\xff\xff\x03\x00d\xaa\x8e\xb5\x0f\x00\x00\x00'
+        content_settings = ContentSettings(content_encoding='gzip')
 
         # Act / Assert
         # Cannot directly set content settings on encrypted blobs
-        blob.upload_blob(data=compressed_data, overwrite=True)
+        blob.upload_blob(data=compressed_data, overwrite=True, content_settings=content_settings)
 
         result = blob.download_blob(decompress=False).readall()
         assert result == compressed_data

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

@@ -211,10 +211,11 @@ async def test_decompression_with_encryption(self, **kwargs):
 
         blob = self.bsc.get_blob_client(self.container_name, self._get_blob_reference())
         compressed_data = b'\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcaH\xcd\xc9\xc9WH+\xca\xcfUH\xaf\xca,\x00\x00\x00\x00\xff\xff\x03\x00d\xaa\x8e\xb5\x0f\x00\x00\x00'
+        content_settings = ContentSettings(content_encoding='gzip')
 
         # Act / Assert
         # Cannot directly set content settings on encrypted blobs
-        await blob.upload_blob(data=compressed_data, overwrite=True)
+        await blob.upload_blob(data=compressed_data, overwrite=True, content_setting=content_settings)
 
         result = await (await blob.download_blob(decompress=False)).readall()
         assert result == compressed_data