Skip to content

Commit 3fede90

Browse files
committed
one chuser() to rule them all
1 parent a0bfd9d commit 3fede90

File tree

2 files changed

+33
-126
lines changed

2 files changed

+33
-126
lines changed

cmd/yggdrasil/chuser_openbsd.go

Lines changed: 0 additions & 57 deletions
This file was deleted.

cmd/yggdrasil/chuser_unix.go

Lines changed: 33 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,56 @@
1-
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || solaris
2-
// +build aix darwin dragonfly freebsd linux netbsd solaris
1+
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
2+
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
33

44
package main
55

66
import (
7-
"errors"
87
"fmt"
9-
"math"
10-
osuser "os/user"
8+
"os/user"
119
"strconv"
1210
"strings"
13-
"syscall"
11+
12+
"golang.org/x/sys/unix"
1413
)
1514

16-
func chuser(user string) error {
17-
group := ""
18-
if i := strings.IndexByte(user, ':'); i >= 0 {
19-
user, group = user[:i], user[i+1:]
20-
}
15+
func chuser(input string) error {
16+
givenUser, givenGroup, _ := strings.Cut(input, ":")
2117

22-
u := (*osuser.User)(nil)
23-
g := (*osuser.Group)(nil)
18+
var (
19+
err error
20+
usr *user.User
21+
grp *user.Group
22+
uid, gid int
23+
)
2424

25-
if user != "" {
26-
if _, err := strconv.ParseUint(user, 10, 32); err == nil {
27-
u, err = osuser.LookupId(user)
28-
if err != nil {
29-
return fmt.Errorf("failed to lookup user by id %q: %v", user, err)
30-
}
31-
} else {
32-
u, err = osuser.Lookup(user)
33-
if err != nil {
34-
return fmt.Errorf("failed to lookup user by name %q: %v", user, err)
35-
}
25+
if usr, err = user.Lookup(givenUser); err != nil {
26+
if usr, err = user.LookupId(givenUser); err != nil {
27+
return err
3628
}
3729
}
38-
if group != "" {
39-
if _, err := strconv.ParseUint(group, 10, 32); err == nil {
40-
g, err = osuser.LookupGroupId(group)
41-
if err != nil {
42-
return fmt.Errorf("failed to lookup group by id %q: %v", user, err)
43-
}
44-
} else {
45-
g, err = osuser.LookupGroup(group)
46-
if err != nil {
47-
return fmt.Errorf("failed to lookup group by name %q: %v", user, err)
48-
}
49-
}
30+
if uid, err = strconv.Atoi(usr.Uid); err != nil {
31+
return err
5032
}
5133

52-
if g != nil {
53-
gid, _ := strconv.ParseUint(g.Gid, 10, 32)
54-
var err error
55-
if gid < math.MaxInt {
56-
if err := syscall.Setgroups([]int{int(gid)}); err != nil {
57-
return fmt.Errorf("failed to setgroups %d: %v", gid, err)
34+
if givenGroup != "" {
35+
if grp, err = user.LookupGroup(givenGroup); err != nil {
36+
if grp, err = user.LookupGroupId(givenGroup); err != nil {
37+
return err
5838
}
59-
err = syscall.Setgid(int(gid))
60-
} else {
61-
err = errors.New("gid too big")
6239
}
6340

64-
if err != nil {
65-
return fmt.Errorf("failed to setgid %d: %v", gid, err)
66-
}
67-
} else if u != nil {
68-
gid, _ := strconv.ParseUint(u.Gid, 10, 32)
69-
if err := syscall.Setgroups([]int{int(uint32(gid))}); err != nil {
70-
return fmt.Errorf("failed to setgroups %d: %v", gid, err)
71-
}
72-
err := syscall.Setgid(int(uint32(gid)))
73-
if err != nil {
74-
return fmt.Errorf("failed to setgid %d: %v", gid, err)
75-
}
41+
gid, _ = strconv.Atoi(grp.Gid)
42+
} else {
43+
gid, _ = strconv.Atoi(usr.Gid)
7644
}
7745

78-
if u != nil {
79-
uid, _ := strconv.ParseUint(u.Uid, 10, 32)
80-
var err error
81-
if uid < math.MaxInt {
82-
err = syscall.Setuid(int(uid))
83-
} else {
84-
err = errors.New("uid too big")
85-
}
86-
87-
if err != nil {
88-
return fmt.Errorf("failed to setuid %d: %v", uid, err)
89-
}
46+
if err := unix.Setgroups([]int{gid}); err != nil {
47+
return fmt.Errorf("setgroups: %d: %v", gid, err)
48+
}
49+
if err := unix.Setresgid(gid, gid, gid); err != nil {
50+
return fmt.Errorf("setresgid: %d: %v", gid, err)
51+
}
52+
if err := unix.Setresuid(uid, uid, uid); err != nil {
53+
return fmt.Errorf("setresuid: %d: %v", uid, err)
9054
}
9155

9256
return nil

0 commit comments

Comments
 (0)