finished coding, need some testing

Author: xinsnake

authorization.go

@@ -1,6 +1,7 @@
 package digest_auth_client
 
 import (
+	"bytes"
 	"crypto/md5"
 	"crypto/sha256"
 	"fmt"
@@ -107,5 +108,53 @@ func (ah *authorization) hash(a string) (s string) {
 }
 
 func (ah *authorization) toString() string {
-	return ""
+	var buffer bytes.Buffer
+
+	buffer.WriteString("Digest ")
+
+	if ah.Algorithm != "" {
+		buffer.WriteString(fmt.Sprintf("algorithm=%s, ", ah.Algorithm))
+	}
+
+	if ah.Cnonce != "" {
+		buffer.WriteString(fmt.Sprintf("cnonce=\"%s\", ", ah.Cnonce))
+	}
+
+	if ah.Nc != 0 {
+		buffer.WriteString(fmt.Sprintf("cnonce=%d, ", ah.Nc))
+	}
+
+	if ah.Opaque != "" {
+		buffer.WriteString(fmt.Sprintf("opaque=\"%s\", ", ah.Opaque))
+	}
+
+	if ah.Qop != "" {
+		buffer.WriteString(fmt.Sprintf("qop=%s, ", ah.Qop))
+	}
+
+	if ah.Realm != "" {
+		buffer.WriteString(fmt.Sprintf("realm=\"%s\", ", ah.Realm))
+	}
+
+	if ah.Response != "" {
+		buffer.WriteString(fmt.Sprintf("response=\"%s\", ", ah.Response))
+	}
+
+	if ah.Response != "" {
+		buffer.WriteString(fmt.Sprintf("response=\"%s\", ", ah.Response))
+	}
+
+	if ah.Uri != "" {
+		buffer.WriteString(fmt.Sprintf("uri=\"%s\", ", ah.Uri))
+	}
+
+	if ah.Userhash {
+		buffer.WriteString("userhash=true, ")
+	}
+
+	if ah.Username != "" {
+		buffer.WriteString(fmt.Sprintf("username=\"%s\", ", ah.Username))
+	}
+
+	return buffer.String()
 }

digest_auth_client.go

@@ -58,7 +58,7 @@ func (dr *DigestRequest) executeDigest(resp *http.Response) (*http.Response, err
 		return nil, fmt.Errorf("Failed to get WWW-Authenticate header, please check your server configuration.")
 	}
 
-	if wa, err = newWAHeader(waString); err != nil {
+	if wa, err = newWwwAuthenticate(waString); err != nil {
 		return nil, err
 	}
 

www_authenticate.go

@@ -1,5 +1,10 @@
 package digest_auth_client
 
+import (
+	"regexp"
+	"strings"
+)
+
 type wwwAuthenticate struct {
 	Algorithm string // unquoted
 	Domain    string // quoted
@@ -12,10 +17,63 @@ type wwwAuthenticate struct {
 	Userhash  bool   // quoted
 }
 
-func newWAHeader(newWAHeaderString string) (*wwwAuthenticate, error) {
-	return nil, nil
-}
+func newWwwAuthenticate(s string) (*wwwAuthenticate, error) {
+
+	var wa = wwwAuthenticate{}
+
+	algorithmRegex := regexp.MustCompile(`algorithm=([^ ,]+)`)
+	algorithmMatch := algorithmRegex.FindStringSubmatch(s)
+	if algorithmMatch != nil {
+		wa.Algorithm = algorithmMatch[1]
+	}
+
+	domainRegex := regexp.MustCompile(`domain="(.+?)"`)
+	domainMatch := domainRegex.FindStringSubmatch(s)
+	if domainMatch != nil {
+		wa.Domain = domainMatch[1]
+	}
+
+	nonceRegex := regexp.MustCompile(`nonce="(.+?)"`)
+	nonceMatch := nonceRegex.FindStringSubmatch(s)
+	if nonceMatch != nil {
+		wa.Nonce = nonceMatch[1]
+	}
+
+	opaqueRegex := regexp.MustCompile(`opaque="(.+?)"`)
+	opaqueMatch := opaqueRegex.FindStringSubmatch(s)
+	if opaqueMatch != nil {
+		wa.Opaque = opaqueMatch[1]
+	}
+
+	qopRegex := regexp.MustCompile(`qop="(.+?)"`)
+	qopMatch := qopRegex.FindStringSubmatch(s)
+	if qopMatch != nil {
+		wa.Qop = qopMatch[1]
+	}
+
+	realmRegex := regexp.MustCompile(`realm="(.+?)"`)
+	realmMatch := realmRegex.FindStringSubmatch(s)
+	if realmMatch != nil {
+		wa.Realm = realmMatch[1]
+	}
+
+	staleRegex := regexp.MustCompile(`stale=([^ ,])"`)
+	staleMatch := staleRegex.FindStringSubmatch(s)
+	if staleMatch != nil {
+		wa.Stale = (strings.ToLower(staleMatch[1]) == "true")
+	}
+
+	charsetRegex := regexp.MustCompile(`charset="(.+?)"`)
+	charsetMatch := charsetRegex.FindStringSubmatch(s)
+	if charsetMatch != nil {
+		wa.Charset = charsetMatch[1]
+	}
+
+	userhashRegex := regexp.MustCompile(`userhash=([^ ,])"`)
+	userhashMatch := userhashRegex.FindStringSubmatch(s)
+	if userhashMatch != nil {
+		wa.Userhash = (strings.ToLower(userhashMatch[1]) == "true")
+	}
 
-func (wa *wwwAuthenticate) fromString(s string) (*wwwAuthenticate, error) {
-	return wa, nil
+	return &wa, nil
 }