Added support for path style in presigned Post

.changelog/7762e0d93d3e4d549a85c7174feaff94.json

@@ -0,0 +1,8 @@
+{
+    "id": "7762e0d9-3d3e-4d54-9a85-c7174feaff94",
+    "type": "bugfix",
+    "description": "Added support for path style urls and overrides in presigned post",
+    "modules": [
+        "service/s3"
+    ]
+}

service/s3/presign_post.go

@@ -8,6 +8,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/url"
 	"strings"
 	"time"
@@ -166,6 +167,9 @@ type PresignPostOptions struct {
 	//
 	// [here]https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-HTTPPOSTConstructPolicy.html#sigv4-PolicyConditions
 	Conditions []interface{}
+
+	// BaseURLOverride provides an override for the presigner
+	BaseURLOverride *string
 }
 
 type presignPostConverter PresignPostOptions
@@ -177,6 +181,7 @@ type presignPostRequestMiddlewareOptions struct {
 	LogSigning          bool
 	ExpiresIn           time.Duration
 	Conditions          []interface{}
+	BaseURLOverride     *string
 }
 
 type presignPostRequestMiddleware struct {
@@ -185,6 +190,7 @@ type presignPostRequestMiddleware struct {
 	logSigning          bool
 	expiresIn           time.Duration
 	conditions          []interface{}
+	BaseURLOverride     *string
 }
 
 // newPresignPostRequestMiddleware returns a new presignPostRequestMiddleware
@@ -196,6 +202,7 @@ func newPresignPostRequestMiddleware(options presignPostRequestMiddlewareOptions
 		logSigning:          options.LogSigning,
 		expiresIn:           options.ExpiresIn,
 		conditions:          options.Conditions,
+		BaseURLOverride:     options.BaseURLOverride,
 	}
 }
 
@@ -267,6 +274,9 @@ func (s *presignPostRequestMiddleware) HandleFinalize(
 
 	// Other middlewares may set default values on the URL on the path or as query params. Remove them
 	baseURL := toBaseURL(u)
+	if s.BaseURLOverride != nil {
+		baseURL = *s.BaseURLOverride
+	}
 
 	out.Result = &PresignedPostRequest{
 		URL:    baseURL,
@@ -277,8 +287,21 @@ func (s *presignPostRequestMiddleware) HandleFinalize(
 }
 
 func toBaseURL(fullURL string) string {
-	a, _ := url.Parse(fullURL)
-	return a.Scheme + "://" + a.Host
+	parsedURL, err := url.Parse(fullURL)
+	if err != nil {
+		log.Printf("Invalid URL format: %v", err)
+		return ""
+	}
+	pathSegments := strings.Split(parsedURL.Path, "/")
+
+	if len(pathSegments) > 0 && pathSegments[0] == "" {
+		pathSegments = pathSegments[1:]
+	}
+
+	if len(pathSegments) > 1 {
+		return fmt.Sprintf("%s://%s/%s", parsedURL.Scheme, parsedURL.Host, pathSegments[0])
+	}
+	return fmt.Sprintf("%s://%s", parsedURL.Scheme, parsedURL.Host)
 }
 
 // Adapted from existing PresignConverter middleware
@@ -305,6 +328,7 @@ func (c presignPostConverter) ConvertToPresignMiddleware(stack *middleware.Stack
 		LogSigning:          options.ClientLogMode.IsSigning(),
 		ExpiresIn:           expiresIn,
 		Conditions:          c.Conditions,
+		BaseURLOverride:     c.BaseURLOverride,
 	})
 	if _, err := stack.Finalize.Swap("Signing", pmw); err != nil {
 		return err

service/s3/presign_post_test.go

@@ -19,11 +19,13 @@ func TestPresignPutObject(t *testing.T) {
 	defer mockTime(fixedTime)()
 
 	cases := map[string]struct {
-		input           PutObjectInput
-		options         []func(*PresignPostOptions)
-		expectedExpires time.Time
-		expectedURL     string
-		region          string
+		input            PutObjectInput
+		options          []func(*PresignPostOptions)
+		expectedExpires  time.Time
+		expectedURL      string
+		region           string
+		pathStyleEnabled bool
+		BaseEndpoint     string
 	}{
 		"sample": {
 			input: PutObjectInput{
@@ -66,6 +68,49 @@ func TestPresignPutObject(t *testing.T) {
 			},
 			expectedURL: "https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com",
 		},
+		"override base url": {
+			input: PutObjectInput{
+				Bucket: aws.String("bucket"),
+				Key:    aws.String("key"),
+			},
+			options: []func(o *PresignPostOptions){
+				func(o *PresignPostOptions) {
+					o.BaseURLOverride = aws.String("https://s3.custom-domain.com")
+				},
+			},
+			expectedURL: "https://s3.custom-domain.com",
+		},
+		"use path style bucket hosting pattern": {
+			input: PutObjectInput{
+				Bucket: aws.String("bucket"),
+				Key:    aws.String("key"),
+			},
+			expectedURL:      "https://s3.us-west-2.amazonaws.com/bucket",
+			pathStyleEnabled: true,
+		},
+		"use path style bucket with custom baseEndpoint": {
+			input: PutObjectInput{
+				Bucket: aws.String("bucket"),
+				Key:    aws.String("key"),
+			},
+			expectedURL:      "https://s3.custom-domain.com/bucket",
+			pathStyleEnabled: true,
+			BaseEndpoint:     "https://s3.custom-domain.com",
+		},
+		"path style with baseEndpoint with url override option": {
+			input: PutObjectInput{
+				Bucket: aws.String("bucket"),
+				Key:    aws.String("key"),
+			},
+			options: []func(o *PresignPostOptions){
+				func(o *PresignPostOptions) {
+					o.BaseURLOverride = aws.String("https://different-url.com")
+				},
+			},
+			expectedURL:      "https://different-url.com",
+			pathStyleEnabled: true,
+			BaseEndpoint:     "https://s3.custom-domain.com",
+		},
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
@@ -81,8 +126,12 @@ func TestPresignPutObject(t *testing.T) {
 					return aws.NopRetryer{}
 				},
 			}
-
-			presignClient := NewPresignClient(NewFromConfig(cfg))
+			presignClient := NewPresignClient(NewFromConfig(cfg, func(options *Options) {
+				options.UsePathStyle = tc.pathStyleEnabled
+				if tc.BaseEndpoint != "" {
+					options.BaseEndpoint = aws.String(tc.BaseEndpoint)
+				}
+			}))
 			postObject, err := presignClient.PresignPostObject(ctx, &tc.input, tc.options...)
 			if err != nil {
 				t.Error(err)