Skip to content

ingesting: fixup privileges granted during database restore #95466

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
merged 1 commit into from
Jan 19, 2023
Merged

ingesting: fixup privileges granted during database restore #95466

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
10 changes: 8 additions & 2 deletions pkg/ccl/backupccl/testdata/backup-restore/restore-grants
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,8 @@ query-sql
SHOW GRANTS ON SCHEMA testdb.public
----
testdb public admin ALL true
testdb public public CREATE false
testdb public public USAGE false
testdb public root ALL true

query-sql
Expand Down Expand Up @@ -554,8 +556,9 @@ query-sql
SHOW GRANTS ON SCHEMA testdb.public
----
testdb public admin ALL true
testdb public public CREATE false
testdb public public USAGE false
testdb public root ALL true
testdb public testuser ALL true

query-sql
SHOW GRANTS ON testdb.sc.othertable
Expand Down Expand Up @@ -603,10 +606,13 @@ SELECT owner FROM [SHOW SCHEMAS] WHERE schema_name = 'sc'
----
testuser

# In postgres, the user "postgres" is the owner of the public schema in a
# newly created db. In CockroachDB, admin is our substitute for the postgres
# user.
query-sql
SELECT owner FROM [SHOW SCHEMAS] WHERE schema_name = 'public'
----
testuser
admin

# Ensure that testuser is the owner of the type.
query-sql
Expand Down
27 changes: 18 additions & 9 deletions pkg/sql/catalog/ingesting/privileges.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,26 @@ func getIngestingPrivilegesForTableOrSchema(
descCoverage tree.DescriptorCoverage,
privilegeType privilege.ObjectType,
) (updatedPrivileges *catpb.PrivilegeDescriptor, err error) {
if wrote, ok := wroteDBs[desc.GetParentID()]; ok {
// If we're creating a new database in this ingestion, the privileges of the
// table and schema should be that of the parent DB.
//
// Leave the privileges of the temp system tables as the default too.
updatedPrivileges = wrote.GetPrivileges()
for i, u := range updatedPrivileges.Users {
updatedPrivileges.Users[i].Privileges =
privilege.ListFromBitField(u.Privileges, privilegeType).ToBitField()
if _, ok := wroteDBs[desc.GetParentID()]; ok {
// If we're creating a new database in this ingestion, the tables and
// schemas in the database should be assigned the default privileges that
// are granted on object creation.
switch privilegeType {
case privilege.Schema:
if desc.GetName() == tree.PublicSchema {
updatedPrivileges = catpb.NewPublicSchemaPrivilegeDescriptor()
} else {
updatedPrivileges = catpb.NewBasePrivilegeDescriptor(user)
}
case privilege.Table:
updatedPrivileges = catpb.NewBasePrivilegeDescriptor(user)
default:
return nil, errors.Newf("unexpected privilege type %T", privilegeType)
}
} else if descCoverage == tree.RequestedDescriptors {
// If we are not creating the database as part of this ingestion, the
// schemas and tables in the database should be given privileges based on
// the parent database's default privileges.
parentDB, err := descsCol.ByID(txn).Get().Database(ctx, desc.GetParentID())
if err != nil {
return nil, errors.Wrapf(err, "failed to lookup parent DB %d", errors.Safe(desc.GetParentID()))
Expand Down