opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
![image](https://github.com/user-attachments/assets/15ae6dc4-84a3-4c20-b603-ed38cc14a250)
Despite being encoded the same, the API was previously rejecting zip
files with this MIME type.
This commit is contained in:
Ethan
2024-11-08 18:24:12 +11:00
committed by GitHub
parent 718722af1b
commit f7cbf5dd79
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/files.go
+5 -4
View File
@@ -25,8 +25,9 @@ import (
)
const (
tarMimeType = "application/x-tar"
zipMimeType = "application/zip"
tarMimeType = "application/x-tar"
zipMimeType = "application/zip"
windowsZipMimeType = "application/x-zip-compressed"
HTTPFileMaxBytes = 10 * (10 << 20)
)
@@ -48,7 +49,7 @@ func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
contentType := r.Header.Get("Content-Type")
switch contentType {
case tarMimeType, zipMimeType:
case tarMimeType, zipMimeType, windowsZipMimeType:
default:
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: fmt.Sprintf("Unsupported content type header %q.", contentType),
@@ -66,7 +67,7 @@ func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
return
}
if contentType == zipMimeType {
if contentType == zipMimeType || contentType == windowsZipMimeType {
zipReader, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{