From 12907f5bad7cdd97724b1e520b791892aec883b4 Mon Sep 17 00:00:00 2001
From: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
Date: Sun, 5 Jan 2025 10:48:09 +0900
Subject: [PATCH] fix(unarchive): add 0o700 permission to directories

---
 pkg/unarchive/archives.go | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/pkg/unarchive/archives.go b/pkg/unarchive/archives.go
index a60371c62..9e65917c0 100644
--- a/pkg/unarchive/archives.go
+++ b/pkg/unarchive/archives.go
@@ -22,26 +22,6 @@ type handler struct {
 	logE     *logrus.Entry
 }
 
-const readOnlyPerm = 0o200
-
-func allowWrite(fs afero.Fs, path string) (func() error, error) {
-	originalMode, err := os.Stat(path)
-	if err != nil {
-		return nil, fmt.Errorf("stat a parent directory: %w", err)
-	}
-
-	if originalMode.Mode().Perm()&readOnlyPerm != 0 {
-		return nil, nil //nolint:nilnil
-	}
-
-	if err := os.Chmod(path, originalMode.Mode()|readOnlyPerm); err != nil {
-		return nil, fmt.Errorf("chmod parent directory: %w", err)
-	}
-	return func() error {
-		return fs.Chmod(path, originalMode.Mode())
-	}, nil
-}
-
 func (h *handler) normalizePath(nameInArchive string) string {
 	slashCount := strings.Count(nameInArchive, "/")
 	backSlashCount := strings.Count(nameInArchive, "\\")
@@ -60,7 +40,7 @@ func (h *handler) HandleFile(_ context.Context, f archives.FileInfo) error {
 	}
 
 	if f.IsDir() {
-		if err := h.fs.MkdirAll(dstPath, f.Mode()); err != nil {
+		if err := h.fs.MkdirAll(dstPath, f.Mode()|0o700); err != nil {
 			logerr.WithError(h.logE, err).Warn("create a directory")
 			return nil
 		}
@@ -71,19 +51,6 @@ func (h *handler) HandleFile(_ context.Context, f archives.FileInfo) error {
 	// 	return nil
 	// }
 
-	fn, err := allowWrite(h.fs, parentDir)
-	if err != nil {
-		logerr.WithError(h.logE, err).Warn("allow write permission temporarily")
-		return nil
-	}
-	if fn != nil {
-		defer func() {
-			if err := fn(); err != nil {
-				logerr.WithError(h.logE, err).Warn("failed to restore the original permission")
-			}
-		}()
-	}
-
 	reader, err := f.Open()
 	if err != nil {
 		logerr.WithError(h.logE, err).Warn("open a file")