use basic auth or digest auth, not both

jeremymichel · Apr 20, 2017 · 69dc078 · 69dc078
1 parent 4b82a8c
commit 69dc078
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/format/rtsp/client.go b/format/rtsp/client.go
@@ -350,16 +350,18 @@ func (self *Client) handle401(res *Response) (err error) {
 			password, _ = self.url.User.Password()
 
 			self.authHeaders = func(method string) []string {
-				headers := []string{
-					fmt.Sprintf(`Authorization: Basic %s`, base64.StdEncoding.EncodeToString([]byte(username+":"+password))),
-				}
-				if nonce != "" {
+				var headers []string
+				if nonce == "" {
+					headers = []string{
+						fmt.Sprintf(`Authorization: Basic %s`, base64.StdEncoding.EncodeToString([]byte(username+":"+password))),
+					}
+				} else {
 					hs1 := md5hash(username + ":" + realm + ":" + password)
 					hs2 := md5hash(method + ":" + self.requestUri)
 					response := md5hash(hs1 + ":" + nonce + ":" + hs2)
-					headers = append(headers, fmt.Sprintf(
+					headers = []string{fmt.Sprintf(
 						`Authorization: Digest username="%s", realm="%s", nonce="%s", uri="%s", response="%s"`,
-						username, realm, nonce, self.requestUri, response))
+						username, realm, nonce, self.requestUri, response)}
 				}
 				return headers
 			}