self-hosted/minio
self-hosted/minio
1
0
Fork 0
mirror of https://github.com/minio/minio synced 2024-07-21 10:25:00 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

madmin: Strip 80/443 from the endpoint when http/https (#9937)

Browse source 
Users having endpoints with this format http://url:80 or http://url:443
will face signature mismatch error.

The reason is that  S3 spec ignores :80 or :443 port in the endpoint
when calculating the signature, so this PR will just strip them.
This commit is contained in:
Anis Elleuch 2020-06-29 20:31:07 +01:00 committed by GitHub
parent dcffd87e08
commit 7cea3f7da4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/madmin/utils.go
View file

@ -67,12 +67,22 @@ func getEndpointURL(endpoint string, secure bool) (*url.URL, error) {
return nil, ErrInvalidArgument(msg) return nil, ErrInvalidArgument(msg)
} }
} }
// If secure is false, use 'http' scheme. // If secure is false, use 'http' scheme.
scheme := "https" scheme := "https"
if !secure { if !secure {
scheme = "http" scheme = "http"
} }
// Strip the obvious :443 and :80 from the endpoint
// to avoid the signature mismatch error.
if secure && strings.HasSuffix(endpoint, ":443") {
endpoint = strings.TrimSuffix(endpoint, ":443")
}
if !secure && strings.HasSuffix(endpoint, ":80") {
endpoint = strings.TrimSuffix(endpoint, ":80")
}
// Construct a secured endpoint URL. // Construct a secured endpoint URL.
endpointURLStr := scheme + "://" + endpoint endpointURLStr := scheme + "://" + endpoint
endpointURL, err := url.Parse(endpointURLStr) endpointURL, err := url.Parse(endpointURLStr)