mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-09-05 23:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Changed ListBuckets action implementation to return all the buckets for admin users and only the ones only the requester for regular users

Browse Source
This commit is contained in:
jonaustin09
2024-06-14 14:05:56 -04:00
parent be0ddc770d
commit c73281d8f5
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/azure/azure.go
+27 -6
View File
@@ -36,6 +36,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service"
"github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/versity/versitygw/auth" "github.com/versity/versitygw/auth"
@@ -176,7 +177,12 @@ func (az *Azure) CreateBucket(ctx context.Context, input *s3.CreateBucketInput,
} }
func (az *Azure) ListBuckets(ctx context.Context, owner string, isAdmin bool) (s3response.ListAllMyBucketsResult, error) { func (az *Azure) ListBuckets(ctx context.Context, owner string, isAdmin bool) (s3response.ListAllMyBucketsResult, error) {
pager := az.client.NewListContainersPager(nil) pager := az.client.NewListContainersPager(
&service.ListContainersOptions{
Include: service.ListContainersInclude{
Metadata: true,
},
})
var buckets []s3response.ListAllMyBucketsEntry var buckets []s3response.ListAllMyBucketsEntry
var result s3response.ListAllMyBucketsResult var result s3response.ListAllMyBucketsResult
@@ -187,11 +193,26 @@ func (az *Azure) ListBuckets(ctx context.Context, owner string, isAdmin bool) (s
return result, azureErrToS3Err(err) return result, azureErrToS3Err(err)
} }
for _, v := range resp.ContainerItems { for _, v := range resp.ContainerItems {
buckets = append(buckets, s3response.ListAllMyBucketsEntry{ if isAdmin {
Name: *v.Name, buckets = append(buckets, s3response.ListAllMyBucketsEntry{
// TODO: using modification date here instead of creation, is that ok? Name: *v.Name,
CreationDate: *v.Properties.LastModified, // TODO: using modification date here instead of creation, is that ok?
}) CreationDate: *v.Properties.LastModified,
})
} else {
acl, err := getAclFromMetadata(v.Metadata, keyAclLower)
if err != nil {
return result, err
}
if acl.Owner == owner {
buckets = append(buckets, s3response.ListAllMyBucketsEntry{
Name: *v.Name,
// TODO: using modification date here instead of creation, is that ok?
CreationDate: *v.Properties.LastModified,
})
}
}
} }
} }