diff options
author | 2025-02-10 15:30:29 +0000 | |
---|---|---|
committer | 2025-02-10 15:30:29 +0000 | |
commit | bb6d2f8ee8db01794c03dad2ef96905ffe76f9ad (patch) | |
tree | e4e6f5b72b4841965f29a47f38a2b518324ac1ae /vendor/github.com/minio/minio-go/v7/api.go | |
parent | [chore]: Bump golang.org/x/image from 0.23.0 to 0.24.0 (#3773) (diff) | |
download | gotosocial-bb6d2f8ee8db01794c03dad2ef96905ffe76f9ad.tar.xz |
[chore]: Bump github.com/minio/minio-go/v7 from 7.0.84 to 7.0.85 (#3772)
Diffstat (limited to 'vendor/github.com/minio/minio-go/v7/api.go')
-rw-r--r-- | vendor/github.com/minio/minio-go/v7/api.go | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/vendor/github.com/minio/minio-go/v7/api.go b/vendor/github.com/minio/minio-go/v7/api.go index cc0ded2c7..ff9f69118 100644 --- a/vendor/github.com/minio/minio-go/v7/api.go +++ b/vendor/github.com/minio/minio-go/v7/api.go @@ -92,6 +92,9 @@ type Client struct { // default to Auto. lookup BucketLookupType + // lookupFn is a custom function to return URL lookup type supported by the server. + lookupFn func(u url.URL, bucketName string) BucketLookupType + // Factory for MD5 hash functions. md5Hasher func() md5simd.Hasher sha256Hasher func() md5simd.Hasher @@ -117,6 +120,25 @@ type Options struct { // function to perform region lookups appropriately. CustomRegionViaURL func(u url.URL) string + // Provide a custom function that returns BucketLookupType based + // on the input URL, this is just like s3utils.IsVirtualHostSupported() + // function but allows users to provide their own implementation. + // Once this is set it overrides all settings for opts.BucketLookup + // if this function returns BucketLookupAuto then default detection + // via s3utils.IsVirtualHostSupported() is used, otherwise the + // function is expected to return appropriate value as expected for + // the URL the user wishes to honor. + // + // BucketName is passed additionally for the caller to ensure + // handle situations where `bucketNames` have multiple `.` separators + // in such case HTTPs certs will not work properly for *.<domain> + // wildcards, so you need to specifically handle these situations + // and not return bucket as part of DNS since those requests may fail. + // + // For better understanding look at s3utils.IsVirtualHostSupported() + // implementation. + BucketLookupViaURL func(u url.URL, bucketName string) BucketLookupType + // TrailingHeaders indicates server support of trailing headers. // Only supported for v4 signatures. TrailingHeaders bool @@ -133,7 +155,7 @@ type Options struct { // Global constants. const ( libraryName = "minio-go" - libraryVersion = "v7.0.84" + libraryVersion = "v7.0.85" ) // User Agent should always following the below style. @@ -279,6 +301,7 @@ func privateNew(endpoint string, opts *Options) (*Client, error) { // Sets bucket lookup style, whether server accepts DNS or Path lookup. Default is Auto - determined // by the SDK. When Auto is specified, DNS lookup is used for Amazon/Google cloud endpoints and Path for all other endpoints. clnt.lookup = opts.BucketLookup + clnt.lookupFn = opts.BucketLookupViaURL // healthcheck is not initialized clnt.healthStatus = unknown @@ -1003,6 +1026,18 @@ func (c *Client) makeTargetURL(bucketName, objectName, bucketLocation string, is // returns true if virtual hosted style requests are to be used. func (c *Client) isVirtualHostStyleRequest(url url.URL, bucketName string) bool { + if c.lookupFn != nil { + lookup := c.lookupFn(url, bucketName) + switch lookup { + case BucketLookupDNS: + return true + case BucketLookupPath: + return false + } + // if its auto then we fallback to default detection. + return s3utils.IsVirtualHostSupported(url, bucketName) + } + if bucketName == "" { return false } @@ -1010,11 +1045,12 @@ func (c *Client) isVirtualHostStyleRequest(url url.URL, bucketName string) bool if c.lookup == BucketLookupDNS { return true } + if c.lookup == BucketLookupPath { return false } - // default to virtual only for Amazon/Google storage. In all other cases use + // default to virtual only for Amazon/Google storage. In all other cases use // path style requests return s3utils.IsVirtualHostSupported(url, bucketName) } |