Skip to content

Commit

Permalink
Use idtools.LookupGroup instead of parsing /etc/group file for docker…
Browse files Browse the repository at this point in the history
….sock ownership

Signed-off-by: James Watkins-Harvey <jwatkins@progi-media.com>
  • Loading branch information
mjameswh committed Nov 29, 2018
1 parent 46652b0 commit a2e3846
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions daemon/listeners/group_unix.go
Expand Up @@ -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 {
Expand Down

0 comments on commit a2e3846

Please sign in to comment.