Merge fc07a2296babda3b2942b478953ffb6d72acae0f into 0f09c3a9b4626d9fe9979cf4d0521d6ae32ab646

This commit is contained in:
T Mohan Aditya 2026-11-12 17:45:39 +05:30 committed by GitHub
commit cfe1a282fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 0 deletions

View File

@ -28,6 +28,9 @@ func (r *multipartRequest) TrySet(value reflect.Value, field reflect.StructField
if files := r.MultipartForm.File[key]; len(files) != 0 {
return setByMultipartFormFile(value, field, files)
}
if isFileHeaderType(value.Type()) {
return false, nil
}
return setByForm(value, field, r.MultipartForm.Value, key, opt)
}
@ -72,3 +75,15 @@ func setArrayOfMultipartFormFiles(value reflect.Value, field reflect.StructField
}
return true, nil
}
var fileHeaderType = reflect.TypeOf(multipart.FileHeader{})
func isFileHeaderType(t reflect.Type) bool {
if t.Kind() == reflect.Slice || t.Kind() == reflect.Array {
t = t.Elem()
}
if t.Kind() == reflect.Ptr {
t = t.Elem()
}
return t == fileHeaderType
}

View File

@ -69,6 +69,31 @@ func TestFormMultipartBindingBindTwoFiles(t *testing.T) {
}
}
func TestFormMultipartBindingBindEmptyFile(t *testing.T) {
var s struct {
FilePtr *multipart.FileHeader `form:"file"`
SliceValues []multipart.FileHeader `form:"file"`
SlicePtrs []*multipart.FileHeader `form:"file"`
ArrayPtrs [1]*multipart.FileHeader `form:"file"`
}
req := createRequestMultipartFiles(t, testFile{"file", "", nil})
err := FormMultipart.Bind(req, &s)
require.NoError(t, err)
assert.Nil(t, s.FilePtr)
assert.Nil(t, s.SliceValues)
assert.Nil(t, s.SlicePtrs)
assert.Nil(t, s.ArrayPtrs[0])
var required struct {
File *multipart.FileHeader `form:"file" binding:"required"`
}
req = createRequestMultipartFiles(t, testFile{"file", "", nil})
err = FormMultipart.Bind(req, &required)
require.Error(t, err)
assert.Nil(t, required.File)
}
func TestFormMultipartBindingBindError(t *testing.T) {
files := []testFile{
{"file", "file1", []byte("hello")},