Code refactoring after #1029

pkg/tapo/client.go

@@ -77,11 +77,8 @@ func (c *Client) newConn() (net.Conn, error) {
 
 	query := u.Query()
 
-	deviceId := query.Get("deviceId")
+	if deviceId := query.Get("deviceId"); deviceId != "" {
-	if deviceId != "" {
+		req.URL.RawQuery = "deviceId=" + deviceId
-		q := req.URL.Query()
-		q.Set("deviceId", deviceId)
-		req.URL.RawQuery = q.Encode()
 	}
 
 	req.URL.User = u.User
@@ -285,6 +282,7 @@ func dial(req *http.Request) (net.Conn, *http.Response, error) {
 	if err != nil {
 		return nil, nil, err
 	}
+	_ = res.Body.Close() // ignore response body
 
 	auth := res.Header.Get("WWW-Authenticate")
 
@@ -292,9 +290,6 @@ func dial(req *http.Request) (net.Conn, *http.Response, error) {
 		return nil, nil, err
 	}
 
-	// Read the entire request body to prevent issues later - H200 seems to send HTTP ERROR 401 as body response.
-	_, _ = io.Copy(io.Discard, res.Body)
-
 	if password == "" {
 		// support cloud password in place of username
 		if strings.Contains(auth, `encrypt_type="3"`) {
@@ -308,32 +303,21 @@ func dial(req *http.Request) (net.Conn, *http.Response, error) {
 	realm := tcp.Between(auth, `realm="`, `"`)
 	nonce := tcp.Between(auth, `nonce="`, `"`)
 	qop := tcp.Between(auth, `qop="`, `"`)
-	// opaque is optional
-	op := ""
-	if strings.Contains(auth, `opaque="`) {
-		op = tcp.Between(auth, `opaque="`, `"`)
-	}
 	uri := req.URL.RequestURI()
 	ha1 := tcp.HexMD5(username, realm, password)
 	ha2 := tcp.HexMD5(req.Method, uri)
 	nc := "00000001"
-
-	// Generate a random cnonce
 	cnonce := core.RandString(32, 64)
-
 	response := tcp.HexMD5(ha1, nonce, nc, cnonce, qop, ha2)
 
-	header := ""
+	// https://datatracker.ietf.org/doc/html/rfc7616
-	if op != "" {
+	header := fmt.Sprintf(
-		header = fmt.Sprintf(
+		`Digest username="%s", realm="%s", nonce="%s", uri="%s", qop=%s, nc=%s, cnonce="%s", response="%s"`,
-			`Digest username="%s", realm="%s", nonce="%s", uri="%s", qop=%s, nc=%s, cnonce="%s", response="%s", opaque="%s", algorithm=MD5`,
+		username, realm, nonce, uri, qop, nc, cnonce, response,
-			username, realm, nonce, uri, qop, nc, cnonce, response, op,
+	)
-		)
+
-	} else {
+	if opaque := tcp.Between(auth, `opaque="`, `"`); opaque != "" {
-		header = fmt.Sprintf(
+		header += fmt.Sprintf(`, opaque="%s", algorithm=MD5`, opaque)
-			`Digest username="%s", realm="%s", nonce="%s", uri="%s", qop=%s, nc=%s, cnonce="%s", response="%s"`,
-			username, realm, nonce, uri, qop, nc, cnonce, response,
-		)
 	}
 
 	req.Header.Set("Authorization", header)