🐛 fix: Embedded struct parsing (#3478)

* Fix "[Bug]: Incorrect Parsing of Slice by QueryParser() with Embedded Structs #2859"

* Fix "[Bug]: Incorrect Parsing of Slice by QueryParser() with Embedded Structs #2859"

Author: ReneWerner87

ctx.go

@@ -1326,43 +1326,44 @@ func (*Ctx) parseToStruct(aliasTag string, out interface{}, data map[string][]st
 }
 
 func equalFieldType(out interface{}, kind reflect.Kind, key, tag string) bool {
-	// Get type of interface
 	outTyp := reflect.TypeOf(out).Elem()
-	key = utils.ToLower(key)
-	// Must be a struct to match a field
 	if outTyp.Kind() != reflect.Struct {
 		return false
 	}
-	// Copy interface to an value to be used
-	outVal := reflect.ValueOf(out).Elem()
-	// Loop over each field
+	key = utils.ToLower(key)
+	return checkEqualFieldType(outTyp, kind, key, tag)
+}
+
+func checkEqualFieldType(outTyp reflect.Type, kind reflect.Kind, key, tag string) bool {
 	for i := 0; i < outTyp.NumField(); i++ {
-		// Get field value data
-		structField := outVal.Field(i)
-		// Can this field be changed?
-		if !structField.CanSet() {
+		typeField := outTyp.Field(i)
+
+		if typeField.Anonymous && typeField.Type.Kind() == reflect.Struct {
+			if checkEqualFieldType(typeField.Type, kind, key, tag) {
+				return true
+			}
+		}
+
+		if typeField.PkgPath != "" { // unexported field
 			continue
 		}
-		// Get field key data
-		typeField := outTyp.Field(i)
-		// Get type of field key
-		structFieldKind := structField.Kind()
-		// Does the field type equals input?
-		if structFieldKind != kind {
+
+		if typeField.Type.Kind() != kind {
 			continue
 		}
-		// Get tag from field if exist
+
 		inputFieldName := typeField.Tag.Get(tag)
 		if inputFieldName == "" {
 			inputFieldName = typeField.Name
-		} else {
-			inputFieldName = strings.Split(inputFieldName, ",")[0]
+		} else if idx := strings.IndexByte(inputFieldName, ','); idx > -1 {
+			inputFieldName = inputFieldName[:idx]
 		}
-		// Compare field/tag with provided key
+
 		if utils.ToLower(inputFieldName) == key {
 			return true
 		}
 	}
+
 	return false
 }
 

ctx_test.go

@@ -4875,6 +4875,28 @@ func Test_Ctx_QueryParser_Schema(t *testing.T) {
 	utils.AssertEqual(t, 12, cq.Data[1].Age)
 }
 
+func Test_Ctx_QueryParser_EmbeddedStruct(t *testing.T) {
+	t.Parallel()
+	app := New(Config{EnableSplittingOnParsers: true})
+	c := app.AcquireCtx(&fasthttp.RequestCtx{})
+	defer app.ReleaseCtx(c)
+
+	type A struct {
+		Products []string `query:"products"`
+	}
+
+	type Person struct {
+		Name string `query:"name"`
+		Pass string `query:"pass"`
+		A
+	}
+
+	c.Request().URI().SetQueryString("name=john&pass=doe&products=shoe,hat")
+	p := new(Person)
+	utils.AssertEqual(t, nil, c.QueryParser(p))
+	utils.AssertEqual(t, []string{"shoe", "hat"}, p.Products)
+}
+
 // go test -run Test_Ctx_ReqHeaderParser -v
 func Test_Ctx_ReqHeaderParser(t *testing.T) {
 	t.Parallel()
@@ -5402,6 +5424,25 @@ func Benchmark_Ctx_ReqHeaderParser(b *testing.B) {
 	utils.AssertEqual(b, nil, c.ReqHeaderParser(q))
 }
 
+// go test -v  -run=^$ -bench=Benchmark_equalFieldType -benchmem -count=4
+func Benchmark_equalFieldType(b *testing.B) {
+	type user struct {
+		Name string `query:"name"`
+		Age  int    `query:"age"`
+	}
+
+	u := new(user)
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var res bool
+	for n := 0; n < b.N; n++ {
+		res = equalFieldType(u, reflect.String, "name", queryTag)
+	}
+
+	utils.AssertEqual(b, true, res)
+}
+
 // go test -run Test_Ctx_BodyStreamWriter
 func Test_Ctx_BodyStreamWriter(t *testing.T) {
 	t.Parallel()