golang.org/x/net 0.8.0 => 0.9.0, cookies fix (#56)

Author: s0rg

go.mod

@@ -5,5 +5,5 @@ go 1.20
 require (
 	github.com/s0rg/compflag v1.1.0
 	github.com/s0rg/set v1.0.0
-	golang.org/x/net v0.8.0
+	golang.org/x/net v0.9.0
 )

go.sum

@@ -2,5 +2,5 @@ github.com/s0rg/compflag v1.1.0 h1:xhCUPLy+5Ue/Q9I/nIcLti2Ul6P42JYx4UvtYoDXmlQ=
 github.com/s0rg/compflag v1.1.0/go.mod h1:XMntVpc3+jpmBe0s8xo4w9swH8T9ARGkMC9HFiDRoUw=
 github.com/s0rg/set v1.0.0 h1:/MAmKEQ3Ltodli7/+e8iSTKNwhzmvxkmSDZO8BMTFbE=
 github.com/s0rg/set v1.0.0/go.mod h1:n2TtovR+7TrBIztw+6muV9ZLRuDIimsd8YyTN+QBmHQ=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=

pkg/client/cookie.go

@@ -3,7 +3,6 @@ package client
 import (
 	"log"
 	"net/http"
-	"net/url"
 	"strings"
 )
 
@@ -37,25 +36,15 @@ func parseOne(raw string) (rv *http.Cookie, ok bool) {
 		return
 	}
 
-	var name, value string
+	var name string
 
 	if name = strings.TrimSpace(pair[0]); name == "" {
 		return
 	}
 
-	value = strings.TrimSpace(pair[1])
-
-	if value != "" {
-		var err error
-
-		if value, err = url.QueryUnescape(value); err != nil {
-			return
-		}
-	}
-
 	rv = &http.Cookie{
 		Name:  name,
-		Value: value,
+		Value: strings.TrimSpace(pair[1]),
 	}
 
 	return rv, true

pkg/client/cookie_test.go

@@ -19,7 +19,7 @@ func Test_prepareCookies(t *testing.T) {
 			[]string{"NAME1=VALUE1;NAME2=ENCODED%20VALUE;", "NAME3=VALUE3"},
 			[]*http.Cookie{
 				{Name: "NAME1", Value: "VALUE1"},
-				{Name: "NAME2", Value: "ENCODED VALUE"},
+				{Name: "NAME2", Value: "ENCODED%20VALUE"},
 				{Name: "NAME3", Value: "VALUE3"},
 			},
 		},
@@ -42,7 +42,7 @@ func Test_prepareCookies(t *testing.T) {
 		got := prepareCookies(tt.args)
 
 		if len(got) != len(tt.want) {
-			t.Errorf("prepareCookies() invalid rusult count for: %v", tt.want)
+			t.Errorf("prepareCookies() invalid result count for: %v", tt.want)
 		}
 
 		if len(got) == 0 {

pkg/client/http_test.go

@@ -15,11 +15,11 @@ const (
 func TestHTTPGetOK(t *testing.T) {
 	t.Parallel()
 
-	c := New(ua, 1, false, []string{"FOO: BAR"}, []string{"NAME=ENCODED%20VAL"})
+	c := New(ua, 1, false, []string{"FOO: BAR"}, []string{"NAME=VALUE"})
 
 	const (
 		body   = "test-body"
-		cookie = "ENCODED VAL"
+		cookie = "VALUE"
 	)
 
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {