mirror of
https://github.com/postgres/postgres.git
synced 2025-11-07 19:06:32 +03:00
Revert MAINTAIN privilege and pg_maintain predefined role.
This reverts the following commits:4dbdb82513,c2122aae63,5b1a879943,9e1e9d6560,ff9618e82a,60684dd834,4441fc704d, andb5d6382496. A role with the MAINTAIN privilege may be able to use search_path tricks to escalate privileges to the table owner. Unfortunately, it is too late in the v16 development cycle to apply the proposed fix, i.e., restricting search_path when running maintenance commands. Bumps catversion. Reviewed-by: Jeff Davis Discussion: https://postgr.es/m/E1q7j7Y-000z1H-Hr%40gemulon.postgresql.org Backpatch-through: 16
This commit is contained in:
@@ -332,9 +332,6 @@ aclparse(const char *s, AclItem *aip, Node *escontext)
|
||||
case ACL_ALTER_SYSTEM_CHR:
|
||||
read = ACL_ALTER_SYSTEM;
|
||||
break;
|
||||
case ACL_MAINTAIN_CHR:
|
||||
read = ACL_MAINTAIN;
|
||||
break;
|
||||
case 'R': /* ignore old RULE privileges */
|
||||
read = 0;
|
||||
break;
|
||||
@@ -1626,7 +1623,6 @@ makeaclitem(PG_FUNCTION_ARGS)
|
||||
{"CONNECT", ACL_CONNECT},
|
||||
{"SET", ACL_SET},
|
||||
{"ALTER SYSTEM", ACL_ALTER_SYSTEM},
|
||||
{"MAINTAIN", ACL_MAINTAIN},
|
||||
{"RULE", 0}, /* ignore old RULE privileges */
|
||||
{NULL, 0}
|
||||
};
|
||||
@@ -1735,8 +1731,6 @@ convert_aclright_to_string(int aclright)
|
||||
return "SET";
|
||||
case ACL_ALTER_SYSTEM:
|
||||
return "ALTER SYSTEM";
|
||||
case ACL_MAINTAIN:
|
||||
return "MAINTAIN";
|
||||
default:
|
||||
elog(ERROR, "unrecognized aclright: %d", aclright);
|
||||
return NULL;
|
||||
@@ -2046,8 +2040,6 @@ convert_table_priv_string(text *priv_type_text)
|
||||
{"REFERENCES WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_REFERENCES)},
|
||||
{"TRIGGER", ACL_TRIGGER},
|
||||
{"TRIGGER WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_TRIGGER)},
|
||||
{"MAINTAIN", ACL_MAINTAIN},
|
||||
{"MAINTAIN WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_MAINTAIN)},
|
||||
{"RULE", 0}, /* ignore old RULE privileges */
|
||||
{"RULE WITH GRANT OPTION", 0},
|
||||
{NULL, 0}
|
||||
|
||||
Reference in New Issue
Block a user