From 227ce8b0738358f5e9321e4222c05d46ae87acb3 Mon Sep 17 00:00:00 2001
From: nareix <hi.nareix@gmail.com>
Date: Wed, 15 Jun 2016 07:28:05 +0800
Subject: [PATCH] send Authorization: Digest only when nonce exists

---
 client.go | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/client.go b/client.go
index e929357..6bfc1b8 100644
--- a/client.go
+++ b/client.go
@@ -322,29 +322,30 @@ func (self *Client) ReadResponse() (res Response, err error) {
 				}
 			}
 
-			if realm != "" && nonce != "" {
-				if self.url.User == nil {
-					err = fmt.Errorf("rtsp: please provide username and password")
-					return
-				}
+			if realm != "" {
 				var username string
 				var password string
-				var ok bool
-				username = self.url.User.Username()
-				if password, ok = self.url.User.Password(); !ok {
-					err = fmt.Errorf("rtsp: please provide password")
+
+				if self.url.User == nil {
+					err = fmt.Errorf("rtsp: no username")
 					return
 				}
-				hs1 := md5hash(username + ":" + realm + ":" + password)
+				username = self.url.User.Username()
+				password, _ = self.url.User.Password()
 
 				self.authHeaders = func(method string) []string {
-					hs2 := md5hash(method + ":" + self.requestUri)
-					response := md5hash(hs1 + ":" + nonce + ":" + hs2)
-					return []string{
-						fmt.Sprintf(`Authorization: Digest username="%s", realm="%s", nonce="%s", uri="%s", response="%s"`,
-							username, realm, nonce, self.requestUri, response),
+					headers := []string{
 						fmt.Sprintf(`Authorization: Basic %s`, base64.StdEncoding.EncodeToString([]byte(username+":"+password))),
 					}
+					if nonce != "" {
+						hs1 := md5hash(username + ":" + realm + ":" + password)
+						hs2 := md5hash(method + ":" + self.requestUri)
+						response := md5hash(hs1 + ":" + nonce + ":" + hs2)
+						headers = append(headers, fmt.Sprintf(
+							`Authorization: Digest username="%s", realm="%s", nonce="%s", uri="%s", response="%s"`,
+							username, realm, nonce, self.requestUri, response))
+					}
+					return headers
 				}
 			}
 		}
@@ -907,7 +908,7 @@ func (self *Client) ReadPacket() (i int, pkt av.Packet, err error) {
 }
 
 func (self *Client) ReadHeader() (err error) {
-	if _, err = self.Options(); err != nil {
+	if err = self.Options(); err != nil {
 		return
 	}
 	if _, err = self.Describe(); err != nil {