Skip to content

Commit

Permalink
Respects folder fileMode during gzip unzip (#1258)
Browse files Browse the repository at this point in the history
  • Loading branch information
0sewa0 committed Oct 19, 2022
1 parent 634ff1c commit d48183a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/installer/zip/gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func extractFilesFromGzip(fs afero.Fs, targetDir string, reader *tar.Reader) err

switch header.Typeflag {
case tar.TypeDir:
if err := fs.MkdirAll(target, common.MkDirFileMode); err != nil {
if err := fs.MkdirAll(target, header.FileInfo().Mode()); err != nil {
return errors.WithStack(err)
}
case tar.TypeLink:
Expand Down Expand Up @@ -108,11 +108,11 @@ func extractSymlink(fs afero.Fs, targetDir, target string, header *tar.Header) e
}

func extractFile(fs afero.Fs, target string, header *tar.Header, tarReader *tar.Reader) error {
mode := header.Mode
mode := header.FileInfo().Mode()
if isAgentConfFile(header.Name) {
mode = common.ReadWriteAllFileMode
}
destinationFile, err := fs.OpenFile(target, os.O_CREATE|os.O_RDWR|os.O_TRUNC, os.FileMode(mode))
destinationFile, err := fs.OpenFile(target, os.O_CREATE|os.O_RDWR|os.O_TRUNC, mode)
defer (func() { _ = destinationFile.Close() })()
if err != nil {
return errors.WithStack(err)
Expand Down

0 comments on commit d48183a

Please sign in to comment.