Commit5bf5692

authored and

committed

fix: support windows specific zip mime type for template uploads (#15442)

![image](https://github.com/user-attachments/assets/15ae6dc4-84a3-4c20-b603-ed38cc14a250)Despite being encoded the same, the API was previously rejecting zipfiles with this MIME type.(cherry picked from commitf7cbf5d)

1 parentb948798 commit5bf5692Copy full SHA for 5bf5692

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,9 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`const (`
`28`		`-tarMimeType="application/x-tar"`
`29`		`-zipMimeType="application/zip"`
	`28`	`+tarMimeType="application/x-tar"`
	`29`	`+zipMimeType="application/zip"`
	`30`	`+windowsZipMimeType="application/x-zip-compressed"`
`30`	`31`
`31`	`32`	`HTTPFileMaxBytes=10* (10<<20)`
`32`	`33`	`)`
`@@ -48,7 +49,7 @@ func (api API) postFile(rw http.ResponseWriter, r http.Request) {`
`48`	`49`
`49`	`50`	`contentType:=r.Header.Get("Content-Type")`
`50`	`51`	`switchcontentType {`
`51`		`-casetarMimeType,zipMimeType:`
	`52`	`+casetarMimeType,zipMimeType,windowsZipMimeType:`
`52`	`53`	`default:`
`53`	`54`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
`54`	`55`	`Message:fmt.Sprintf("Unsupported content type header %q.",contentType),`
`@@ -66,7 +67,7 @@ func (api API) postFile(rw http.ResponseWriter, r http.Request) {`
`66`	`67`	`return`
`67`	`68`	`}`
`68`	`69`
`69`		`-ifcontentType==zipMimeType {`
	`70`	`+ifcontentType==zipMimeType\|\|contentType==windowsZipMimeType{`
`70`	`71`	`zipReader,err:=zip.NewReader(bytes.NewReader(data),int64(len(data)))`
`71`	`72`	`iferr!=nil {`
`72`	`73`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,18 @@ func TestPostFiles(t *testing.T) {`
`43`	`43`	`require.NoError(t,err)`
`44`	`44`	`})`
`45`	`45`
	`46`	`+t.Run("InsertWindowsZip",func(t*testing.T) {`
	`47`	`+t.Parallel()`
	`48`	`+client:=coderdtest.New(t,nil)`
	`49`	`+_=coderdtest.CreateFirstUser(t,client)`
	`50`	`+`
	`51`	`+ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)`
	`52`	`+defercancel()`
	`53`	`+`
	`54`	`+_,err:=client.Upload(ctx,"application/x-zip-compressed",bytes.NewReader(archivetest.TestZipFileBytes()))`
	`55`	`+require.NoError(t,err)`
	`56`	`+})`
	`57`	`+`
`46`	`58`	`t.Run("InsertAlreadyExists",func(t*testing.T) {`
`47`	`59`	`t.Parallel()`
`48`	`60`	`client:=coderdtest.New(t,nil)`

Comments

(0)