Merge pull request #13 from nickysemenza/allow-setting-custom-http-client

enable passing in a http client, for customizing TLS config and timeouts

Author: xinsnake

digest_auth_client.go

@@ -9,16 +9,16 @@ import (
 )
 
 type DigestRequest struct {
-	Body     string
-	Method   string
-	Password string
-	URI      string
-	Username string
-	Header   http.Header
-	Auth     *authorization
-	Wa       *wwwAuthenticate
-	CertVal  bool
-	Timeout  time.Duration
+	Body       string
+	Method     string
+	Password   string
+	URI        string
+	Username   string
+	Header     http.Header
+	Auth       *authorization
+	Wa         *wwwAuthenticate
+	CertVal    bool
+	HTTPClient *http.Client
 }
 
 type DigestTransport struct {
@@ -45,6 +45,23 @@ func NewTransport(username, password string) DigestTransport {
 	return dt
 }
 
+func (dr *DigestRequest) getHTTPClient() *http.Client {
+	if dr.HTTPClient != nil {
+		return dr.HTTPClient
+	}
+	tlsConfig := tls.Config{}
+	if !dr.CertVal {
+		tlsConfig.InsecureSkipVerify = true
+	}
+
+	return &http.Client{
+		Timeout: 30 * time.Second,
+		Transport: &http.Transport{
+			TLSClientConfig: &tlsConfig,
+		},
+	}
+}
+
 // UpdateRequest is called when you want to reuse an existing
 //  DigestRequest connection with new request information
 func (dr *DigestRequest) UpdateRequest(username, password, method, uri, body string) *DigestRequest {
@@ -89,16 +106,7 @@ func (dr *DigestRequest) Execute() (resp *http.Response, err error) {
 	}
 	req.Header = dr.Header
 
-	client := &http.Client{
-		Timeout: dr.Timeout,
-	}
-
-	if !dr.CertVal {
-		tr := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}
-		client.Transport = tr
-	}
+	client := dr.getHTTPClient()
 
 	if resp, err = client.Do(req); err != nil {
 		return nil, err
@@ -160,16 +168,6 @@ func (dr *DigestRequest) executeRequest(authString string) (resp *http.Response,
 	req.Header = dr.Header
 	req.Header.Add("Authorization", authString)
 
-	client := &http.Client{
-		Timeout: dr.Timeout,
-	}
-
-	if !dr.CertVal {
-		tr := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}
-		client.Transport = tr
-	}
-
+	client := dr.getHTTPClient()
 	return client.Do(req)
 }