Skip to content

Test List Blobs Fix for Invalid XML Characters #21342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siminsavani-msft merged 2 commits into from
Aug 10, 2023
Merged

Test List Blobs Fix for Invalid XML Characters #21342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1fb659
Testing list flat and hierarchy with invalid blobname
siminsavani-msft Aug 9, 2023
eedc076
Fixing test names
siminsavani-msft Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/storage/azblob/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "go",
"TagPrefix": "go/storage/azblob",
"Tag": "go/storage/azblob_816342f61e"
"Tag": "go/storage/azblob_7a25fb98e8"
}
57 changes: 57 additions & 0 deletions sdk/storage/azblob/container/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,63 @@ func (s *ContainerRecordedTestsSuite) TestContainerListBlobsDelimiterPrefixVersi
}
}

func (s *ContainerRecordedTestsSuite) TestContainerListFlatBlobsInvalidBlobName() {
_require := require.New(s.T())
testName := s.T().Name()
svcClient, err := testcommon.GetServiceClient(s.T(), testcommon.TestAccountDefault, nil)
_require.NoError(err)

containerName := testcommon.GenerateContainerName(testName)
containerClient := testcommon.CreateNewContainer(context.Background(), _require, containerName, svcClient)
defer testcommon.DeleteContainer(context.Background(), _require, containerClient)

blobName := "dir1/dir2/file\uFFFF.blob"
_ = testcommon.CreateNewBlockBlob(context.Background(), _require, blobName, containerClient)

pager := containerClient.NewListBlobsFlatPager(nil)
for pager.More() {
resp, err := pager.NextPage(context.Background())
_require.NoError(err)

_require.Equal(len(resp.Segment.BlobItems), 1)
_require.Equal(*resp.Segment.BlobItems[0].Name, blobName)
}
}

func (s *ContainerRecordedTestsSuite) TestContainerListHierarchyBlobsInvalidBlobName() {
_require := require.New(s.T())
testName := s.T().Name()
svcClient, err := testcommon.GetServiceClient(s.T(), testcommon.TestAccountDefault, nil)
_require.NoError(err)

containerName := testcommon.GenerateContainerName(testName)
containerClient := testcommon.CreateNewContainer(context.Background(), _require, containerName, svcClient)
defer testcommon.DeleteContainer(context.Background(), _require, containerClient)

blobName := "dir1/dir2/file\uFFFF.blob"
_ = testcommon.CreateNewBlockBlob(context.Background(), _require, blobName, containerClient)

pager := containerClient.NewListBlobsHierarchyPager(".b", nil)
for pager.More() {
resp, err := pager.NextPage(context.Background())
_require.NoError(err)

_require.Equal(len(resp.Segment.BlobItems), 0)
_require.Equal(len(resp.Segment.BlobPrefixes), 1)
_require.Equal(*resp.Segment.BlobPrefixes[0].Name, "dir1/dir2/file\uFFFF.b")
}

// empty delimiter
pager1 := containerClient.NewListBlobsHierarchyPager("", nil)
for pager1.More() {
resp, err := pager1.NextPage(context.Background())
_require.NoError(err)

_require.Equal(len(resp.Segment.BlobItems), 1)
_require.Equal(*resp.Segment.BlobItems[0].Name, blobName)
}
}

func (s *ContainerRecordedTestsSuite) TestContainerListBlobsWithSnapshots() {
_require := require.New(s.T())
testName := s.T().Name()
Expand Down
10 changes: 7 additions & 3 deletions sdk/storage/azblob/internal/generated/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
package generated

import (
"encoding/base64"
"encoding/xml"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"net/url"
)

type TransactionalContentSetter interface {
Expand Down Expand Up @@ -94,7 +94,9 @@ func (b *BlobPrefix) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) erro
}
if aux.BlobName != nil {
if aux.BlobName.Encoded != nil && *aux.BlobName.Encoded {
name, err := base64.StdEncoding.DecodeString(*aux.BlobName.Content)
name, err := url.QueryUnescape(*aux.BlobName.Content)

// name, err := base64.StdEncoding.DecodeString(*aux.BlobName.Content)
if err != nil {
return err
}
Expand Down Expand Up @@ -124,7 +126,9 @@ func (b *BlobItem) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error
b.OrMetadata = (map[string]*string)(aux.OrMetadata)
if aux.BlobName != nil {
if aux.BlobName.Encoded != nil && *aux.BlobName.Encoded {
name, err := base64.StdEncoding.DecodeString(*aux.BlobName.Content)
name, err := url.QueryUnescape(*aux.BlobName.Content)

// name, err := base64.StdEncoding.DecodeString(*aux.BlobName.Content)
if err != nil {
return err
}
Expand Down