netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Internal change.

Browse Source 
PiperOrigin-RevId: 634143543
This commit is contained in:
gVisor bot
2024-05-15 18:16:03 -07:00
parent 341dac1be9
commit 48d0743bfc
2 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fsimpl/user/user.go
+30 -20
View File
@@ -168,6 +168,35 @@ func findUIDGIDInPasswd(passwd io.Reader, user string) (auth.KUID, auth.KGID, er
uid := defaultUID
gid := defaultGID
// Per 'man 5 passwd'
// /etc/passwd contains one line for each user account, with seven
// fields delimited by colons (“:”). These fields are:
//
// - login name
// - optional encrypted password
// - numerical user ID
// - numerical group ID
// - user name or comment field
// - user home directory
// - optional user command interpreter
const (
numFields = 7
userIdx = 0
passwdIdx = 1
uidIdx = 2
gidIdx = 3
shellIdx = 6
)
usergroup := strings.SplitN(user, ":", 2)
uStringOrID := usergroup[0]
// Check if we have a uid or string for user.
idxToMatch := uidIdx
_, err := strconv.Atoi(uStringOrID)
if err != nil {
idxToMatch = userIdx
}
s := bufio.NewScanner(passwd)
for s.Scan() {
if err := s.Err(); err != nil {
@@ -179,25 +208,6 @@ func findUIDGIDInPasswd(passwd io.Reader, user string) (auth.KUID, auth.KGID, er
continue
}
// Per 'man 5 passwd'
// /etc/passwd contains one line for each user account, with seven
// fields delimited by colons (“:”). These fields are:
//
// - login name
// - optional encrypted password
// - numerical user ID
// - numerical group ID
// - user name or comment field
// - user home directory
// - optional user command interpreter
const (
numFields = 7
userIdx = 0
passwdIdx = 1
uidIdx = 2
gidIdx = 3
shellIdx = 6
)
parts := strings.Split(line, ":")
if len(parts) != numFields {
// Return error if the format is invalid.
@@ -215,7 +225,7 @@ func findUIDGIDInPasswd(passwd io.Reader, user string) (auth.KUID, auth.KGID, er
}
}
if parts[userIdx] == user {
if parts[idxToMatch] == uStringOrID {
parseUID, err := strconv.ParseUint(parts[uidIdx], 10, 32)
if err != nil {
return defaultUID, defaultGID, err
pkg/sentry/fsimpl/user/user_test.go
+22 -1
View File
@@ -226,6 +226,27 @@ func TestGetExecUIDGIDFromUser(t *testing.T) {
expectedUID: 1000,
expectedGID: 1111,
},
"success_with_uid_only": {
user: "1000",
passwdContents: "user0::1000:1111:&:/home/user0:/bin/sh",
passwdMode: linux.S_IFREG | 0666,
expectedUID: 1000,
expectedGID: 1111,
},
"success_with_uid_and_gid": {
user: "1000:1111",
passwdContents: "user0::1000:1111:&:/home/user0:/bin/sh",
passwdMode: linux.S_IFREG | 0666,
expectedUID: 1000,
expectedGID: 1111,
},
"success_with_uid_and_wrong_gid": {
user: "1000:1112",
passwdContents: "user0::1000:1111:&:/home/user0:/bin/sh",
passwdMode: linux.S_IFREG | 0666,
expectedUID: 1000,
expectedGID: 1111,
},
"no_user": {
user: "user1",
passwdContents: "user0::1000:1111::/home/user0:/bin/sh",
@@ -296,7 +317,7 @@ func TestGetExecUIDGIDFromUser(t *testing.T) {
}
gotUID, gotGID, err := GetExecUIDGIDFromUser(ctx, mns, tc.user)
if name == "success" {
if strings.HasPrefix(name, "success") {
if err != nil {
t.Fatalf("failed to get UID and GID from user: %v %v", tc.user, err)
}