Skip to content

multipart: allow FormFile field name to differ from filename #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
team-humaki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

multipart: allow FormFile field name to differ from filename #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions plugins/multipart/multipart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ type Values []string
type DataFields map[string]Values

// FormFile represents the file form field data.
// Name is the filename in Content-Disposition. FieldName is the form field
// name (name="..."); if empty, Name is used for both, matching prior behavior.
type FormFile struct {
Name string
Reader io.Reader
Name string
Reader io.Reader
FieldName string
}

// FormData represents the supported form fields by file and string data.
Expand All @@ -35,7 +38,7 @@ type FormData struct {
// from the given io.ReadCloser stream.
func File(name string, reader io.Reader) p.Plugin {
return p.NewRequestPlugin(func(ctx *c.Context, h c.Handler) {
file := FormFile{name, reader}
file := FormFile{Name: name, Reader: reader}
data := FormData{Files: []FormFile{file}}
handle(ctx, h, data)
})
Expand Down Expand Up @@ -117,8 +120,12 @@ func writeFile(multipartWriter *multipart.Writer, data FormData, file FormFile,
if file.Name != "" {
fileName = file.Name
}
fieldName := fileName
if file.FieldName != "" {
fieldName = file.FieldName
}

writer, err := multipartWriter.CreateFormFile(fileName, file.Name)
writer, err := multipartWriter.CreateFormFile(fieldName, fileName)
if err != nil {
return err
}
Expand Down
20 changes: 18 additions & 2 deletions plugins/multipart/multipart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func TestFiles(t *testing.T) {
fn := newHandler()
reader1 := bytes.NewReader([]byte("content1"))
reader2 := bytes.NewReader([]byte("content2"))
file1 := FormFile{"file1", reader1}
file2 := FormFile{"file2", reader2}
file1 := FormFile{Name: "file1", Reader: reader1}
file2 := FormFile{Name: "file2", Reader: reader2}

Files([]FormFile{file1, file2}).Exec("request", ctx, fn.fn)
st.Expect(t, fn.called, true)
Expand Down Expand Up @@ -57,6 +57,22 @@ func TestFields(t *testing.T) {
st.Expect(t, match(body, "data=baz"), true)
}

func TestFileFieldName(t *testing.T) {
ctx := context.New()
fn := newHandler()
reader := bytes.NewReader([]byte("hello world"))
data := FormData{
Files: []FormFile{{Name: "a.txt", Reader: reader, FieldName: "file"}},
}

Data(data).Exec("request", ctx, fn.fn)
st.Expect(t, fn.called, true)
body, _ := ioutil.ReadAll(ctx.Request.Body)
st.Expect(t, ctx.Request.Method, "POST")
st.Expect(t, match(body, `Content-Disposition: form-data; name="file"; filename="a.txt"`), true)
st.Expect(t, match(body, "hello world"), true)
}

func TestData(t *testing.T) {
ctx := context.New()
fn := newHandler()
Expand Down