mirror of
https://github.com/postgres/postgres.git
synced 2025-06-14 18:42:34 +03:00
Reintroduce MAINTAIN privilege and pg_maintain predefined role.
Roles with MAINTAIN on a relation may run VACUUM, ANALYZE, REINDEX, REFRESH MATERIALIZE VIEW, CLUSTER, and LOCK TABLE on the relation. Roles with privileges of pg_maintain may run those same commands on all relations. This was previously committed for v16, but it was reverted in commit151c22deee
due to concerns about search_path tricks that could be used to escalate privileges to the table owner. Commits2af07e2f74
,59825d1639
, andc7ea3f4229
resolved these concerns by restricting search_path when running maintenance commands. Bumps catversion. Reviewed-by: Jeff Davis Discussion: https://postgr.es/m/20240305161235.GA3478007%40nathanxps13
This commit is contained in:
@ -18096,15 +18096,16 @@ AtEOSubXact_on_commit_actions(bool isCommit, SubTransactionId mySubid,
|
||||
* This is intended as a callback for RangeVarGetRelidExtended(). It allows
|
||||
* the relation to be locked only if (1) it's a plain or partitioned table,
|
||||
* materialized view, or TOAST table and (2) the current user is the owner (or
|
||||
* the superuser). This meets the permission-checking needs of CLUSTER,
|
||||
* REINDEX TABLE, and REFRESH MATERIALIZED VIEW; we expose it here so that it
|
||||
* can be used by all.
|
||||
* the superuser) or has been granted MAINTAIN. This meets the
|
||||
* permission-checking needs of CLUSTER, REINDEX TABLE, and REFRESH
|
||||
* MATERIALIZED VIEW; we expose it here so that it can be used by all.
|
||||
*/
|
||||
void
|
||||
RangeVarCallbackOwnsTable(const RangeVar *relation,
|
||||
Oid relId, Oid oldRelId, void *arg)
|
||||
RangeVarCallbackMaintainsTable(const RangeVar *relation,
|
||||
Oid relId, Oid oldRelId, void *arg)
|
||||
{
|
||||
char relkind;
|
||||
AclResult aclresult;
|
||||
|
||||
/* Nothing to do if the relation was not found. */
|
||||
if (!OidIsValid(relId))
|
||||
@ -18125,8 +18126,11 @@ RangeVarCallbackOwnsTable(const RangeVar *relation,
|
||||
errmsg("\"%s\" is not a table or materialized view", relation->relname)));
|
||||
|
||||
/* Check permissions */
|
||||
if (!object_ownercheck(RelationRelationId, relId, GetUserId()))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relId)), relation->relname);
|
||||
aclresult = pg_class_aclcheck(relId, GetUserId(), ACL_MAINTAIN);
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
aclcheck_error(aclresult,
|
||||
get_relkind_objtype(get_rel_relkind(relId)),
|
||||
relation->relname);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user