public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove fallbackToUID bool option from Kaniko code (#2767)

This commit is contained in:
Vishal Khot 2023-10-03 06:06:15 +05:30 committed by GitHub
parent 113508c684
commit 2a1b29a9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/util/command_util.go
View File

@ -355,7 +355,7 @@ func GetUserGroup(chownStr string, env []string) (int64, int64, error) {
return -1, -1, err
}
uid32, gid32, err := getUIDAndGIDFromString(chown, true)
uid32, gid32, err := getUIDAndGIDFromString(chown)
if err != nil {
return -1, -1, err
}
@ -364,20 +364,18 @@ func GetUserGroup(chownStr string, env []string) (int64, int64, error) {
}
// Extract user and group id from a string formatted 'user:group'.
// If fallbackToUID is set, the gid is equal to uid if the group is not specified
// otherwise gid is set to zero.
// UserID and GroupID don't need to be present on the system.
func getUIDAndGIDFromString(userGroupString string, fallbackToUID bool) (uint32, uint32, error) {
func getUIDAndGIDFromString(userGroupString string) (uint32, uint32, error) {
userAndGroup := strings.Split(userGroupString, ":")
userStr := userAndGroup[0]
var groupStr string
if len(userAndGroup) > 1 {
groupStr = userAndGroup[1]
}
return getUIDAndGIDFunc(userStr, groupStr, fallbackToUID)
return getUIDAndGIDFunc(userStr, groupStr)
}
func getUIDAndGID(userStr string, groupStr string, fallbackToUID bool) (uint32, uint32, error) {
func getUIDAndGID(userStr string, groupStr string) (uint32, uint32, error) {
user, err := LookupUser(userStr)
if err != nil {
return 0, 0, err
@ -398,11 +396,7 @@ func getUIDAndGID(userStr string, groupStr string, fallbackToUID bool) (uint32,
return uid32, gid32, nil
}
if fallbackToUID {
return uid32, uid32, nil
}
return uid32, 0, nil
return uid32, uid32, nil
}
// getGID tries to parse the gid

42
pkg/util/command_util_test.go
View File

@ -526,7 +526,7 @@ func TestGetUserGroup(t *testing.T) {
description string
chown string
env []string
mockIDGetter func(userStr string, groupStr string, fallbackToUID bool) (uint32, uint32, error)
mockIDGetter func(userStr string, groupStr string) (uint32, uint32, error)
// needed, in case uid is a valid number, but group is a name
mockGroupIDGetter func(groupStr string) (*user.Group, error)
expectedU int64
@ -537,7 +537,7 @@ func TestGetUserGroup(t *testing.T) {
description: "non empty chown",
chown: "some:some",
env: []string{},
mockIDGetter: func(string, string, bool) (uint32, uint32, error) {
mockIDGetter: func(string, string) (uint32, uint32, error) {
return 100, 1000, nil
},
expectedU: 100,
@ -547,7 +547,7 @@ func TestGetUserGroup(t *testing.T) {
description: "non empty chown with env replacement",
chown: "some:$foo",
env: []string{"foo=key"},
mockIDGetter: func(userStr string, groupStr string, fallbackToUID bool) (uint32, uint32, error) {
mockIDGetter: func(userStr string, groupStr string) (uint32, uint32, error) {
if userStr == "some" && groupStr == "key" {
return 10, 100, nil
}
@ -558,7 +558,7 @@ func TestGetUserGroup(t *testing.T) {
},
{
description: "empty chown string",
mockIDGetter: func(string, string, bool) (uint32, uint32, error) {
mockIDGetter: func(string, string) (uint32, uint32, error) {
return 0, 0, fmt.Errorf("should not be called")
},
expectedU: -1,
@ -638,8 +638,7 @@ func Test_GetUIDAndGIDFromString(t *testing.T) {
currentUser := testutil.GetCurrentUser(t)
type args struct {
userGroupStr string
fallbackToUID bool
userGroupStr string
}
type expected struct {
@ -709,18 +708,9 @@ func Test_GetUIDAndGIDFromString(t *testing.T) {
},
},
{
testname: "uid and non existing group-name with fallbackToUID",
testname: "uid and non existing group-name",
args: args{
userGroupStr: fmt.Sprintf("%d:%s", 1001, "hello-world-group"),
fallbackToUID: true,
},
wantErr: true,
},
{
testname: "uid and non existing group-name without fallbackToUID",
args: args{
userGroupStr: fmt.Sprintf("%d:%s", 1001, "hello-world-group"),
fallbackToUID: false,
userGroupStr: fmt.Sprintf("%d:%s", 1001, "hello-world-group"),
},
wantErr: true,
},
@ -735,21 +725,9 @@ func Test_GetUIDAndGIDFromString(t *testing.T) {
},
},
{
testname: "only uid and fallback is false",
testname: "only uid",
args: args{
userGroupStr: fmt.Sprintf("%d", currentUserUID),
fallbackToUID: false,
},
expected: expected{
userID: expectedCurrentUser.userID,
groupID: 0,
},
},
{
testname: "only uid and fallback is true",
args: args{
userGroupStr: fmt.Sprintf("%d", currentUserUID),
fallbackToUID: true,
userGroupStr: fmt.Sprintf("%d", currentUserUID),
},
expected: expected{
userID: expectedCurrentUser.userID,
@ -765,7 +743,7 @@ func Test_GetUIDAndGIDFromString(t *testing.T) {
},
}
for _, tt := range testCases {
uid, gid, err := getUIDAndGIDFromString(tt.args.userGroupStr, tt.args.fallbackToUID)
uid, gid, err := getUIDAndGIDFromString(tt.args.userGroupStr)
testutil.CheckError(t, tt.wantErr, err)
if uid != tt.expected.userID || gid != tt.expected.groupID {
t.Errorf("%v failed. Could not correctly decode %s to uid/gid %d:%d. Result: %d:%d",

2
pkg/util/syscall_credentials.go
View File

@ -27,7 +27,7 @@ import (
)
func SyscallCredentials(userStr string) (*syscall.Credential, error) {
uid, gid, err := getUIDAndGIDFromString(userStr, true)
uid, gid, err := getUIDAndGIDFromString(userStr)
if err != nil {
return nil, errors.Wrap(err, "get uid/gid")
}