fix(coderd): set mode and modtime correctly when converting from zip->tar

johnstcn · johnstcn · commit e8e6dd06c62f · 2024-03-08T15:59:46.000Z
diff --git a/coderd/fileszip.go b/coderd/fileszip.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"io"
 	"log"
+	"strings"
 )
 
 func CreateTarFromZip(zipReader *zip.Reader) ([]byte, error) {
@@ -38,10 +39,20 @@ func processFileInZipArchive(file *zip.File, tarWriter *tar.Writer) error {
 	}
 	defer fileReader.Close()
 
+	mode := int64(0o644)
+	if strings.HasSuffix(file.Name, "/") {
+		// directory
+		mode = 0o755
+	}
+
 	err = tarWriter.WriteHeader(&tar.Header{
-		Name: file.Name,
-		Size: file.FileInfo().Size(),
-		Mode: 0o644,
+		Name:    file.Name,
+		Size:    file.FileInfo().Size(),
+		Mode:    mode,
+		ModTime: file.Modified,
+		// Note: Zip archives do not store ownership information.
+		Uid: 1000,
+		Gid: 1000,
 	})
 	if err != nil {
 		return err
