Skip to content

Don't set additional groups on darwin #31132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
espadolini merged 2 commits into from
Aug 29, 2023
Merged

Don't set additional groups on darwin #31132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9901e
Don't setgroups on macos
espadolini Aug 29, 2023
4017b7b
Use ParseUint to get uint32s
espadolini Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions lib/srv/reexec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"os/signal"
"os/user"
"path/filepath"
"runtime"
"strconv"
"syscall"
"time"
Expand Down Expand Up @@ -1037,23 +1038,34 @@ func (o *osWrapper) newParker(ctx context.Context, credential syscall.Credential
// getCmdCredentials parses the uid, gid, and groups of the
// given user into a credential object for a command to use.
func getCmdCredential(localUser *user.User) (*syscall.Credential, error) {
uid, err := strconv.Atoi(localUser.Uid)
uid, err := strconv.ParseUint(localUser.Uid, 10, 32)
if err != nil {
return nil, trace.Wrap(err)
}
gid, err := strconv.Atoi(localUser.Gid)
gid, err := strconv.ParseUint(localUser.Gid, 10, 32)
if err != nil {
return nil, trace.Wrap(err)
}

if runtime.GOOS == "darwin" {
// on macOS we should rely on the list of groups managed by the system
// (the use of setgroups is "highly discouraged", as per the setgroups
// man page in macOS 13.5)
return &syscall.Credential{
Uid: uint32(uid),
Gid: uint32(gid),
NoSetGroups: true,
}, nil
}

// Lookup supplementary groups for the user.
userGroups, err := localUser.GroupIds()
if err != nil {
return nil, trace.Wrap(err)
}
groups := make([]uint32, 0)
for _, sgid := range userGroups {
igid, err := strconv.Atoi(sgid)
igid, err := strconv.ParseUint(sgid, 10, 32)
if err != nil {
log.Warnf("Cannot interpret user group: '%v'", sgid)
} else {
Expand Down