towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 11:37:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed TLS errors in collect

Browse source
This commit is contained in:
David J. Allen 2024-05-08 14:46:29 -06:00
parent 0403b2bcbc
commit a75530e96b
No known key found for this signature in database
GPG key ID: 717C593FF60A2ACC
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/collect.go
View file

@ -529,7 +529,7 @@ func makeGofishConfig(q *QueryParams) (gofish.ClientConfig, error) {
Endpoint: url, Endpoint: url,
Username: q.User, Username: q.User,
Password: q.Pass, Password: q.Pass,
Insecure: q.CaCertPath == "", Insecure: true,
TLSHandshakeTimeout: q.Timeout, TLSHandshakeTimeout: q.Timeout,
HTTPClient: client, HTTPClient: client,
// MaxConcurrentRequests: int64(q.Threads), // NOTE: this was added in latest version of gofish // MaxConcurrentRequests: int64(q.Threads), // NOTE: this was added in latest version of gofish

14
internal/util/util.go
View file

@ -45,11 +45,13 @@ func MakeRequest(client *http.Client, url string, httpMethod string, body []byte
// use defaults if no client provided // use defaults if no client provided
if client == nil { if client == nil {
client = http.DefaultClient client = http.DefaultClient
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true} client.Transport = &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
} }
req, err := http.NewRequest(httpMethod, url, bytes.NewBuffer(body)) req, err := http.NewRequest(httpMethod, url, bytes.NewBuffer(body))
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("failed tocreate new HTTP request: %v", err) return nil, nil, fmt.Errorf("failed to create new HTTP request: %v", err)
} }
req.Header.Add("User-Agent", "magellan") req.Header.Add("User-Agent", "magellan")
for k, v := range headers { for k, v := range headers {
@ -57,12 +59,12 @@ func MakeRequest(client *http.Client, url string, httpMethod string, body []byte
} }
res, err := client.Do(req) res, err := client.Do(req)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("failed tomake request: %v", err) return nil, nil, fmt.Errorf("failed to make request: %v", err)
} }
b, err := io.ReadAll(res.Body) b, err := io.ReadAll(res.Body)
res.Body.Close() res.Body.Close()
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("failed toread response body: %v", err) return nil, nil, fmt.Errorf("failed to read response body: %v", err)
} }
return res, b, err return res, b, err
} }
@ -76,7 +78,7 @@ func MakeOutputDirectory(path string) (string, error) {
// check if path is valid and directory // check if path is valid and directory
pathExists, err := PathExists(final) pathExists, err := PathExists(final)
if err != nil { if err != nil {
return final, fmt.Errorf("failed tocheck for existing path: %v", err) return final, fmt.Errorf("failed to check for existing path: %v", err)
} }
if pathExists { if pathExists {
// make sure it is directory with 0o644 permissions // make sure it is directory with 0o644 permissions
@ -86,7 +88,7 @@ func MakeOutputDirectory(path string) (string, error) {
// create directory with data + time // create directory with data + time
err = os.MkdirAll(final, 0766) err = os.MkdirAll(final, 0766)
if err != nil { if err != nil {
return final, fmt.Errorf("failed tomake directory: %v", err) return final, fmt.Errorf("failed to make directory: %v", err)
} }
return final, nil return final, nil
} }