MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-10 05:59:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use user CAs in checkEndpoint() call (#8911)

Browse Source 
The server info handler makes a http connection to other
nodes to check if they are up but does not load the custom
CAs in ~/.minio/certs/CAs.

This commit fix it.

Co-authored-by: Harshavardhana <harsha@minio.io>
This commit is contained in:
Anis Elleuch
2020-02-02 02:45:29 +01:00
committed by GitHub
parent d76160c245
commit 7432b5c9b2
5 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/event/target/elasticsearch.go
View File

@@ -95,7 +95,7 @@ func (target *ElasticsearchTarget) ID() event.TargetID {
// IsActive - Return true if target is up and active
func (target *ElasticsearchTarget) IsActive() (bool, error) {
if dErr := target.args.URL.DialHTTP(); dErr != nil {
if dErr := target.args.URL.DialHTTP(nil); dErr != nil {
if xnet.IsNetworkOrHostDown(dErr) {
return false, errNotConnected
}
@@ -260,7 +260,7 @@ func NewElasticsearchTarget(id string, args ElasticsearchArgs, doneCh <-chan str
}
}
dErr := args.URL.DialHTTP()
dErr := args.URL.DialHTTP(nil)
if dErr != nil {
if store == nil {
return nil, dErr

2
pkg/event/target/webhook.go
View File

@@ -95,7 +95,7 @@ func (target *WebhookTarget) IsActive() (bool, error) {
if pErr != nil {
return false, pErr
}
if dErr := u.DialHTTP(); dErr != nil {
if dErr := u.DialHTTP(nil); dErr != nil {
if xnet.IsNetworkOrHostDown(dErr) {
return false, errNotConnected
}

14
pkg/net/url.go
View File

@@ -86,14 +86,20 @@ func (u *URL) UnmarshalJSON(data []byte) (err error) {
}
// DialHTTP - dials the url to check the connection.
func (u URL) DialHTTP() error {
var client = &http.Client{
Transport: &http.Transport{
func (u URL) DialHTTP(transport *http.Transport) error {
if transport == nil {
transport = &http.Transport{
DialContext: (&net.Dialer{
Timeout: 2 * time.Second,
}).DialContext,
},
}
}
var client = &http.Client{
Transport: transport,
}
req, err := http.NewRequest("POST", u.String(), nil)
if err != nil {
return err