Merge branch 'master' into allow-setting-custom-http-client

Author: xinsnake

authorization.go

@@ -130,48 +130,48 @@ func (ah *authorization) toString() string {
 
 	buffer.WriteString("Digest ")
 
-	if ah.Algorithm != "" {
-		buffer.WriteString(fmt.Sprintf("algorithm=%s, ", ah.Algorithm))
+	if ah.Username != "" {
+		buffer.WriteString(fmt.Sprintf("username=\"%s\", ", ah.Username))
 	}
 
-	if ah.Cnonce != "" {
-		buffer.WriteString(fmt.Sprintf("cnonce=\"%s\", ", ah.Cnonce))
+	if ah.Realm != "" {
+		buffer.WriteString(fmt.Sprintf("realm=\"%s\", ", ah.Realm))
 	}
 
-	if ah.Nc != 0 {
-		buffer.WriteString(fmt.Sprintf("nc=%08x, ", ah.Nc))
+	if ah.Nonce != "" {
+		buffer.WriteString(fmt.Sprintf("nonce=\"%s\", ", ah.Nonce))
 	}
 
-	if ah.Opaque != "" {
-		buffer.WriteString(fmt.Sprintf("opaque=\"%s\", ", ah.Opaque))
+	if ah.URI != "" {
+		buffer.WriteString(fmt.Sprintf("uri=\"%s\", ", ah.URI))
 	}
 
-	if ah.Nonce != "" {
-		buffer.WriteString(fmt.Sprintf("nonce=\"%s\", ", ah.Nonce))
+	if ah.Response != "" {
+		buffer.WriteString(fmt.Sprintf("response=\"%s\", ", ah.Response))
 	}
 
-	if ah.Qop != "" {
-		buffer.WriteString(fmt.Sprintf("qop=%s, ", ah.Qop))
+	if ah.Algorithm != "" {
+		buffer.WriteString(fmt.Sprintf("algorithm=%s, ", ah.Algorithm))
 	}
 
-	if ah.Realm != "" {
-		buffer.WriteString(fmt.Sprintf("realm=\"%s\", ", ah.Realm))
+	if ah.Cnonce != "" {
+		buffer.WriteString(fmt.Sprintf("cnonce=\"%s\", ", ah.Cnonce))
 	}
 
-	if ah.Response != "" {
-		buffer.WriteString(fmt.Sprintf("response=\"%s\", ", ah.Response))
+	if ah.Opaque != "" {
+		buffer.WriteString(fmt.Sprintf("opaque=\"%s\", ", ah.Opaque))
 	}
 
-	if ah.URI != "" {
-		buffer.WriteString(fmt.Sprintf("uri=\"%s\", ", ah.URI))
+	if ah.Qop != "" {
+		buffer.WriteString(fmt.Sprintf("qop=%s, ", ah.Qop))
 	}
 
-	if ah.Userhash {
-		buffer.WriteString("userhash=true, ")
+	if ah.Nc != 0 {
+		buffer.WriteString(fmt.Sprintf("nc=%08x, ", ah.Nc))
 	}
 
-	if ah.Username != "" {
-		buffer.WriteString(fmt.Sprintf("username=\"%s\", ", ah.Username))
+	if ah.Userhash {
+		buffer.WriteString("userhash=true, ")
 	}
 
 	s := buffer.String()

digest_auth_client.go

@@ -24,13 +24,15 @@ type DigestRequest struct {
 type DigestTransport struct {
 	Password string
 	Username string
+	Timeout  time.Duration
 }
 
 // NewRequest creates a new DigestRequest object
 func NewRequest(username, password, method, uri, body string) DigestRequest {
 	dr := DigestRequest{}
 	dr.UpdateRequest(username, password, method, uri, body)
 	dr.CertVal = true
+	dr.Timeout = 30 * time.Second
 	return dr
 }
 
@@ -39,6 +41,7 @@ func NewTransport(username, password string) DigestTransport {
 	dt := DigestTransport{}
 	dt.Password = password
 	dt.Username = username
+	dt.Timeout = 30 * time.Second
 	return dt
 }
 
@@ -86,6 +89,7 @@ func (dt *DigestTransport) RoundTrip(req *http.Request) (resp *http.Response, er
 	}
 
 	dr := NewRequest(username, password, method, uri, body)
+	dr.Timeout = dt.Timeout
 	return dr.Execute()
 }
 

www_authenticate.go

@@ -21,7 +21,7 @@ func newWwwAuthenticate(s string) *wwwAuthenticate {
 
 	var wa = wwwAuthenticate{}
 
-	algorithmRegex := regexp.MustCompile(`algorithm=([^ ,]+)`)
+	algorithmRegex := regexp.MustCompile(`algorithm="([^ ,]+)"`)
 	algorithmMatch := algorithmRegex.FindStringSubmatch(s)
 	if algorithmMatch != nil {
 		wa.Algorithm = algorithmMatch[1]