github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix bug: transactional MD5 hash was treated as blob MD5 hash when downloading a range of blob (#2517)

Browse Source 
* fix bug: transactional MD5 hash was treated as blob MD5 hash when downloading a range of blob

* CL

* fix build error

* add test case for 200 download

* f
This commit is contained in:
JinmingHu 2021-07-02 10:48:45 +08:00 committed by GitHub
parent 0a0ece8ae0
commit 8e6dd37832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 87 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/storage/azure-storage-blobs/CHANGELOG.md
View File

@ -2,6 +2,9 @@
## 12.1.0-beta.1 (Unreleased)
### Bug Fixes
- Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob.
## 12.0.0 (2021-06-08)

11
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
View File

@ -6424,11 +6424,14 @@ namespace Azure { namespace Storage { namespace Blobs {
{
response.Details.HttpHeaders.CacheControl = cache_control__iterator->second;
}
auto content_md5__iterator = httpResponse.GetHeaders().find("content-md5");
if (content_md5__iterator != httpResponse.GetHeaders().end())
if (http_status_code == 200)
{
response.Details.HttpHeaders.ContentHash.Value
= Azure::Core::Convert::Base64Decode(content_md5__iterator->second);
auto content_md5__iterator = httpResponse.GetHeaders().find("content-md5");
if (content_md5__iterator != httpResponse.GetHeaders().end())
{
response.Details.HttpHeaders.ContentHash.Value
= Azure::Core::Convert::Base64Decode(content_md5__iterator->second);
}
}
auto x_ms_blob_content_md5__iterator
= httpResponse.GetHeaders().find("x-ms-blob-content-md5");

94
sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
View File

@ -110,30 +110,84 @@ namespace Azure { namespace Storage { namespace Test {
TEST_F(BlockBlobClientTest, DownloadTransactionalHash)
{
const int64_t downloadLength = 1024;
Blobs::DownloadBlobOptions options;
options.Range = Azure::Core::Http::HttpRange();
options.Range.Value().Offset = 0;
options.Range.Value().Length = downloadLength;
options.RangeHashAlgorithm = HashAlgorithm::Md5;
auto res = m_blockBlobClient->Download(options);
ASSERT_TRUE(res.Value.TransactionalContentHash.HasValue());
EXPECT_EQ(res.Value.TransactionalContentHash.Value().Algorithm, HashAlgorithm::Md5);
const std::vector<uint8_t> dataPart1(static_cast<size_t>(4_MB + 1), 'a');
const std::vector<uint8_t> dataPart2(static_cast<size_t>(4_MB + 1), 'b');
const std::string blockId1 = Base64EncodeText("0");
const std::string blockId2 = Base64EncodeText("1");
auto blobClient = m_blobContainerClient->GetBlockBlobClient(RandomString());
auto blockContent = Azure::Core::IO::MemoryBodyStream(dataPart1.data(), dataPart1.size());
blobClient.StageBlock(blockId1, blockContent);
blockContent = Azure::Core::IO::MemoryBodyStream(dataPart2.data(), dataPart2.size());
blobClient.StageBlock(blockId2, blockContent);
blobClient.CommitBlockList({blockId1, blockId2});
std::vector<uint8_t> blobMd5;
{
Azure::Core::Cryptography::Md5Hash instance;
EXPECT_EQ(
res.Value.TransactionalContentHash.Value().Value,
instance.Final(m_blobContent.data(), downloadLength));
instance.Append(dataPart1.data(), dataPart1.size());
blobMd5 = instance.Final(dataPart2.data(), dataPart2.size());
}
options.RangeHashAlgorithm = HashAlgorithm::Crc64;
res = m_blockBlobClient->Download(options);
ASSERT_TRUE(res.Value.TransactionalContentHash.HasValue());
EXPECT_EQ(res.Value.TransactionalContentHash.Value().Algorithm, HashAlgorithm::Crc64);
for (bool blobHasMd5 : {true, false})
{
Crc64Hash instance;
EXPECT_EQ(
res.Value.TransactionalContentHash.Value().Value,
instance.Final(m_blobContent.data(), downloadLength));
if (blobHasMd5)
{
Blobs::Models::BlobHttpHeaders headers;
headers.ContentHash.Algorithm = HashAlgorithm::Md5;
headers.ContentHash.Value = blobMd5;
blobClient.SetHttpHeaders(headers);
ASSERT_FALSE(blobClient.GetProperties().Value.HttpHeaders.ContentHash.Value.empty());
EXPECT_EQ(blobClient.Download().Value.Details.HttpHeaders.ContentHash.Value, blobMd5);
}
else
{
blobClient.SetHttpHeaders(Blobs::Models::BlobHttpHeaders());
ASSERT_TRUE(blobClient.GetProperties().Value.HttpHeaders.ContentHash.Value.empty());
ASSERT_TRUE(blobClient.Download().Value.Details.HttpHeaders.ContentHash.Value.empty());
}
const int64_t downloadLength = 1;
Blobs::DownloadBlobOptions options;
options.Range = Azure::Core::Http::HttpRange();
options.Range.Value().Offset = 0;
options.Range.Value().Length = downloadLength;
options.RangeHashAlgorithm = HashAlgorithm::Md5;
auto res = blobClient.Download(options);
if (blobHasMd5)
{
EXPECT_EQ(res.Value.Details.HttpHeaders.ContentHash.Value, blobMd5);
}
else
{
EXPECT_TRUE(res.Value.Details.HttpHeaders.ContentHash.Value.empty());
}
ASSERT_TRUE(res.Value.TransactionalContentHash.HasValue());
EXPECT_EQ(res.Value.TransactionalContentHash.Value().Algorithm, HashAlgorithm::Md5);
{
Azure::Core::Cryptography::Md5Hash instance;
EXPECT_EQ(
res.Value.TransactionalContentHash.Value().Value,
instance.Final(dataPart1.data(), downloadLength));
}
options.RangeHashAlgorithm = HashAlgorithm::Crc64;
res = blobClient.Download(options);
if (blobHasMd5)
{
EXPECT_EQ(res.Value.Details.HttpHeaders.ContentHash.Value, blobMd5);
}
else
{
EXPECT_TRUE(res.Value.Details.HttpHeaders.ContentHash.Value.empty());
}
ASSERT_TRUE(res.Value.TransactionalContentHash.HasValue());
EXPECT_EQ(res.Value.TransactionalContentHash.Value().Algorithm, HashAlgorithm::Crc64);
{
Crc64Hash instance;
EXPECT_EQ(
res.Value.TransactionalContentHash.Value().Value,
instance.Final(dataPart1.data(), downloadLength));
}
}
}

3
sdk/storage/azure-storage-files-datalake/CHANGELOG.md
View File

@ -2,6 +2,9 @@
## 12.1.0-beta.1 (Unreleased)
### Bug Fixes
- Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob.
## 12.0.0 (2021-06-08)