From 9e06478d8307b0279c991fd47122755fdf7bd922 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 5 Aug 2018 14:11:29 +0200 Subject: rootless: fix user lookup if USER= is not set Lookup the current username by UID if the USER env variable is not set. Reported in: https://github.com/projectatomic/libpod/issues/1092 Signed-off-by: Giuseppe Scrivano Closes: #1217 Approved by: rhatdan --- pkg/rootless/rootless_linux.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkg/rootless') diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index d34782171..490ddc33e 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -8,6 +8,7 @@ import ( "os" "os/exec" gosignal "os/signal" + "os/user" "runtime" "strconv" "syscall" @@ -97,6 +98,15 @@ func BecomeRootInUserNS() (bool, int, error) { var uids, gids []idtools.IDMap username := os.Getenv("USER") + if username == "" { + user, err := user.LookupId(fmt.Sprintf("%d", os.Geteuid())) + if err != nil && os.Getenv("PODMAN_ALLOW_SINGLE_ID_MAPPING_IN_USERNS") == "" { + return false, 0, errors.Wrapf(err, "could not find user by UID nor USER env was set") + } + if err == nil { + username = user.Username + } + } mappings, err := idtools.NewIDMappings(username, username) if err != nil && os.Getenv("PODMAN_ALLOW_SINGLE_ID_MAPPING_IN_USERNS") == "" { return false, -1, err -- cgit v1.2.3-54-g00ecf