Handle http redirect (#4)

- Fixed panic if req.Body is nil or basicAuth is not set
- Switched over to http.DefaultTransport if RoundTripper is not provided

Closes #2, #3

negotiator.go

@@ -14,87 +14,96 @@ type Negotiator struct{ http.RoundTripper }
 //RoundTrip sends the request to the server, handling any authentication
 //re-sends as needed.
 func (l Negotiator) RoundTrip(req *http.Request) (res *http.Response, err error) {
-	body := bytes.Buffer{}
+	// Use default round tripper if not provided
-	_, err = body.ReadFrom(req.Body)
+	rt := l.RoundTripper
-	if err != nil {
+	if rt == nil {
-		return nil, err
+		rt = http.DefaultTransport
 	}
-
+	// If it is not basic auth, just round trip the request as usual
-	req.Body.Close()
-	req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
-
 	reqauth := authheader(req.Header.Get("Authorization"))
-	if reqauth.IsBasic() {
+	if !reqauth.IsBasic() {
-		// first try anonymous, in case the server still finds us
+		return rt.RoundTrip(req)
-		// authenticated from previous traffic
+	}
-		req.Header.Del("Authorization")
+	// Save request body
-
+	body := bytes.Buffer{}
-		res, err = l.RoundTripper.RoundTrip(req)
+	if req.Body != nil {
+		_, err = body.ReadFrom(req.Body)
 		if err != nil {
 			return nil, err
 		}
-		if res.StatusCode != 401 {
+
-			return res, err
+		req.Body.Close()
-		}
+		req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
+	}
+	// first try anonymous, in case the server still finds us
+	// authenticated from previous traffic
+	req.Header.Del("Authorization")
+	res, err = rt.RoundTrip(req)
+	if err != nil {
+		return nil, err
+	}
+	if res.StatusCode != http.StatusUnauthorized {
+		return res, err
 	}
 
 	resauth := authheader(res.Header.Get("Www-Authenticate"))
 	if !resauth.IsNegotiate() {
 		// Unauthorized, Negotiate not requested, let's try with basic auth
-		res.Body.Close()
 		req.Header.Set("Authorization", string(reqauth))
+		res.Body.Close()
 		req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
 
-		res, err = l.RoundTripper.RoundTrip(req)
+		res, err = rt.RoundTrip(req)
 		if err != nil {
 			return nil, err
 		}
+		if res.StatusCode != http.StatusUnauthorized {
+			return res, err
+		}
+		resauth = authheader(res.Header.Get("Www-Authenticate"))
 	}
 
-	if res.StatusCode == 401 {
+	if resauth.IsNegotiate() {
-		resauth := authheader(res.Header.Get("Www-Authenticate"))
+		// 401 with request:Basic and response:Negotiate
-		if reqauth.IsBasic() && resauth.IsNegotiate() {
+		res.Body.Close()
-			// 401 with request:Basic and response:Negotiate
-			res.Body.Close()
 
-			// recycle credentials
+		// recycle credentials
-			u, p, err := reqauth.GetBasicCreds()
+		u, p, err := reqauth.GetBasicCreds()
-			if err != nil {
+		if err != nil {
-				return nil, err
+			return nil, err
-			}
-
-			// send negotiate
-			negotiateMessage := NewNegotiateMessage()
-			req.Header.Set("Authorization", "Negotiate "+base64.StdEncoding.EncodeToString(negotiateMessage))
-			req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
-
-			res, err = l.RoundTripper.RoundTrip(req)
-			if err != nil {
-				return nil, err
-			}
-
-			// receive challenge?
-			resauth = authheader(res.Header.Get("Www-Authenticate"))
-			challengeMessage, err := resauth.GetData()
-			if err != nil {
-				return nil, err
-			}
-			if !resauth.IsNegotiate() || len(challengeMessage) == 0 {
-				// Negotiation failed, let client deal with response
-				return res, nil
-			}
-			res.Body.Close()
-
-			// send authenticate
-			authenticateMessage, err := ProcessChallenge(challengeMessage, u, p)
-			if err != nil {
-				return nil, err
-			}
-			req.Header.Set("Authorization", "Negotiate "+base64.StdEncoding.EncodeToString(authenticateMessage))
-			req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
-
-			res, err = l.RoundTripper.RoundTrip(req)
 		}
+
+		// send negotiate
+		negotiateMessage := NewNegotiateMessage()
+		req.Header.Set("Authorization", "Negotiate "+base64.StdEncoding.EncodeToString(negotiateMessage))
+		req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
+
+		res, err = rt.RoundTrip(req)
+		if err != nil {
+			return nil, err
+		}
+
+		// receive challenge?
+		resauth = authheader(res.Header.Get("Www-Authenticate"))
+		challengeMessage, err := resauth.GetData()
+		if err != nil {
+			return nil, err
+		}
+		if !resauth.IsNegotiate() || len(challengeMessage) == 0 {
+			// Negotiation failed, let client deal with response
+			return res, nil
+		}
+		res.Body.Close()
+
+		// send authenticate
+		authenticateMessage, err := ProcessChallenge(challengeMessage, u, p)
+		if err != nil {
+			return nil, err
+		}
+		req.Header.Set("Authorization", "Negotiate "+base64.StdEncoding.EncodeToString(authenticateMessage))
+		req.Body = ioutil.NopCloser(bytes.NewReader(body.Bytes()))
+
+		res, err = rt.RoundTrip(req)
 	}
 
 	return res, err