fix(coderd): add trailing path separator to dir entries when converting to zip

johnstcn · johnstcn · commit fb2aede7ba8d · 2024-03-08T18:05:53.000Z
diff --git a/coderd/fileszip.go b/coderd/fileszip.go
@@ -94,6 +94,12 @@ func WriteZipArchive(w io.Writer, tarReader *tar.Reader) error {
 			return err
 		}
 		zipHeader.Name = tarHeader.Name
+		// Some versions of unzip do not check the mode on a file entry and
+		// simply assume that entries with a trailing path separator (/) are
+		// directories, and that everything else is a file. Give them a hint.
+		if tarHeader.FileInfo().IsDir() && !strings.HasSuffix(tarHeader.Name, "/") {
+			zipHeader.Name += "/"
+		}
 
 		zipEntry, err := zipWriter.CreateHeader(zipHeader)
 		if err != nil {
