TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssh/tailssh: make uid an int instead of uint64

Browse Source 
Follow-up to #7615

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: Ib4256bff276f6d5cf95838d8e39c87b3643bde37
This commit is contained in:
Andrew Dunham 2023-03-21 12:26:58 -04:00
parent c9a4dbe383
commit 39b289578e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh/tailssh/incubator.go
View File

@ -160,7 +160,7 @@ func (stdRWC) Close() error {
} }
type incubatorArgs struct { type incubatorArgs struct {
uid uint64 uid int
gid int gid int
groups string groups string
localUser string localUser string
@ -177,7 +177,7 @@ type incubatorArgs struct {
func parseIncubatorArgs(args []string) (a incubatorArgs) { func parseIncubatorArgs(args []string) (a incubatorArgs) {
flags := flag.NewFlagSet("", flag.ExitOnError) flags := flag.NewFlagSet("", flag.ExitOnError)
flags.Uint64Var(&a.uid, "uid", 0, "the uid of local-user") flags.IntVar(&a.uid, "uid", 0, "the uid of local-user")
flags.IntVar(&a.gid, "gid", 0, "the gid of local-user") flags.IntVar(&a.gid, "gid", 0, "the gid of local-user")
flags.StringVar(&a.groups, "groups", "", "comma-separated list of gids of local-user") flags.StringVar(&a.groups, "groups", "", "comma-separated list of gids of local-user")
flags.StringVar(&a.localUser, "local-user", "", "the user to run as") flags.StringVar(&a.localUser, "local-user", "", "the user to run as")
@ -217,7 +217,7 @@ func beIncubator(args []string) error {
} }
} }
euid := uint64(os.Geteuid()) euid := os.Geteuid()
runningAsRoot := euid == 0 runningAsRoot := euid == 0
if runningAsRoot && ia.loginCmdPath != "" { if runningAsRoot && ia.loginCmdPath != "" {
// Check if we can exec into the login command instead of trying to // Check if we can exec into the login command instead of trying to
@ -245,7 +245,7 @@ func beIncubator(args []string) error {
groupIDs = append(groupIDs, int(gid)) groupIDs = append(groupIDs, int(gid))
} }
if err := dropPrivileges(logf, int(ia.uid), ia.gid, groupIDs); err != nil { if err := dropPrivileges(logf, ia.uid, ia.gid, groupIDs); err != nil {
return err return err
} }