Skip to content
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

Ben/s3proxy fixes #1091

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Ben/s3proxy fixes #1091

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
704d6a3
fix: s3proxy invalid input options passed to backend service
benmcclelland Feb 26, 2025
f7277e4
fix: s3proxy list object returns invalid response
benmcclelland Feb 26, 2025
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
42 changes: 41 additions & 1 deletion backend/s3proxy/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ func (s *S3Proxy) GetBucketVersioning(ctx context.Context, bucket string) (s3res
}

func (s *S3Proxy) ListObjectVersions(ctx context.Context, input *s3.ListObjectVersionsInput) (s3response.ListVersionsResult, error) {
if input.VersionIdMarker != nil && *input.VersionIdMarker == "" {
input.VersionIdMarker = nil
}

out, err := s.client.ListObjectVersions(ctx, input)
if err != nil {
return s3response.ListVersionsResult{}, handleError(err)
Expand Down Expand Up @@ -395,11 +399,19 @@ func (s *S3Proxy) PutObject(ctx context.Context, input *s3.PutObjectInput) (s3re
}

func (s *S3Proxy) HeadObject(ctx context.Context, input *s3.HeadObjectInput) (*s3.HeadObjectOutput, error) {
if input.VersionId != nil && *input.VersionId == "" {
input.VersionId = nil
}

out, err := s.client.HeadObject(ctx, input)
return out, handleError(err)
}

func (s *S3Proxy) GetObject(ctx context.Context, input *s3.GetObjectInput) (*s3.GetObjectOutput, error) {
if input.VersionId != nil && *input.VersionId == "" {
input.VersionId = nil
}

output, err := s.client.GetObject(ctx, input)
if err != nil {
return nil, handleError(err)
Expand All @@ -409,6 +421,10 @@ func (s *S3Proxy) GetObject(ctx context.Context, input *s3.GetObjectInput) (*s3.
}

func (s *S3Proxy) GetObjectAttributes(ctx context.Context, input *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResponse, error) {
if input.VersionId != nil && *input.VersionId == "" {
input.VersionId = nil
}

out, err := s.client.GetObjectAttributes(ctx, input)

parts := s3response.ObjectParts{}
Expand Down Expand Up @@ -451,6 +467,16 @@ func (s *S3Proxy) CopyObject(ctx context.Context, input *s3.CopyObjectInput) (*s
}

func (s *S3Proxy) ListObjects(ctx context.Context, input *s3.ListObjectsInput) (s3response.ListObjectsResult, error) {
if input.Marker != nil && *input.Marker == "" {
input.Marker = nil
}
if input.Delimiter != nil && *input.Delimiter == "" {
input.Delimiter = nil
}
if input.Prefix != nil && *input.Prefix == "" {
input.Prefix = nil
}

out, err := s.client.ListObjects(ctx, input)
if err != nil {
return s3response.ListObjectsResult{}, handleError(err)
Expand All @@ -472,6 +498,16 @@ func (s *S3Proxy) ListObjects(ctx context.Context, input *s3.ListObjectsInput) (
}

func (s *S3Proxy) ListObjectsV2(ctx context.Context, input *s3.ListObjectsV2Input) (s3response.ListObjectsV2Result, error) {
if input.ContinuationToken != nil && *input.ContinuationToken == "" {
input.ContinuationToken = nil
}
if input.Delimiter != nil && *input.Delimiter == "" {
input.Delimiter = nil
}
if input.Prefix != nil && *input.Prefix == "" {
input.Prefix = nil
}

out, err := s.client.ListObjectsV2(ctx, input)
if err != nil {
return s3response.ListObjectsV2Result{}, handleError(err)
Expand All @@ -494,6 +530,10 @@ func (s *S3Proxy) ListObjectsV2(ctx context.Context, input *s3.ListObjectsV2Inpu
}

func (s *S3Proxy) DeleteObject(ctx context.Context, input *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error) {
if input.VersionId != nil && *input.VersionId == "" {
input.VersionId = nil
}

res, err := s.client.DeleteObject(ctx, input)
return res, handleError(err)
}
Expand Down Expand Up @@ -858,7 +898,7 @@ func base64Decode(encoded string) ([]byte, error) {
}

func convertObjects(objs []types.Object) []s3response.Object {
result := make([]s3response.Object, len(objs))
result := make([]s3response.Object, 0, len(objs))

for _, obj := range objs {
result = append(result, s3response.Object{
Expand Down
Loading