Skip to content

Fix: Prevent object key normalization in signed URL generation #1548

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

Open
ryomosao wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Prevent object key normalization in signed URL generation #1548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 8 additions & 17 deletions pkg/abstractions/volume/multipart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"math"
"path/filepath"
"time"

"github.com/aws/aws-sdk-go-v2/aws"
Expand Down Expand Up @@ -42,14 +41,6 @@ func (s *GlobalVolumeService) getS3Client() *s3.Client {
})
}

func joinCleanPath(parts ...string) string {
for i, part := range parts {
parts[i] = filepath.Clean(part)
}

return filepath.Join(parts...)
}

func (s *GlobalVolumeService) GetFileServiceInfo(ctx context.Context, in *pb.GetFileServiceInfoRequest) (*pb.GetFileServiceInfoResponse, error) {
return &pb.GetFileServiceInfoResponse{
Ok: true,
Expand All @@ -71,7 +62,7 @@ func (s *GlobalVolumeService) CreatePresignedURL(ctx context.Context, in *pb.Cre
var s3Client *s3.Client
var presignClient *s3.PresignClient

key := joinCleanPath(types.DefaultVolumesPrefix, authInfo.Workspace.Name, volume.ExternalId, in.VolumePath)
key := types.DefaultVolumesPrefix + "/" + authInfo.Workspace.Name + "/" + volume.ExternalId + "/" + in.VolumePath
bucket := s.config.BucketName

if authInfo.Workspace.StorageAvailable() {
Expand All @@ -85,7 +76,7 @@ func (s *GlobalVolumeService) CreatePresignedURL(ctx context.Context, in *pb.Cre

s3Client = storageClient.S3Client()
presignClient = storageClient.PresignClient()
key = joinCleanPath(types.DefaultVolumesPrefix, volume.ExternalId, in.VolumePath)
key = types.DefaultVolumesPrefix + "/" + volume.ExternalId + "/" + in.VolumePath
bucket = storageClient.BucketName()
} else {
s3Client = s.getS3Client()
Expand Down Expand Up @@ -177,7 +168,7 @@ func (s *GlobalVolumeService) CreateMultipartUpload(ctx context.Context, in *pb.

var s3Client *s3.Client
bucket := s.config.BucketName
key := joinCleanPath(types.DefaultVolumesPrefix, authInfo.Workspace.Name, volume.ExternalId, in.VolumePath)
key := types.DefaultVolumesPrefix + "/" + authInfo.Workspace.Name + "/" + volume.ExternalId + "/" + in.VolumePath

if authInfo.Workspace.StorageAvailable() {
storageClient, err := clients.NewWorkspaceStorageClient(ctx, authInfo.Workspace.Name, authInfo.Workspace.Storage)
Expand All @@ -190,7 +181,7 @@ func (s *GlobalVolumeService) CreateMultipartUpload(ctx context.Context, in *pb.

s3Client = storageClient.S3Client()
bucket = storageClient.BucketName()
key = joinCleanPath(types.DefaultVolumesPrefix, volume.ExternalId, in.VolumePath)
key = types.DefaultVolumesPrefix + "/" + volume.ExternalId + "/" + in.VolumePath
} else {
s3Client = s.getS3Client()
}
Expand Down Expand Up @@ -268,7 +259,7 @@ func (s *GlobalVolumeService) CompleteMultipartUpload(ctx context.Context, in *p
var s3Client *s3.Client

bucket := s.config.BucketName
key := joinCleanPath(types.DefaultVolumesPrefix, authInfo.Workspace.Name, volume.ExternalId, in.VolumePath)
key := types.DefaultVolumesPrefix + "/" + authInfo.Workspace.Name + "/" + volume.ExternalId + "/" + in.VolumePath

if authInfo.Workspace.StorageAvailable() {
storageClient, err := clients.NewWorkspaceStorageClient(ctx, authInfo.Workspace.Name, authInfo.Workspace.Storage)
Expand All @@ -281,7 +272,7 @@ func (s *GlobalVolumeService) CompleteMultipartUpload(ctx context.Context, in *p

s3Client = storageClient.S3Client()
bucket = storageClient.BucketName()
key = joinCleanPath(types.DefaultVolumesPrefix, volume.ExternalId, in.VolumePath)
key = types.DefaultVolumesPrefix + "/" + volume.ExternalId + "/" + in.VolumePath
} else {
s3Client = s.getS3Client()
}
Expand Down Expand Up @@ -330,7 +321,7 @@ func (s *GlobalVolumeService) AbortMultipartUpload(ctx context.Context, in *pb.A
var s3Client *s3.Client

bucket := s.config.BucketName
key := joinCleanPath(types.DefaultVolumesPrefix, authInfo.Workspace.Name, volume.ExternalId, in.VolumePath)
key := types.DefaultVolumesPrefix + "/" + authInfo.Workspace.Name + "/" + volume.ExternalId + "/" + in.VolumePath

if authInfo.Workspace.StorageAvailable() {
storageClient, err := clients.NewWorkspaceStorageClient(ctx, authInfo.Workspace.Name, authInfo.Workspace.Storage)
Expand All @@ -343,7 +334,7 @@ func (s *GlobalVolumeService) AbortMultipartUpload(ctx context.Context, in *pb.A

s3Client = storageClient.S3Client()
bucket = storageClient.BucketName()
key = joinCleanPath(types.DefaultVolumesPrefix, volume.ExternalId, in.VolumePath)
key = types.DefaultVolumesPrefix + "/" + volume.ExternalId + "/" + in.VolumePath
} else {
s3Client = s.getS3Client()
}
Expand Down