fix formUploader content-type bug (#131)

Author: bachue

.github/workflows/ci-test.yml

@@ -63,7 +63,7 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        go_version: ['1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x', '1.17.x', '1.18.x', '1.19.x', '1.20.x', '1.21.x']
+        go_version: ['1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x', '1.17.x', '1.18.x', '1.19.x', '1.20.x', '1.21.x', '1.22.x']
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -81,14 +81,14 @@ jobs:
           go-version: ${{ matrix.go_version }}
       - name: Format
         run: |
-          if [ "${{ matrix.go_version }}" = "1.21.x" ]; then
+          if [ "${{ matrix.go_version }}" = "1.22.x" ]; then
             if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
               exit 1
             fi
           fi
       - name: Golint
         run: |
-          if [ "${{ matrix.go_version }}" = "1.21.x" ]; then
+          if [ "${{ matrix.go_version }}" = "1.22.x" ]; then
             set -e
             go install honnef.co/go/tools/cmd/staticcheck@latest
             make staticcheck

internal/clientv2/multipart.go

@@ -1,8 +1,11 @@
 package clientv2
 
 import (
+	"fmt"
 	"io"
 	"mime/multipart"
+	"net/textproto"
+	"strings"
 
 	"github.com/qiniu/go-sdk/v7/internal/context"
 	compatible_io "github.com/qiniu/go-sdk/v7/internal/io"
@@ -13,8 +16,8 @@ type (
 		key, value string
 	}
 	keyFilePair struct {
-		key, fileName string
-		stream        compatible_io.ReadSeekCloser
+		key, fileName, contentType string
+		stream                     compatible_io.ReadSeekCloser
 	}
 
 	MultipartForm struct {
@@ -29,16 +32,17 @@ type (
 		multipartWriter *multipart.Writer
 		form            *MultipartForm
 		r               *io.PipeReader
+		closed          bool
 	}
 )
 
 func (f *MultipartForm) SetValue(key, value string) *MultipartForm {
-	f.values = append(f.values, keyValuePair{key: key, value: value})
+	f.values = append(f.values, keyValuePair{key, value})
 	return f
 }
 
-func (f *MultipartForm) SetFile(key, fileName string, stream compatible_io.ReadSeekCloser) *MultipartForm {
-	f.files = append(f.files, keyFilePair{key: key, fileName: fileName, stream: stream})
+func (f *MultipartForm) SetFile(key, fileName, contentType string, stream compatible_io.ReadSeekCloser) *MultipartForm {
+	f.files = append(f.files, keyFilePair{key, fileName, contentType, stream})
 	return f
 }
 
@@ -67,7 +71,7 @@ func newMultipartFormReader(form *MultipartForm) *multipartFormReader {
 			case <-ctx.Done():
 				return
 			default:
-				if err := reader.createFormFile(pair.key, pair.fileName, pair.stream); err != nil {
+				if err := reader.createFormFile(pair.key, pair.fileName, pair.contentType, pair.stream); err != nil {
 					cancel(err)
 					return
 				}
@@ -88,6 +92,10 @@ func (r *multipartFormReader) Read(p []byte) (int, error) {
 }
 
 func (r *multipartFormReader) Close() (err error) {
+	if r.closed {
+		return nil
+	}
+	r.closed = true
 	r.form.cancel(io.ErrClosedPipe)
 	err = r.r.Close()
 	for _, pair := range r.form.files {
@@ -102,8 +110,11 @@ func (r *multipartFormReader) formDataContentType() string {
 	return r.multipartWriter.FormDataContentType()
 }
 
-func (r *multipartFormReader) createFormFile(fieldName, fileName string, stream compatible_io.ReadSeekCloser) error {
-	if w, err := r.multipartWriter.CreateFormFile(fieldName, fileName); err != nil {
+func (r *multipartFormReader) createFormFile(fieldName, fileName, contentType string, stream compatible_io.ReadSeekCloser) error {
+	h := make(textproto.MIMEHeader)
+	h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="%s"; filename="%s"`, escapeQuotes(fieldName), escapeQuotes(fileName)))
+	h.Set("Content-Type", contentType)
+	if w, err := r.multipartWriter.CreatePart(h); err != nil {
 		return err
 	} else if _, err := io.Copy(w, stream); err != nil {
 		return err
@@ -133,3 +144,9 @@ func GetMultipartFormRequestBody(info *MultipartForm) GetRequestBody {
 		return r, nil
 	}
 }
+
+var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
+
+func escapeQuotes(s string) string {
+	return quoteEscaper.Replace(s)
+}

internal/clientv2/multipart_test.go

@@ -26,8 +26,8 @@ func TestMultipart(t *testing.T) {
 	form := new(MultipartForm).
 		SetValue("test-1", "value-1").
 		SetValue("test-2", "value-2").
-		SetFile("test-file-1", "test-file-name-1", file1).
-		SetFile("test-file-2", "test-file-name-2", file2)
+		SetFile("test-file-1", "test-file-name-1", "application/json", file1).
+		SetFile("test-file-2", "test-file-name-2", "application/x-www-form-urlencoded", file2)
 	getRequestBody := GetMultipartFormRequestBody(form)
 
 	for i := 0; i < 5; i++ {
@@ -55,15 +55,15 @@ func TestMultipart(t *testing.T) {
 		} else if f, err := os.Open(file1.Name()); err != nil {
 			t.Fatal(err)
 		} else {
-			assertPartFile(t, part, "test-file-1", "test-file-name-1", f)
+			assertPartFile(t, part, "test-file-1", "test-file-name-1", "application/json", f)
 			f.Close()
 		}
 		if part, err := reader.NextPart(); err != nil {
 			t.Fatal(err)
 		} else if f, err := os.Open(file2.Name()); err != nil {
 			t.Fatal(err)
 		} else {
-			assertPartFile(t, part, "test-file-2", "test-file-name-2", f)
+			assertPartFile(t, part, "test-file-2", "test-file-name-2", "application/x-www-form-urlencoded", f)
 			f.Close()
 		}
 		if _, err = reader.NextPart(); err != io.EOF {
@@ -109,13 +109,16 @@ func assertPartValue(t *testing.T, part *multipart.Part, key, value string) {
 	}
 }
 
-func assertPartFile(t *testing.T, part *multipart.Part, key, fileName string, value io.Reader) {
+func assertPartFile(t *testing.T, part *multipart.Part, key, fileName, contentType string, value io.Reader) {
 	if part.FormName() != key {
 		t.Fatalf("unexpected form name: %s != %s", part.FormName(), key)
 	}
 	if part.FileName() != fileName {
 		t.Fatalf("unexpected file name: %s != %s", part.FileName(), fileName)
 	}
+	if acutalContentType := part.Header.Get("Content-Type"); acutalContentType != contentType {
+		t.Fatalf("unexpected content type: %s != %s", acutalContentType, contentType)
+	}
 	md5Hasher := md5.New()
 	if _, err := io.Copy(md5Hasher, part); err != nil {
 		t.Fatal(err)

storage/form_upload.go

@@ -207,8 +207,9 @@ func (p *FormUploader) putSeekableData(ctx context.Context, ret interface{}, upT
 		ObjectName:  makeKeyForUploading(key, hasKey),
 		UploadToken: uptoken.NewParser(upToken),
 		File: http_client.MultipartFormBinaryData{
-			Data: internal_io.MakeReadSeekCloserFromLimitedReader(fileReader, dataSize),
-			Name: fileName,
+			Data:        internal_io.MakeReadSeekCloserFromLimitedReader(fileReader, dataSize),
+			Name:        fileName,
+			ContentType: extra.MimeType,
 		},
 		CustomData:   makeCustomData(extra.Params),
 		ResponseBody: ret,

storagev2/apis/api_post_object.go

@@ -43,7 +43,7 @@ func (form *innerPostObjectRequest) build(ctx context.Context) (*httpclient.Mult
 		if form.File.Name == "" {
 			return nil, errors.MissingRequiredFieldError{Name: "File.Name"}
 		}
-		multipartForm.SetFile("file", form.File.Name, form.File.Data)
+		multipartForm.SetFile("file", form.File.Name, form.File.ContentType, form.File.Data)
 	} else {
 		return nil, errors.MissingRequiredFieldError{Name: "File"}
 	}

storagev2/http_client/multipart.go

@@ -3,6 +3,7 @@ package http_client
 import compatible_io "github.com/qiniu/go-sdk/v7/internal/io"
 
 type MultipartFormBinaryData struct {
-	Data compatible_io.ReadSeekCloser
-	Name string
+	Data        compatible_io.ReadSeekCloser
+	Name        string
+	ContentType string
 }

storagev2/internal/api-generator/multipart.go

@@ -195,6 +195,7 @@ func (mff *MultipartFormFields) addBuildFunc(group *jen.Group, structName string
 							group.Add(jen.Id("multipartForm").Dot("SetFile").Call(
 								jen.Lit(named.Key),
 								jen.Id("form").Dot(fieldName).Dot("Name"),
+								jen.Id("form").Dot(fieldName).Dot("ContentType"),
 								jen.Id("form").Dot(fieldName).Dot("Data"),
 							))
 						}