Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

daemon: do not hardcode UID in userLookup #2080

Merged
merged 1 commit into from
Oct 4, 2016
Merged

daemon: do not hardcode UID in userLookup #2080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 18 additions & 36 deletions daemon/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3737,6 +3737,20 @@ func (s *apiSuite) TestPostCreateUserNoSSHKeys(c *check.C) {
c.Check(rsp.Result.(*errorResult).Message, check.Matches, `cannot create user for "popper@lse.ac.uk": no ssh keys found`)
}

func makeFakeUserLookup(c *check.C, fakeHome string) func(username string) (*user.User, error) {
u, err := user.Current()
c.Assert(err, check.IsNil)

return func(username string) (*user.User, error) {
return &user.User{
Username: username,
Uid: u.Uid,
Gid: u.Gid,
HomeDir: fakeHome,
}, nil
}
}

func (s *apiSuite) TestPostCreateUser(c *check.C) {
d := s.daemon(c)

Expand All @@ -3756,15 +3770,7 @@ func (s *apiSuite) TestPostCreateUser(c *check.C) {
return nil
}
userHomeDir := c.MkDir()
userLookup = func(username string) (*user.User, error) {
return &user.User{
Username: username,
Uid: "1000",
Gid: "1000",
HomeDir: userHomeDir,
}, nil
}

userLookup = makeFakeUserLookup(c, userHomeDir)
postCreateUserUcrednetGetUID = func(string) (uint32, error) {
return 0, nil
}
Expand Down Expand Up @@ -4074,15 +4080,7 @@ func (s *apiSuite) TestPostCreateUserFromAssertion(c *check.C) {
return nil
}

userLookup = func(username string) (*user.User, error) {
return &user.User{
Username: username,
Uid: "1000",
Gid: "1000",
HomeDir: c.MkDir(),
}, nil
}

userLookup = makeFakeUserLookup(c, c.MkDir())
postCreateUserUcrednetGetUID = func(string) (uint32, error) {
return 0, nil
}
Expand Down Expand Up @@ -4148,15 +4146,7 @@ func (s *apiSuite) TestPostCreateUserFromAssertionAllKnown(c *check.C) {
return nil
}

userLookup = func(username string) (*user.User, error) {
return &user.User{
Username: username,
Uid: "1000",
Gid: "1000",
HomeDir: c.MkDir(),
}, nil
}

userLookup = makeFakeUserLookup(c, c.MkDir())
postCreateUserUcrednetGetUID = func(string) (uint32, error) {
return 0, nil
}
Expand Down Expand Up @@ -4262,15 +4252,7 @@ func (s *apiSuite) TestPostCreateUserFromAssertionAllKnownButOwned(c *check.C) {
return nil
}

userLookup = func(username string) (*user.User, error) {
return &user.User{
Username: username,
Uid: "1000",
Gid: "1000",
HomeDir: c.MkDir(),
}, nil
}

userLookup = makeFakeUserLookup(c, c.MkDir())
defer func() {
osutilAddUser = osutil.AddUser
postCreateUserUcrednetGetUID = ucrednetGetUID
Expand Down