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

Merge pull request #765 from dmcgowan/grpc-socket-permissions

Browse Source 
Ensure grpc socket is group writable
This commit is contained in:
Phil Estes 2017-04-27 10:00:50 -04:00 committed by GitHub
commit f3c5811c35
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerd/main_unix.go
View File

@ -35,6 +35,12 @@ func platformInit(context *cli.Context) error {
return err return err
} }
} }
if err := os.MkdirAll(conf.State, 0750); err != nil {
return err
}
if err := os.Chown(conf.State, conf.GRPC.Uid, conf.GRPC.Gid); err != nil {
return err
}
return nil return nil
} }

5
sys/socket_unix.go
View File

@ -28,6 +28,11 @@ func GetLocalListener(path string, uid, gid int) (net.Listener, error) {
return l, err return l, err
} }
if err := os.Chmod(path, 0660); err != nil {
l.Close()
return nil, err
}
if err := os.Chown(path, uid, gid); err != nil { if err := os.Chown(path, uid, gid); err != nil {
l.Close() l.Close()
return nil, err return nil, err