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

oci: skip checking gid for WithAppendAdditionalGroups

Browse Source 
Signed-off-by: Ye Sijun <junnplus@gmail.com>
This commit is contained in:
Ye Sijun
2022-08-05 18:09:08 +08:00
parent 01a2b793b8
commit 2dbff1dbca
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oci/spec_opts.go
View File

@@ -879,15 +879,19 @@ func WithAppendAdditionalGroups(groups ...string) SpecOpts {
groupMap := make(map[string]user.Group)
for _, group := range ugroups {
groupMap[group.Name] = group
groupMap[strconv.Itoa(group.Gid)] = group
}
var gids []uint32
for _, group := range groups {
g, ok := groupMap[group]
if !ok {
return fmt.Errorf("unable to find group %s", group)
gid, err := strconv.ParseUint(group, 10, 32)
if err == nil {
gids = append(gids, uint32(gid))
} else {
g, ok := groupMap[group]
if !ok {
return fmt.Errorf("unable to find group %s", group)
}
gids = append(gids, uint32(g.Gid))
}
gids = append(gids, uint32(g.Gid))
}
s.Process.User.AdditionalGids = append(s.Process.User.AdditionalGids, gids...)
return nil