luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1888 from hashicorp/b-folder-perms

Browse source 
Change folder permission event when not root
This commit is contained in:
Alex Dadgar 2016-10-28 17:12:16 -07:00 committed by GitHub
parent cc115fe984 9c58ed9c57
commit 893b37efc9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -26,6 +26,7 @@ BUG FIXES:
[GH-1802]
* cli: `alloc-status` does not query for allocation statistics if node is down
[GH-1844]
* client: Folder permissions are dropped even when not running as root [GH-1888]
* client: Prevent race when persisting state file [GH-1682]
* client: Artifact download failures will be retried before failing tasks
[GH-1558]

10
client/allocdir/alloc_dir_unix.go
View file

@ -43,7 +43,11 @@ func (d *AllocDir) linkOrCopy(src, dst string, perm os.FileMode) error {
}
func (d *AllocDir) dropDirPermissions(path string) error {
// Can't do anything if not root.
if err := os.Chmod(path, 0777); err != nil {
return fmt.Errorf("Chmod(%v) failed: %v", path, err)
}
// Can't change owner if not root.
if unix.Geteuid() != 0 {
return nil
}
@ -67,10 +71,6 @@ func (d *AllocDir) dropDirPermissions(path string) error {
return fmt.Errorf("Couldn't change owner/group of %v to (uid: %v, gid: %v): %v", path, uid, gid, err)
}
if err := os.Chmod(path, 0777); err != nil {
return fmt.Errorf("Chmod(%v) failed: %v", path, err)
}
return nil
}