github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1199 from dmcgowan/socket-directory-permissions

Browse Source 
Create socket parent directory with correct permissions
This commit is contained in:
Stephen Day 2017-07-17 14:04:06 -07:00 committed by GitHub
commit 52927e59ae
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/socket_unix.go
View File

@ -23,6 +23,11 @@ func CreateUnixSocket(path string) (net.Listener, error) {
// GetLocalListener returns a listerner out of a unix socket. // GetLocalListener returns a listerner out of a unix socket.
func GetLocalListener(path string, uid, gid int) (net.Listener, error) { func GetLocalListener(path string, uid, gid int) (net.Listener, error) {
// Ensure parent directory is created
if err := mkdirAs(filepath.Dir(path), uid, gid); err != nil {
return nil, err
}
l, err := CreateUnixSocket(path) l, err := CreateUnixSocket(path)
if err != nil { if err != nil {
return l, err return l, err
@ -40,3 +45,15 @@ func GetLocalListener(path string, uid, gid int) (net.Listener, error) {
return l, nil return l, nil
} }
func mkdirAs(path string, uid, gid int) error {
if _, err := os.Stat(path); err == nil || !os.IsNotExist(err) {
return err
}
if err := os.Mkdir(path, 0770); err != nil {
return err
}
return os.Chown(path, uid, gid)
}