Skip to content

[v9] Gracefully degrade tsh db ls in case fetching roles fails. (#12318) #12320

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.

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
merged 4 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion tool/tsh/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func onListDatabases(cf *CLIConf) error {

roleSet, err := services.FetchRoles(profile.Roles, cluster, profile.Traits)
if err != nil {
return trace.Wrap(err)
log.Debugf("Failed to fetch user roles: %v.", err)
}

sort.Slice(databases, func(i, j int) bool {
Expand Down
4 changes: 4 additions & 0 deletions tool/tsh/tsh.go
Original file line number Diff line number Diff line change
Expand Up @@ -1658,6 +1658,10 @@ func showAppsAsText(apps []types.Application, active []tlsca.RouteToApp, verbose
}

func getUsersForDb(database types.Database, roleSet services.RoleSet) string {
// may happen if fetching the role set failed for any reason.
if roleSet == nil {
return "(unknown)"
}
dbUsers := roleSet.EnumerateDatabaseUsers(database)
allowed := dbUsers.Allowed()

Expand Down
10 changes: 6 additions & 4 deletions tool/tsh/tsh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1525,34 +1525,36 @@ func Test_getUsersForDb(t *testing.T) {
database: dbProd,
result: "[dev]",
},

{
name: "roleDevStage x dbStage",
roles: services.RoleSet{roleDevStage},
database: dbStage,
result: "[*], except: [superuser]",
},

{
name: "roleDevStage x dbProd",
roles: services.RoleSet{roleDevStage},
database: dbProd,
result: "(none)",
},

{
name: "roleDevProd x dbStage",
roles: services.RoleSet{roleDevProd},
database: dbStage,
result: "(none)",
},

{
name: "roleDevProd x dbProd",
roles: services.RoleSet{roleDevProd},
database: dbProd,
result: "[dev]",
},
{
name: "no role set",
roles: nil,
database: dbProd,
result: "(unknown)",
},
}

for _, tc := range testCases {
Expand Down