Commite8e6dd0

committed

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

1 parent51dd5a0 commite8e6dd0Copy full SHA for e8e6dd0

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"errors"`
`8`	`8`	`"io"`
`9`	`9`	`"log"`
	`10`	`+"strings"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`funcCreateTarFromZip(zipReader*zip.Reader) ([]byte,error) {`
`@@ -38,10 +39,20 @@ func processFileInZipArchive(file zip.File, tarWriter tar.Writer) error {`
`38`	`39`	`}`
`39`	`40`	`deferfileReader.Close()`
`40`	`41`
	`42`	`+mode:=int64(0o644)`
	`43`	`+ifstrings.HasSuffix(file.Name,"/") {`
	`44`	`+// directory`
	`45`	`+mode=0o755`
	`46`	`+}`
	`47`	`+`
`41`	`48`	`err=tarWriter.WriteHeader(&tar.Header{`
`42`		`-Name:file.Name,`
`43`		`-Size:file.FileInfo().Size(),`
`44`		`-Mode:0o644,`
	`49`	`+Name:file.Name,`
	`50`	`+Size:file.FileInfo().Size(),`
	`51`	`+Mode:mode,`
	`52`	`+ModTime:file.Modified,`
	`53`	`+// Note: Zip archives do not store ownership information.`
	`54`	`+Uid:1000,`
	`55`	`+Gid:1000,`
`45`	`56`	`})`
`46`	`57`	`iferr!=nil {`
`47`	`58`	`returnerr`

Comments

(0)