allow virtual host style for GetBucketLocation API, if requested (#1785)

minio · Mar 6, 2023 · 24cdd7f · 24cdd7f
1 parent 5384d69
commit 24cdd7f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/bucket-cache.go b/bucket-cache.go
@@ -190,12 +190,11 @@ func (c *Client) getBucketLocationRequest(ctx context.Context, bucketName string
 		}
 	}
 
-	isVirtualHost := s3utils.IsVirtualHostSupported(targetURL, bucketName)
+	isVirtualStyle := c.isVirtualHostStyleRequest(targetURL, bucketName)
 
 	var urlStr string
 
-	// only support Aliyun OSS for virtual hosted path,  compatible  Amazon & Google Endpoint
-	if isVirtualHost && s3utils.IsAliyunOSSEndpoint(targetURL) {
+	if isVirtualStyle {
 		urlStr = c.endpointURL.Scheme + "://" + bucketName + "." + targetURL.Host + "/?location"
 	} else {
 		targetURL.Path = path.Join(bucketName, "") + "/"

diff --git a/bucket-cache_test.go b/bucket-cache_test.go
@@ -75,11 +75,20 @@ func TestGetBucketLocationRequest(t *testing.T) {
 
 		// Set get bucket location always as path style.
 		targetURL := *c.endpointURL
-		targetURL.Path = path.Join(bucketName, "") + "/"
-		targetURL.RawQuery = urlValues.Encode()
+
+		isVirtualStyle := c.isVirtualHostStyleRequest(targetURL, bucketName)
+
+		var urlStr string
+		if isVirtualStyle {
+			urlStr = targetURL.Scheme + "://" + bucketName + "." + targetURL.Host + "/?location"
+		} else {
+			targetURL.Path = path.Join(bucketName, "") + "/"
+			targetURL.RawQuery = urlValues.Encode()
+			urlStr = targetURL.String()
+		}
 
 		// Get a new HTTP request for the method.
-		req, err := http.NewRequest(http.MethodGet, targetURL.String(), nil)
+		req, err := http.NewRequest(http.MethodGet, urlStr, nil)
 		if err != nil {
 			return nil, err
 		}