Move "pkg/user" into libcontainer and add support for GetUserGroupSupplementary to return "Home" too

tianon · tianon · commit e70ad147b6db · 2023-09-16T09:05:22.000-07:00
Docker-DCO-1.1-Signed-off-by: Andrew Page &lt;admwiggin@gmail.com&gt; (github: tianon)
diff --git a/user/user.go b/user/user.go
@@ -165,12 +165,13 @@ func parseGroupFile(r io.Reader, filter func(*Group) bool) ([]*Group, error) {
 	return out, nil
 }
 
-// Given a string like "user", "1000", "user:group", "1000:1000", returns the uid, gid, and list of supplementary group IDs, if possible.
-func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int) (int, int, []int, error) {
+// Given a string like "user", "1000", "user:group", "1000:1000", returns the uid, gid, list of supplementary group IDs, and home directory, if available and/or applicable.
+func GetUserGroupSupplementaryHome(userSpec string, defaultUid, defaultGid int, defaultHome string) (int, int, []int, string, error) {
 	var (
 		uid      = defaultUid
 		gid      = defaultGid
 		suppGids = []int{}
+		home     = defaultHome
 
 		userArg, groupArg string
 	)
@@ -188,23 +189,24 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)
 		if userArg == "" {
 			userArg = strconv.Itoa(uid)
 		}
-		return 0, 0, nil, fmt.Errorf("Unable to find user %v: %v", userArg, err)
+		return 0, 0, nil, "", fmt.Errorf("Unable to find user %v: %v", userArg, err)
 	}
 
 	haveUser := users != nil && len(users) > 0
 	if haveUser {
 		// if we found any user entries that matched our filter, let's take the first one as "correct"
 		uid = users[0].Uid
 		gid = users[0].Gid
+		home = users[0].Home
 	} else if userArg != "" {
 		// we asked for a user but didn't find them...  let's check to see if we wanted a numeric user
 		uid, err = strconv.Atoi(userArg)
 		if err != nil {
 			// not numeric - we have to bail
-			return 0, 0, nil, fmt.Errorf("Unable to find user %v", userArg)
+			return 0, 0, nil, "", fmt.Errorf("Unable to find user %v", userArg)
 		}
 		if uid < minId || uid > maxId {
-			return 0, 0, nil, ErrRange
+			return 0, 0, nil, "", ErrRange
 		}
 
 		// if userArg couldn't be found in /etc/passwd but is numeric, just roll with it - this is legit
@@ -223,7 +225,7 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)
 			return false
 		})
 		if err != nil && !os.IsNotExist(err) {
-			return 0, 0, nil, fmt.Errorf("Unable to find groups for user %v: %v", users[0].Name, err)
+			return 0, 0, nil, "", fmt.Errorf("Unable to find groups for user %v: %v", users[0].Name, err)
 		}
 
 		haveGroup := groups != nil && len(groups) > 0
@@ -236,10 +238,10 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)
 				gid, err = strconv.Atoi(groupArg)
 				if err != nil {
 					// not numeric - we have to bail
-					return 0, 0, nil, fmt.Errorf("Unable to find group %v", groupArg)
+					return 0, 0, nil, "", fmt.Errorf("Unable to find group %v", groupArg)
 				}
 				if gid < minId || gid > maxId {
-					return 0, 0, nil, ErrRange
+					return 0, 0, nil, "", ErrRange
 				}
 
 				// if groupArg couldn't be found in /etc/group but is numeric, just roll with it - this is legit
@@ -252,5 +254,5 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)
 		}
 	}
 
-	return uid, gid, suppGids, nil
+	return uid, gid, suppGids, home, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,13 @@ func parseGroupFile(r io.Reader, filter func(Group) bool) ([]Group, error) {`
`165`	`165`	`return out, nil`
`166`	`166`	`}`
`167`	`167`
`168`		`-// Given a string like "user", "1000", "user:group", "1000:1000", returns the uid, gid, and list of supplementary group IDs, if possible.`
`169`		`-func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int) (int, int, []int, error) {`
	`168`	`+// Given a string like "user", "1000", "user:group", "1000:1000", returns the uid, gid, list of supplementary group IDs, and home directory, if available and/or applicable.`
	`169`	`+func GetUserGroupSupplementaryHome(userSpec string, defaultUid, defaultGid int, defaultHome string) (int, int, []int, string, error) {`
`170`	`170`	`var (`
`171`	`171`	`uid = defaultUid`
`172`	`172`	`gid = defaultGid`
`173`	`173`	`suppGids = []int{}`
	`174`	`+ home = defaultHome`
`174`	`175`
`175`	`176`	`userArg, groupArg string`
`176`	`177`	`)`
`@@ -188,23 +189,24 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)`
`188`	`189`	`if userArg == "" {`
`189`	`190`	`userArg = strconv.Itoa(uid)`
`190`	`191`	`}`
`191`		`- return 0, 0, nil, fmt.Errorf("Unable to find user %v: %v", userArg, err)`
	`192`	`+ return 0, 0, nil, "", fmt.Errorf("Unable to find user %v: %v", userArg, err)`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`haveUser := users != nil && len(users) > 0`
`195`	`196`	`if haveUser {`
`196`	`197`	`// if we found any user entries that matched our filter, let's take the first one as "correct"`
`197`	`198`	`uid = users[0].Uid`
`198`	`199`	`gid = users[0].Gid`
	`200`	`+ home = users[0].Home`
`199`	`201`	`} else if userArg != "" {`
`200`	`202`	`// we asked for a user but didn't find them... let's check to see if we wanted a numeric user`
`201`	`203`	`uid, err = strconv.Atoi(userArg)`
`202`	`204`	`if err != nil {`
`203`	`205`	`// not numeric - we have to bail`
`204`		`- return 0, 0, nil, fmt.Errorf("Unable to find user %v", userArg)`
	`206`	`+ return 0, 0, nil, "", fmt.Errorf("Unable to find user %v", userArg)`
`205`	`207`	`}`
`206`	`208`	`if uid < minId \|\| uid > maxId {`
`207`		`- return 0, 0, nil, ErrRange`
	`209`	`+ return 0, 0, nil, "", ErrRange`
`208`	`210`	`}`
`209`	`211`
`210`	`212`	`// if userArg couldn't be found in /etc/passwd but is numeric, just roll with it - this is legit`
`@@ -223,7 +225,7 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)`
`223`	`225`	`return false`
`224`	`226`	`})`
`225`	`227`	`if err != nil && !os.IsNotExist(err) {`
`226`		`- return 0, 0, nil, fmt.Errorf("Unable to find groups for user %v: %v", users[0].Name, err)`
	`228`	`+ return 0, 0, nil, "", fmt.Errorf("Unable to find groups for user %v: %v", users[0].Name, err)`
`227`	`229`	`}`
`228`	`230`
`229`	`231`	`haveGroup := groups != nil && len(groups) > 0`
`@@ -236,10 +238,10 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)`
`236`	`238`	`gid, err = strconv.Atoi(groupArg)`
`237`	`239`	`if err != nil {`
`238`	`240`	`// not numeric - we have to bail`
`239`		`- return 0, 0, nil, fmt.Errorf("Unable to find group %v", groupArg)`
	`241`	`+ return 0, 0, nil, "", fmt.Errorf("Unable to find group %v", groupArg)`
`240`	`242`	`}`
`241`	`243`	`if gid < minId \|\| gid > maxId {`
`242`		`- return 0, 0, nil, ErrRange`
	`244`	`+ return 0, 0, nil, "", ErrRange`
`243`	`245`	`}`
`244`	`246`
`245`	`247`	`// if groupArg couldn't be found in /etc/group but is numeric, just roll with it - this is legit`
`@@ -252,5 +254,5 @@ func GetUserGroupSupplementary(userSpec string, defaultUid int, defaultGid int)`
`252`	`254`	`}`
`253`	`255`	`}`
`254`	`256`
`255`		`- return uid, gid, suppGids, nil`
	`257`	`+ return uid, gid, suppGids, home, nil`
`256`	`258`	`}`