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

Merge pull request #38126 from mjameswh/fix-1715 

Use idtools.LookupGroup instead of parsing /etc/group file for docker.sock ownership
This commit is contained in:
Vincent Demeester 2018-12-12 17:29:28 +01:00 committed by GitHub
parent 759ad5a981 a2e384682b
commit 56cc56b0fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {