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

server: fix UserSQLRoles to account for global privileges #95258

Merged
merged 1 commit into from
Jan 18, 2023
Merged

server: fix UserSQLRoles to account for global privileges #95258

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
17 changes: 14 additions & 3 deletions pkg/server/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"context"

"github.com/cockroachdb/cockroach/pkg/server/serverpb"
"github.com/cockroachdb/cockroach/pkg/sql/privilege"
"github.com/cockroachdb/cockroach/pkg/sql/roleoption"
)

Expand All @@ -31,13 +32,23 @@ func (s *baseStatusServer) UserSQLRoles(

var resp serverpb.UserSQLRolesResponse
if !isAdmin {
for name := range roleoption.ByName {
hasRole, err := s.privilegeChecker.hasRoleOption(ctx, username, roleoption.ByName[name])
for _, privKind := range privilege.GlobalPrivileges {
privName := privKind.String()
hasPriv := s.privilegeChecker.checkHasGlobalPrivilege(ctx, username, privKind)
if hasPriv {
resp.Roles = append(resp.Roles, privName)
continue
}
roleOpt, ok := roleoption.ByName[privName]
if !ok {
continue
}
hasRole, err := s.privilegeChecker.hasRoleOption(ctx, username, roleOpt)
if err != nil {
return nil, err
}
if hasRole {
resp.Roles = append(resp.Roles, name)
resp.Roles = append(resp.Roles, privName)
}
}
} else {
Expand Down
25 changes: 14 additions & 11 deletions pkg/server/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,33 +87,36 @@ func TestSQLRolesAPI(t *testing.T) {
expRoles := []string{"ADMIN"}
err := getStatusJSONProtoWithAdminOption(s, "sqlroles", &res, true)
require.NoError(t, err)
require.Equal(t, expRoles, res.Roles)
require.ElementsMatch(t, expRoles, res.Roles)

// No roles added to a non-admin user.
expRoles = []string{}
err = getStatusJSONProtoWithAdminOption(s, "sqlroles", &res, false)
require.NoError(t, err)
require.Equal(t, expRoles, res.Roles)
require.ElementsMatch(t, expRoles, res.Roles)

// One role added to the non-admin user.
// Role option and global privilege added to the non-admin user.
db.Exec(t, fmt.Sprintf("ALTER USER %s VIEWACTIVITY", authenticatedUserNameNoAdmin().Normalized()))
expRoles = []string{"VIEWACTIVITY"}
db.Exec(t, fmt.Sprintf("GRANT SYSTEM MODIFYCLUSTERSETTING TO %s", authenticatedUserNameNoAdmin().Normalized()))
expRoles = []string{"MODIFYCLUSTERSETTING", "VIEWACTIVITY"}
err = getStatusJSONProtoWithAdminOption(s, "sqlroles", &res, false)
require.NoError(t, err)
require.Equal(t, expRoles, res.Roles)
require.ElementsMatch(t, expRoles, res.Roles)

// Two roles added to the non-admin user.
// Two role options and two global privileges added to the non-admin user.
db.Exec(t, fmt.Sprintf("ALTER USER %s VIEWACTIVITYREDACTED", authenticatedUserNameNoAdmin().Normalized()))
expRoles = []string{"VIEWACTIVITY", "VIEWACTIVITYREDACTED"}
db.Exec(t, fmt.Sprintf("GRANT SYSTEM CANCELQUERY TO %s", authenticatedUserNameNoAdmin().Normalized()))
expRoles = []string{"CANCELQUERY", "MODIFYCLUSTERSETTING", "VIEWACTIVITY", "VIEWACTIVITYREDACTED"}
err = getStatusJSONProtoWithAdminOption(s, "sqlroles", &res, false)
sort.Strings(res.Roles)
require.NoError(t, err)
require.Equal(t, expRoles, res.Roles)
require.ElementsMatch(t, expRoles, res.Roles)

// Remove one role from non-admin user.
// Remove one role option and one global privilege from non-admin user.
db.Exec(t, fmt.Sprintf("ALTER USER %s NOVIEWACTIVITY", authenticatedUserNameNoAdmin().Normalized()))
expRoles = []string{"VIEWACTIVITYREDACTED"}
db.Exec(t, fmt.Sprintf("REVOKE SYSTEM MODIFYCLUSTERSETTING FROM %s", authenticatedUserNameNoAdmin().Normalized()))
expRoles = []string{"CANCELQUERY", "VIEWACTIVITYREDACTED"}
err = getStatusJSONProtoWithAdminOption(s, "sqlroles", &res, false)
require.NoError(t, err)
require.Equal(t, expRoles, res.Roles)
require.ElementsMatch(t, expRoles, res.Roles)
}