mirror of
https://github.com/gin-gonic/gin.git
synced 2026-11-17 15:23:44 +08:00
Merge c97a490efa8f579cca9063a47949eeb65c4c2111 into 0f09c3a9b4626d9fe9979cf4d0521d6ae32ab646
This commit is contained in:
commit
8a02676aa6
@ -43,6 +43,9 @@ func MapFormWithTag(ptr any, form map[string][]string, tag string) error {
|
||||
|
||||
var emptyField = reflect.StructField{}
|
||||
|
||||
// fileHeaderType is bound as a whole from an uploaded file, see setByMultipartFormFile.
|
||||
var fileHeaderType = reflect.TypeFor[multipart.FileHeader]()
|
||||
|
||||
func mapFormByTag(ptr any, form map[string][]string, tag string) error {
|
||||
// Check if ptr is a map
|
||||
ptrVal := reflect.ValueOf(ptr)
|
||||
@ -117,6 +120,9 @@ func mapping(value reflect.Value, field reflect.StructField, setter setter, tag
|
||||
|
||||
if vKind == reflect.Struct {
|
||||
tValue := value.Type()
|
||||
if tValue == fileHeaderType { // its fields are not request parameters
|
||||
return false, nil
|
||||
}
|
||||
|
||||
var isSet bool
|
||||
for i := range value.NumField() {
|
||||
|
||||
@ -1144,3 +1144,15 @@ func TestMappingEmptyValues(t *testing.T) {
|
||||
assert.Equal(t, []int{1, 2, 3}, s.SliceCsv)
|
||||
})
|
||||
}
|
||||
|
||||
func TestMappingFileHeaderFieldNames(t *testing.T) {
|
||||
var s struct {
|
||||
FileValue multipart.FileHeader `form:"file"`
|
||||
FilePtr *multipart.FileHeader `form:"file"`
|
||||
}
|
||||
|
||||
err := mapForm(&s, map[string][]string{"Filename": {"report.pdf"}, "Size": {"12345"}})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, multipart.FileHeader{}, s.FileValue)
|
||||
assert.Nil(t, s.FilePtr)
|
||||
}
|
||||
|
||||
@ -137,3 +137,27 @@ func assertMultipartFileHeader(t *testing.T, fh *multipart.FileHeader, file test
|
||||
err = fl.Close()
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestFormMultipartBindingIgnoresFileHeaderFieldNames(t *testing.T) {
|
||||
var s struct {
|
||||
FileValue multipart.FileHeader `form:"file"`
|
||||
FilePtr *multipart.FileHeader `form:"file"`
|
||||
}
|
||||
|
||||
// No file is uploaded, but the text fields are named like the exported
|
||||
// fields of multipart.FileHeader.
|
||||
var body bytes.Buffer
|
||||
mw := multipart.NewWriter(&body)
|
||||
require.NoError(t, mw.WriteField("Filename", "report.pdf"))
|
||||
require.NoError(t, mw.WriteField("Size", "XL"))
|
||||
require.NoError(t, mw.WriteField("Header", "plain text"))
|
||||
require.NoError(t, mw.Close())
|
||||
|
||||
req, err := http.NewRequest(http.MethodPost, "/", &body)
|
||||
require.NoError(t, err)
|
||||
req.Header.Set("Content-Type", mw.FormDataContentType())
|
||||
|
||||
require.NoError(t, FormMultipart.Bind(req, &s))
|
||||
assert.Equal(t, multipart.FileHeader{}, s.FileValue)
|
||||
assert.Nil(t, s.FilePtr)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user