kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Use idtools.LookupGroup instead of parsing /etc/group file for docker.sock ownership 

Signed-off-by: James Watkins-Harvey <jwatkins@progi-media.com>
This commit is contained in:
James Watkins-Harvey 2018-11-01 17:05:11 -04:00
parent 46652b00ad
commit a2e384682b
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon/listeners/group_unix.go
View File

@ -6,25 +6,15 @@ import (
"fmt"
"strconv"
"github.com/opencontainers/runc/libcontainer/user"
"github.com/pkg/errors"
"github.com/docker/docker/pkg/idtools"
)
const defaultSocketGroup = "docker"
func lookupGID(name string) (int, error) {
groupFile, err := user.GetGroupPath()
if err != nil {
return -1, errors.Wrap(err, "error looking up groups")
}
groups, err := user.ParseGroupFileFilter(groupFile, func(g user.Group) bool {
return g.Name == name || strconv.Itoa(g.Gid) == name
})
if err != nil {
return -1, errors.Wrapf(err, "error parsing groups for %s", name)
}
if len(groups) > 0 {
return groups[0].Gid, nil
group, err := idtools.LookupGroup(name)
if err == nil {
return group.Gid, nil
}
gid, err := strconv.Atoi(name)
if err == nil {