diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 18:11:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 18:11:58 +0300 |
commit | c17eb7c97062d25cdf1b44573e4c0241f52aa2fe (patch) | |
tree | 5164ebf4ccf1701cce78d7b4121c414ab370db6e /workhorse/internal/upload/uploads_test.go | |
parent | 60e09a0cef4e104aa41e20ab7a40499f3343e90f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/upload/uploads_test.go')
-rw-r--r-- | workhorse/internal/upload/uploads_test.go | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/workhorse/internal/upload/uploads_test.go b/workhorse/internal/upload/uploads_test.go index 7c22b3b4e28..d238895c2bd 100644 --- a/workhorse/internal/upload/uploads_test.go +++ b/workhorse/internal/upload/uploads_test.go @@ -4,10 +4,12 @@ import ( "bytes" "context" "fmt" + "io" "io/ioutil" "mime/multipart" "net/http" "net/http/httptest" + "net/textproto" "os" "regexp" "strconv" @@ -384,6 +386,99 @@ func TestInvalidFileNames(t *testing.T) { } } +func TestContentDisposition(t *testing.T) { + testhelper.ConfigureSecret() + + tempPath, err := ioutil.TempDir("", "uploads") + require.NoError(t, err) + defer os.RemoveAll(tempPath) + + tests := []struct { + desc string + contentDisposition string + code int + body string + }{ + { + desc: "empty header", + contentDisposition: "", + code: 200, + body: "", + }, + { + desc: "without filename", + contentDisposition: `form-data; name="filename"`, + code: 200, + body: "", + }, + { + desc: "with filename", + contentDisposition: `form-data; name="file"; filename=foobar`, + code: 200, + body: "", + }, + { + desc: "with filename* supported charset", + contentDisposition: `form-data; name="file"; filename*=UTF-8''foobar`, + code: 200, + body: "", + }, + { + desc: "with both filename and filename* supported charset", + contentDisposition: `form-data; name="file"; filename=foobar; filename*=UTF-8''foobar`, + code: 200, + body: "", + }, + { + desc: "with filename and filename* unsupported charset", + contentDisposition: `form-data; name="file"; filename=foobar; filename*=UTF-16''foobar`, + code: 200, + body: "", + }, + { + desc: "unsupported charset", + contentDisposition: `form-data; name="file"; filename*=UTF-16''foobar`, + code: 400, + body: ErrUnexpectedFilePart.Error() + "\n", + }, + } + + for _, testCase := range tests { + t.Run(testCase.desc, func(t *testing.T) { + // Create custom Content-Disposition with filename* and charset + // Example: filename*=UTF-8''application.log + h := make(textproto.MIMEHeader) + + h.Set("Content-Disposition", testCase.contentDisposition) + h.Set("Content-Type", "application/octet-stream") + + buffer := &bytes.Buffer{} + writer := multipart.NewWriter(buffer) + file, err := writer.CreatePart(h) + require.NoError(t, err) + fmt.Fprint(file, "test") + writer.Close() + + httpRequest := httptest.NewRequest("POST", "/example", buffer) + httpRequest.Header.Set("Content-Type", writer.FormDataContentType()) + + response := httptest.NewRecorder() + apiResponse := &api.Response{TempPath: tempPath} + preparer := &DefaultPreparer{} + opts, _, err := preparer.Prepare(apiResponse) + require.NoError(t, err) + + HandleFileUploads(response, httpRequest, nilHandler, apiResponse, &SavedFileTracker{Request: httpRequest}, opts) + + body, err := io.ReadAll(response.Body) + require.NoError(t, err) + + require.Equal(t, testCase.code, response.Code) + require.Equal(t, testCase.body, string(body)) + }) + } +} + func TestUploadHandlerRemovingExif(t *testing.T) { content, err := ioutil.ReadFile("exif/testdata/sample_exif.jpg") require.NoError(t, err) |