Merge pull request #185 from cviecco/enhance-timeouts-client

Enhance timeouts client

Author: rgooch

Makefile

@@ -10,7 +10,7 @@ endif
 BINARY=keymaster
 
 # These are the values we want to pass for Version and BuildTime
-VERSION=1.4.11
+VERSION=1.4.12
 #BUILD_TIME=`date +%FT%T%z`
 
 # Setup the -ldflags option for go build here, interpolate the variable values

keymaster.spec

@@ -1,5 +1,5 @@
 Name:           keymaster
-Version:        1.4.11
+Version:        1.4.12
 Release:        1%{?dist}
 Summary:        Short term access certificate generator and client
 

lib/client/twofa/twofa.go

@@ -118,6 +118,7 @@ func getCertsFromServer(
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Add("Accept", "application/json")
 
+	logger.Debugf(1, "About to start login request\n")
 	loginResp, err := client.Do(req) //client.Get(targetUrl)
 	if err != nil {
 		logger.Printf("got error from req")

lib/client/util/util.go

@@ -10,6 +10,7 @@ import (
 	"encoding/pem"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -76,6 +77,11 @@ func genKeyPair(
 func getHttpClient(tlsConfig *tls.Config) (*http.Client, error) {
 	clientTransport := &http.Transport{
 		TLSClientConfig: tlsConfig,
+		DialContext: (&net.Dialer{
+			Timeout:   10 * time.Second,
+			KeepAlive: 30 * time.Second,
+			DualStack: true,
+		}).DialContext,
 	}
 
 	// proxy env variables in ascending order of preference, lower case 'http_proxy' dominates
@@ -93,7 +99,7 @@ func getHttpClient(tlsConfig *tls.Config) (*http.Client, error) {
 	}
 
 	// TODO: change timeout const for a flag
-	client := &http.Client{Transport: clientTransport, Jar: jar, Timeout: 5 * time.Second}
+	client := &http.Client{Transport: clientTransport, Jar: jar, Timeout: 25 * time.Second}
 	return client, nil
 }