From 85c4794ceba13c2ecbebc667a5e26e0505efb512 Mon Sep 17 00:00:00 2001
From: "Prime.X" <middlestudent@qq.com>
Date: Fri, 23 Dec 2022 10:33:28 +0800
Subject: [PATCH] fix BuildParams with urlEncode when len(v) <= 6 (#2308)

* fix: check urlEncode when len(v) <= 6

* fix BuildParams with urlEncode when len(v) <= 6

* fix BuildParams with urlEncode when len(v) <= 6

Co-authored-by: Prime Xiao <primexiao.dev@gmail.com>
---
 internal/httputil/httputils.go |  8 ++++++--
 net/ghttp/ghttp_z_unit_test.go | 29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/internal/httputil/httputils.go b/internal/httputil/httputils.go
index 452967fe3..1c0631dec 100644
--- a/internal/httputil/httputils.go
+++ b/internal/httputil/httputils.go
@@ -59,8 +59,12 @@ func BuildParams(params interface{}, noUrlEncode ...bool) (encodedParamStr strin
 			encodedParamStr += "&"
 		}
 		s = gconv.String(v)
-		if urlEncode && len(s) > 6 && strings.Compare(s[0:6], fileUploadingKey) != 0 {
-			s = gurl.Encode(s)
+		if urlEncode {
+			if strings.HasPrefix(s, fileUploadingKey) && len(s) > len(fileUploadingKey) {
+				// No url encoding if uploading file.
+			} else {
+				s = gurl.Encode(s)
+			}
 		}
 		encodedParamStr += k + "=" + s
 	}
diff --git a/net/ghttp/ghttp_z_unit_test.go b/net/ghttp/ghttp_z_unit_test.go
index a004f25f5..e85d44f28 100644
--- a/net/ghttp/ghttp_z_unit_test.go
+++ b/net/ghttp/ghttp_z_unit_test.go
@@ -10,11 +10,13 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"net/url"
 	"testing"
 	"time"
 
 	"github.com/gogf/gf/v2/encoding/gurl"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/httputil"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/genv"
 	"github.com/gogf/gf/v2/test/gtest"
@@ -139,3 +141,30 @@ func Test_RoutePathParams(t *testing.T) {
 		)
 	})
 }
+
+func Test_BuildParams(t *testing.T) {
+	// normal && special cases
+	params := map[string]string{
+		"val":   "12345678",
+		"code1": "x&a=1", // for fix
+		"code2": "x&a=111",
+		"id":    "1+- ", // for fix
+		"f":     "1#a=+- ",
+		"v":     "",
+		"n":     "null",
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		res1 := httputil.BuildParams(params)
+		vs, _ := url.ParseQuery(res1)
+		t.Assert(len(params), len(vs))
+		for k := range vs {
+			vv := vs.Get(k)
+			_, ok := params[k]
+			// check no additional param
+			t.Assert(ok, true)
+			// check equal
+			t.AssertEQ(params[k], vv)
+		}
+	})
+}