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

release-24.1: sql: Drop Role does not properly check if target user does not exist #134968

Merged
merged 2 commits into from
Nov 12, 2024
Merged

release-24.1: sql: Drop Role does not properly check if target user does not exist #134968

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eae815
sql: Drop Role does not properly check if target user does not exist
Dedej-Bergin Nov 11, 2024
8254308
sql: avoid role existence check in DROP ROLE when it's not necessary
rafiss Nov 12, 2024
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
11 changes: 11 additions & 0 deletions pkg/sql/drop_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,18 @@ func (n *DropRoleNode) startExec(params runParams) error {
if name.IsReserved() {
return pgerror.Newf(pgcode.ReservedName, "role name %q is reserved", name.Normalized())
}

// Non-admin users cannot drop admins.
if !hasAdmin {
roleExists, err := RoleExists(params.ctx, params.p.InternalSQLTxn(), name)
if err != nil {
return err
}
if !roleExists {
// If the role does not exist, we can skip the check for targetIsAdmin.
continue
}

targetIsAdmin, err := params.p.UserHasAdminRole(params.ctx, name)
if err != nil {
return err
Expand All @@ -113,6 +123,7 @@ func (n *DropRoleNode) startExec(params runParams) error {
return pgerror.New(pgcode.InsufficientPrivilege, "must be superuser to drop superusers")
}
}

}

privilegeObjectFormatter := tree.NewFmtCtx(tree.FmtSimple)
Expand Down
24 changes: 24 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/drop_role_with_default_privileges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,27 @@ ALTER DEFAULT PRIVILEGES FOR ALL ROLES IN SCHEMA public REVOKE ALL ON SEQUENCES

statement ok
DROP ROLE testuser4;

subtest fix_for_regression_bug_134538

statement ok
CREATE USER not_admin WITH PASSWORD '123';
GRANT SYSTEM CREATEROLE TO not_admin;
SET ROLE not_admin;

statement error pq: role/user "a_user_that_does_not_exist" does not exist
DROP USER a_user_that_does_not_exist;

statement ok
DROP USER IF EXISTS a_user_that_does_not_exist;

statement ok
SET ROLE admin;

statement error pq: role/user "a_user_that_does_not_exist" does not exist
DROP USER a_user_that_does_not_exist;

statement ok
DROP USER IF EXISTS a_user_that_does_not_exist;

subtest end