updata http.Cookie readCookies

Author: iQQBot

components/ws-proxy/pkg/proxy/cookies.go

@@ -33,53 +33,37 @@ func readCookies(h http.Header, filter string) []*http.Cookie {
 
 		var part string
 		for len(line) > 0 { // continue since we have rest
-			if splitIndex := strings.Index(line, ";"); splitIndex > 0 {
-				part, line = line[:splitIndex], line[splitIndex+1:]
-			} else {
-				part, line = line, ""
-			}
+			part, line, _ = strings.Cut(line, ";")
 			part = textproto.TrimString(part)
-			if len(part) == 0 {
+			if part == "" {
 				continue
 			}
-			name, val := part, ""
-			if j := strings.Index(part, "="); j >= 0 {
-				name, val = name[:j], name[j+1:]
-			}
+			name, val, _ := strings.Cut(part, "=")
+			name = textproto.TrimString(name)
 			if filter != "" && filter != name {
 				continue
 			}
-			val, quoted, ok := parseCookieValue(val, true)
+			val, ok := parseCookieValue(val, true)
 			if !ok {
 				continue
 			}
-			cookies = append(cookies, &http.Cookie{Name: name, Value: val, Quoted: quoted})
+			cookies = append(cookies, &http.Cookie{Name: name, Value: val})
 		}
 	}
 	return cookies
 }
 
-// parseCookieValue parses a cookie value according to RFC 6265.
-// If allowDoubleQuote is true, parseCookieValue will consider that it
-// is parsing the cookie-value;
-// otherwise, it will consider that it is parsing a cookie-av value
-// (cookie attribute-value).
-//
-// It returns the parsed cookie value, a boolean indicating whether the
-// parsing was successful, and a boolean indicating whether the parsed
-// value was enclosed in double quotes.
-func parseCookieValue(raw string, allowDoubleQuote bool) (value string, quoted, ok bool) {
+func parseCookieValue(raw string, allowDoubleQuote bool) (string, bool) {
 	// Strip the quotes, if present.
 	if allowDoubleQuote && len(raw) > 1 && raw[0] == '"' && raw[len(raw)-1] == '"' {
 		raw = raw[1 : len(raw)-1]
-		quoted = true
 	}
 	for i := 0; i < len(raw); i++ {
 		if !validCookieValueByte(raw[i]) {
-			return "", quoted, false
+			return "", false
 		}
 	}
-	return raw, quoted, true
+	return raw, true
 }
 
 func validCookieValueByte(b byte) bool {