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.2: scbuild: fix unhandled case during DROP SCHEMA #135180

Merged
merged 1 commit into from
Nov 15, 2024
Merged

release-24.2: scbuild: fix unhandled case during DROP SCHEMA #135180

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
16 changes: 8 additions & 8 deletions pkg/sql/drop_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ func (p *planner) DropSchema(ctx context.Context, n *tree.DropSchema) (planNode,
}
return nil, pgerror.Newf(pgcode.InvalidSchemaName, "unknown schema %q", scName)
}
hasOwnership, err := p.HasOwnership(ctx, sc)
if err != nil {
return nil, err
}
if !hasOwnership {
return nil, pgerror.Newf(pgcode.InsufficientPrivilege,
"must be owner of schema %s", tree.Name(sc.GetName()))
}

if scName == catconstants.PublicSchemaName {
return nil, pgerror.Newf(pgcode.InvalidSchemaName, "cannot drop schema %q", scName)
Expand All @@ -79,14 +87,6 @@ func (p *planner) DropSchema(ctx context.Context, n *tree.DropSchema) (planNode,
case catalog.SchemaPublic, catalog.SchemaVirtual, catalog.SchemaTemporary:
return nil, pgerror.Newf(pgcode.InvalidSchemaName, "cannot drop schema %q", scName)
case catalog.SchemaUserDefined:
hasOwnership, err := p.HasOwnership(ctx, sc)
if err != nil {
return nil, err
}
if !hasOwnership {
return nil, pgerror.Newf(pgcode.InsufficientPrivilege,
"must be owner of schema %s", tree.Name(sc.GetName()))
}
namesBefore := len(d.objectNamesToDelete)
fnsBefore := len(d.functionsToDelete)
if err := d.collectObjectsInSchema(ctx, p, db, sc); err != nil {
Expand Down
19 changes: 19 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/drop_schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,22 @@ BEGIN;
ALTER TYPE schema_123539.enum_123539 DROP VALUE 's';
DROP SCHEMA schema_123539 CASCADE;
COMMIT;

# Check that we block dropping the public schema of the system database, as
# well as virtual schemas.

statement error must be owner of schema public
DROP SCHEMA system.public

statement error must be owner of schema pg_catalog
DROP SCHEMA pg_catalog

user testuser

statement error must be owner of schema public
DROP SCHEMA system.public

statement error must be owner of schema crdb_internal
DROP SCHEMA crdb_internal

user root
16 changes: 13 additions & 3 deletions pkg/sql/schemachanger/scbuild/builder_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (b *builderState) mustOwn(id catid.DescID) {
b.ensureDescriptor(id)
if c := b.descCache[id]; !c.hasOwnership {
panic(pgerror.Newf(pgcode.InsufficientPrivilege,
"must be owner of %s %s", c.desc.DescriptorType(), c.desc.GetName()))
"must be owner of %s %s", c.desc.DescriptorType(), tree.Name(c.desc.GetName())))
}
}

Expand Down Expand Up @@ -962,8 +962,18 @@ func (b *builderState) checkOwnershipOrPrivilegesOnSchemaDesc(
case catalog.SchemaTemporary:
// Nothing needs to be done.
case catalog.SchemaPublic, catalog.SchemaVirtual:
panic(pgerror.Newf(pgcode.InsufficientPrivilege,
"%s permission denied for schema %q", p.RequiredPrivilege.DisplayName(), name))
if p.RequireOwnership {
if ok, err := b.auth.HasOwnership(b.ctx, sc); err != nil {
panic(err)
} else if !ok {
panic(pgerror.Newf(pgcode.InsufficientPrivilege,
"must be owner of schema %s", tree.Name(name.Schema())))
}
} else {
if err := b.auth.CheckPrivilege(b.ctx, sc, p.RequiredPrivilege); err != nil {
panic(err)
}
}
case catalog.SchemaUserDefined:
b.ensureDescriptor(sc.GetID())
if p.RequireOwnership {
Expand Down