Replace testify/assert with standard testing library and add cookie option support

- Remove testify/assert dependency from getoken_test.go, use standard testing.T methods
- Remove composite literal type declarations (TestArgs{} -> {})
- Add -b/--cookie option support for passing cookies via name=value or cookie file
- Implement cookie file parsing with Netscape format support
- Add hasHeader helper to check for existing headers
- Add createCookieHeader method to build Cookie header from -b options

Author: guonaihong

getoken_test.go

@@ -1,7 +1,6 @@
 package pcurl
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
@@ -12,16 +11,18 @@ func Test_GetArgsTokenFail(t *testing.T) {
 	}
 
 	for _, v := range []TestArgs{
-		TestArgs{
+		{
 			in: `'hello`,
 		},
-		TestArgs{
+		{
 			in: `"hello`,
 		},
 	} {
 
 		_, err := GetArgsToken(v.in)
-		assert.Error(t, err)
+		if err == nil {
+			t.Errorf("expected error, got nil, input=%q", v.in)
+		}
 	}
 }
 
@@ -33,26 +34,38 @@ func Test_GetArgsToken(t *testing.T) {
 	}
 
 	for _, v := range []TestArgs{
-		TestArgs{
+		{
 			in:   `curl -XGET "http://192.168.6.100:9200/eval-log/_search" -H 'Content-Type: application/json' -d'{  "query": {    "match": {      "level": "error"    }  }}'`,
 			need: []string{`curl`, `-XGET`, "http://192.168.6.100:9200/eval-log/_search", "-H", `Content-Type: application/json`, `-d{  "query": {    "match": {      "level": "error"    }  }}`},
 		},
-		TestArgs{
+		{
 			in:   `curl --location --request DELETE '192.168.5.213:10010/delete/rule?appkey=xx' --header 'Content-Type: text/plain' --data-raw '{"type":"region","region":"bj","business":"asr","protocol":"private","connect":416}'`,
 			need: []string{`curl`, `--location`, `--request`, `DELETE`, `192.168.5.213:10010/delete/rule?appkey=xx`, `--header`, `Content-Type: text/plain`, `--data-raw`, `{"type":"region","region":"bj","business":"asr","protocol":"private","connect":416}`},
 		},
-		TestArgs{
+		{
 			in:   `'{"s":"{\"s\":\"S\"}"}'`,
 			need: []string{`{"s":"{\"s\":\"S\"}"}`},
 		},
-		TestArgs{
+		{
 			in:   `curl 'http://xxx.cc/admin/index.php?act=admin' -H 'Connection: keep-alive' -H 'Cache-Control: max-age=0' -H 'Upgrade-Insecure-Requests: 1' -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/80.0.3987.87 Chrome/80.0.3987.87 Safari/537.36' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,/;q=0.8,application/signed-exchange;v=b3;q=0.9' -H 'Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7' -H 'Cookie: username=admin; token=b7ea3ec643e4ea4871dfe515c559d28bc0d23b6d9d6b22daf206f1de9aff13aeaa51591323199; addinfo=%7B%22chkadmin%22%3A1%2C%22chkarticle%22%3A1%2C%22levelname%22%3A%22%5Cu7ba1%5Cu7406%5Cu5458%22%2C%22userid%22%3A%221%22%2C%22useralias%22%3A%22admin%22%7D; timezone=8; Hm_lvt_12d9f8f1740b76bb88c6691ea1672d8b=1589004902,1589265192,1589341266,1589717172; Hm_lpvt_12d9f8f1740b76bb88c6691ea1672d8b=1589719525'`,
 			need: []string{`curl`, `http://xxx.cc/admin/index.php?act=admin`, `-H`, `Connection: keep-alive`, `-H`, `Cache-Control: max-age=0`, `-H`, `Upgrade-Insecure-Requests: 1`, `-H`, `User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/80.0.3987.87 Chrome/80.0.3987.87 Safari/537.36`, `-H`, `Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,/;q=0.8,application/signed-exchange;v=b3;q=0.9`, `-H`, `Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7`, `-H`, `Cookie: username=admin; token=b7ea3ec643e4ea4871dfe515c559d28bc0d23b6d9d6b22daf206f1de9aff13aeaa51591323199; addinfo=%7B%22chkadmin%22%3A1%2C%22chkarticle%22%3A1%2C%22levelname%22%3A%22%5Cu7ba1%5Cu7406%5Cu5458%22%2C%22userid%22%3A%221%22%2C%22useralias%22%3A%22admin%22%7D; timezone=8; Hm_lvt_12d9f8f1740b76bb88c6691ea1672d8b=1589004902,1589265192,1589341266,1589717172; Hm_lpvt_12d9f8f1740b76bb88c6691ea1672d8b=1589719525`},
 		},
 	} {
 
 		got, err := GetArgsToken(v.in)
-		assert.NoError(t, err)
-		assert.Equal(t, v.need, got)
+		if err != nil {
+			t.Fatalf("unexpected error: %v, input=%q", err, v.in)
+		}
+
+		if len(got) != len(v.need) {
+			t.Errorf("len not equal, got=%d, want=%d, input=%q, gotSlice=%v, wantSlice=%v", len(got), len(v.need), v.in, got, v.need)
+			continue
+		}
+
+		for i := range v.need {
+			if got[i] != v.need[i] {
+				t.Errorf("index %d not equal, got=%q, want=%q, input=%q", i, got[i], v.need[i], v.in)
+			}
+		}
 	}
 }

pcurl.go

@@ -3,6 +3,7 @@
 package pcurl
 
 import (
+	"bufio"
 	"errors"
 	"net/http"
 	"net/url"
@@ -19,6 +20,7 @@ type Curl struct {
 	Method        string   `clop:"-X; --request" usage:"Specify request command to use"`
 	Get           bool     `clop:"-G; --get" usage:"Put the post data in the URL and use GET"`
 	Header        []string `clop:"-H; --header" usage:"Pass custom header(s) to server"`
+	Cookie        []string `clop:"-b; --cookie" usage:"Pass data to Cookie header or read from cookie file"`
 	Data          string   `clop:"-d; --data"   usage:"HTTP POST data"`
 	DataRaw       string   `clop:"--data-raw" usage:"HTTP POST data, '@' allowed"`
 	Form          []string `clop:"-F; --form" usage:"Specify multipart MIME data"`
@@ -90,6 +92,72 @@ func (c *Curl) createHeader() []string {
 	return header
 }
 
+func (c *Curl) hasHeader(header []string, name string) bool {
+	for i := 0; i+1 < len(header); i += 2 {
+		if strings.EqualFold(header[i], name) {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (c *Curl) createCookieHeader() ([]string, error) {
+	if len(c.Cookie) == 0 {
+		return nil, nil
+	}
+
+	cookieParts := make([]string, 0, len(c.Cookie))
+
+	for _, v := range c.Cookie {
+		// 如果包含 '='，优先认为是 name=value 形式
+		if strings.Contains(v, "=") {
+			cookieParts = append(cookieParts, v)
+			continue
+		}
+
+		// 否则认为是 cookie 文件路径
+		fd, err := os.Open(v)
+		if err != nil {
+			return nil, err
+		}
+
+		scanner := bufio.NewScanner(fd)
+		for scanner.Scan() {
+			line := strings.TrimSpace(scanner.Text())
+			if len(line) == 0 || strings.HasPrefix(line, "#") {
+				continue
+			}
+
+			// 兼容 Netscape cookie 文件格式
+			// <domain> <flag> <path> <secure> <expiration> <name> <value>
+			fields := strings.Split(line, "\t")
+			if len(fields) >= 7 {
+				name := fields[5]
+				value := fields[6]
+				cookieParts = append(cookieParts, name+"="+value)
+				continue
+			}
+
+			// 兜底：如果包含 '='，直接当作 name=value
+			if strings.Contains(line, "=") {
+				cookieParts = append(cookieParts, line)
+			}
+		}
+
+		fd.Close()
+		if err := scanner.Err(); err != nil {
+			return nil, err
+		}
+	}
+
+	if len(cookieParts) == 0 {
+		return nil, nil
+	}
+
+	return []string{"Cookie", strings.Join(cookieParts, "; ")}, nil
+}
+
 func (c *Curl) getBodyEncodeAndObj() (string, any, error) {
 	name := c.findHighestPriority()
 	if name == bodyURLEncode {
@@ -233,6 +301,10 @@ func (c *Curl) Request() (req *http.Request, err error) {
 	c.setMethod()
 
 	header := c.createHeader()
+	cookieHeader, err := c.createCookieHeader()
+	if err != nil {
+		return nil, err
+	}
 
 	switch c.findHighestPriority() {
 	case bodyURLEncode:
@@ -267,6 +339,10 @@ func (c *Curl) Request() (req *http.Request, err error) {
 		header = append(header, "Accept-Encoding", "deflate, gzip")
 	}
 
+	if len(cookieHeader) > 0 && !c.hasHeader(header, "Cookie") {
+		header = append(header, cookieHeader...)
+	}
+
 	if len(dataRaw) > 0 {
 		data = dataRaw
 	}

pcurl_cookie_test.go

@@ -0,0 +1,81 @@
+package pcurl
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/guonaihong/gout"
+	"github.com/stretchr/testify/assert"
+)
+
+// curl -b / --cookie
+func Test_Cookie_Option(t *testing.T) {
+	type testCase struct {
+		name      string
+		curlSlice []string
+		need      H
+	}
+
+	// 准备一个临时 cookie 文件（Netscape 格式）
+	dir := t.TempDir()
+	cookieFile := filepath.Join(dir, "cookie.txt")
+	content := "# Netscape HTTP Cookie File\n" +
+		"example.com\tTRUE\t/\tFALSE\t0\tfoo\tbar\n" +
+		"example.com\tTRUE\t/\tFALSE\t0\tbaz\tqux\n"
+	assert.NoError(t, os.WriteFile(cookieFile, []byte(content), 0o644))
+
+	for _, c := range []testCase{
+		{
+			name:      "single name=value",
+			curlSlice: []string{"curl", "-X", "GET", "-b", "a=1"},
+			need: H{
+				"Cookie": "a=1",
+			},
+		},
+		{
+			name:      "multi -b name=value",
+			curlSlice: []string{"curl", "-X", "GET", "-b", "a=1", "-b", "b=2"},
+			need: H{
+				"Cookie": "a=1; b=2",
+			},
+		},
+		{
+			name:      "cookie file",
+			curlSlice: []string{"curl", "-X", "GET", "-b", cookieFile},
+			need: H{
+				"Cookie": "foo=bar; baz=qux",
+			},
+		},
+		{
+			name:      "cookie file and name=value",
+			curlSlice: []string{"curl", "-X", "GET", "-b", cookieFile, "-b", "c=3"},
+			need: H{
+				"Cookie": "foo=bar; baz=qux; c=3",
+			},
+		},
+		{
+			name:      "-H Cookie override -b",
+			curlSlice: []string{"curl", "-X", "GET", "-b", "a=1", "-H", "Cookie: x=y"},
+			need: H{
+				"Cookie": "x=y",
+			},
+		},
+	} {
+
+		// 创建测试服务端
+		ts := createGeneralHeader(c.need, t)
+
+		// 解析curl表达式
+		req, err := ParseSlice(append(c.curlSlice, ts.URL)).Request()
+		assert.NoError(t, err, c.name)
+
+		var got H
+		code := 0
+		// 发送请求
+		err = gout.New().SetRequest(req).Debug(true).Code(&code).BindJSON(&got).Do()
+		assert.NoError(t, err, c.name)
+		assert.Equal(t, 200, code, c.name)
+		assert.Equal(t, c.need, got, c.name)
+	}
+}