Skip to content

[v13] Get accessInfo based on user on access request drop #31136

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

Merged
ravicious merged 1 commit into from
Aug 29, 2023
Merged

[v13] Get accessInfo based on user on access request drop #31136

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions integration/teleterm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,13 @@ func testHeadlessWatcher(t *testing.T, pack *dbhelpers.DatabasePack, creds *help
}, time.Second, 100*time.Millisecond)
}

// mustLogin logs in as the given user by completely skipping the actual login flow and saving valid
// certs to disk. clusters.Storage can then be pointed to tc.KeysDir and daemon.Service can act as
// if the user was successfully logged in.
//
// This is faster than going through the actual process, but keep in mind that it might skip some
// vital steps. It should be used only for tests which don't depend on complex user setup and do not
// reissue certs or modify them in some other way.
func mustLogin(t *testing.T, userName string, pack *dbhelpers.DatabasePack, creds *helpers.UserCreds) *client.TeleportClient {
tc, err := pack.Root.Cluster.NewClientWithCreds(helpers.ClientConfig{
Login: userName,
Expand Down
6 changes: 1 addition & 5 deletions lib/auth/auth_with_roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2766,11 +2766,7 @@ func (a *ServerWithRoles) desiredAccessInfoForUser(ctx context.Context, req *pro
// Reset to the base roles and traits stored in the backend user,
// currently active requests (not being dropped) and new access requests
// will be filled in below.
userState, err := a.authServer.getUserOrLoginState(ctx, user.GetName())
if err != nil {
return nil, trace.Wrap(err)
}
accessInfo = services.AccessInfoFromUserState(userState)
accessInfo = services.AccessInfoFromUser(user)

// Check for ["*"] as special case to drop all requests.
if len(req.DropAccessRequests) == 1 && req.DropAccessRequests[0] == "*" {
Expand Down