Merge pull request #9 from kolyshkin/fix-dir-perms

mrunalp · web-flow · commit 7363e975f9cf · 2023-10-04T08:07:19.000-07:00
MkdirAllNewAs,CopyDirectory: ensure dir perms
diff --git a/fileutils.go b/fileutils.go
@@ -125,6 +125,7 @@ func CopyDirectory(source string, dest string) error {
 		if err != nil {
 			return nil
 		}
+		destPath := filepath.Join(dest, relPath)
 
 		if info.IsDir() {
 			// Skip the source directory.
@@ -138,18 +139,20 @@ func CopyDirectory(source string, dest string) error {
 				uid := int(st.Uid)
 				gid := int(st.Gid)
 
-				if err := os.Mkdir(filepath.Join(dest, relPath), info.Mode()); err != nil {
+				if err := os.Mkdir(destPath, info.Mode()); err != nil {
 					return err
 				}
-
-				if err := os.Lchown(filepath.Join(dest, relPath), uid, gid); err != nil {
+				if err := os.Lchown(destPath, uid, gid); err != nil {
+					return err
+				}
+				if err := os.Chmod(destPath, info.Mode()); err != nil {
 					return err
 				}
 			}
 			return nil
 		}
 
-		return CopyFile(path, filepath.Join(dest, relPath))
+		return CopyFile(path, destPath)
 	})
 }
 
diff --git a/idtools.go b/idtools.go
@@ -49,6 +49,9 @@ func MkdirAllNewAs(path string, mode os.FileMode, ownerUID, ownerGID int) error
 		if err := os.Chown(pathComponent, ownerUID, ownerGID); err != nil {
 			return err
 		}
+		if err := os.Chmod(pathComponent, mode); err != nil {
+			return err
+		}
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ func CopyDirectory(source string, dest string) error {`
`125`	`125`	`if err != nil {`
`126`	`126`	`return nil`
`127`	`127`	`}`
	`128`	`+ destPath := filepath.Join(dest, relPath)`
`128`	`129`
`129`	`130`	`if info.IsDir() {`
`130`	`131`	`// Skip the source directory.`
`@@ -138,18 +139,20 @@ func CopyDirectory(source string, dest string) error {`
`138`	`139`	`uid := int(st.Uid)`
`139`	`140`	`gid := int(st.Gid)`
`140`	`141`
`141`		`- if err := os.Mkdir(filepath.Join(dest, relPath), info.Mode()); err != nil {`
	`142`	`+ if err := os.Mkdir(destPath, info.Mode()); err != nil {`
`142`	`143`	`return err`
`143`	`144`	`}`
`144`		`-`
`145`		`- if err := os.Lchown(filepath.Join(dest, relPath), uid, gid); err != nil {`
	`145`	`+ if err := os.Lchown(destPath, uid, gid); err != nil {`
	`146`	`+ return err`
	`147`	`+ }`
	`148`	`+ if err := os.Chmod(destPath, info.Mode()); err != nil {`
`146`	`149`	`return err`
`147`	`150`	`}`
`148`	`151`	`}`
`149`	`152`	`return nil`
`150`	`153`	`}`
`151`	`154`
`152`		`- return CopyFile(path, filepath.Join(dest, relPath))`
	`155`	`+ return CopyFile(path, destPath)`
`153`	`156`	`})`
`154`	`157`	`}`
`155`	`158`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ func MkdirAllNewAs(path string, mode os.FileMode, ownerUID, ownerGID int) error`
`49`	`49`	`if err := os.Chown(pathComponent, ownerUID, ownerGID); err != nil {`
`50`	`50`	`return err`
`51`	`51`	`}`
	`52`	`+ if err := os.Chmod(pathComponent, mode); err != nil {`
	`53`	`+ return err`
	`54`	`+ }`
`52`	`55`	`}`
`53`	`56`	`return nil`
`54`	`57`	`}`