external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Review changes for pg16 update GRANT and REVOKE

pg16_grant_inherit_set
Jodi-Ann Francis 2023-09-07 12:12:16 -04:00 committed by francisjodi
parent 62e0d0d01b
commit d7761b3158
3 changed files with 38 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/distributed/commands/role.c
View File

@ -883,18 +883,6 @@ GenerateGrantRoleStmtsOfRole(Oid roleid)
DefElem *set_opt = makeDefElem("set", (Node *) makeBoolean(true), -1); DefElem *set_opt = makeDefElem("set", (Node *) makeBoolean(true), -1);
grantRoleStmt->opt = list_make3(opt, inherit_opt, set_opt); grantRoleStmt->opt = list_make3(opt, inherit_opt, set_opt);
} }
if (membership->inherit_option)
{
DefElem *opt = makeDefElem("inherit", (Node *) makeBoolean(true), -1);
grantRoleStmt->opt = lappend(grantRoleStmt->opt, opt);
}
if (membership->set_option)
{
DefElem *opt = makeDefElem("set", (Node *) makeBoolean(true), -1);
grantRoleStmt->opt = lappend(grantRoleStmt->opt, opt);
}
#else #else
grantRoleStmt->admin_opt = membership->admin_option; grantRoleStmt->admin_opt = membership->admin_option;
#endif #endif

41
src/backend/distributed/deparser/deparse_role_stmts.c
View File

@ -409,16 +409,28 @@ AppendRevokeAdminOptionFor(StringInfo buf, GrantRoleStmt *stmt)
{ {
switch (opt->defname) switch (opt->defname)
{ {
case "admin":
appendStringInfo(buf, "ADMIN OPTION FOR "); appendStringInfo(buf, "ADMIN OPTION FOR ");
} opt_count++;
else if (strcmp(opt->defname, "inherit") == 0); break;
case "inherit":
if (opt_count > 0)
{ {
appendStringInfo(buf, "INHERIT TRUE"); appendStringInfo(buf, ", ");
appendStringInfo(buf, "GRANT x TO y WITH INHERIT TRUE, SET TRUE;");
} }
else if (strcmp(opt->defname, "set") == 0) appendStringInfo(buf, "INHERIT OPTION FOR ");
opt_count++;
break;
case "set":
if (opt_count > 0)
{ {
appendStringInfo(buf, "SET TRUE"); appendStringInfo(buf, ", ");
}
appendStringInfo(buf, "SET OPTION FOR ");
opt_count++;
break;
} }
} }
} }
@ -438,14 +450,23 @@ AppendGrantWithAdminOption(StringInfo buf, GrantRoleStmt *stmt)
{ {
#if PG_VERSION_NUM >= PG_VERSION_16 #if PG_VERSION_NUM >= PG_VERSION_16
DefElem *opt = NULL; DefElem *opt = NULL;
int opt_count = 0;
foreach_ptr(opt, stmt->opt) foreach_ptr(opt, stmt->opt)
{ {
bool admin_option = false; switch (opt->defname)
char *optval = defGetString(opt);
if (strcmp(opt->defname, "admin") == 0 &&
parse_bool(optval, &admin_option) && admin_option)
{ {
case "admin":
appendStringInfo(buf, " WITH ADMIN OPTION"); appendStringInfo(buf, " WITH ADMIN OPTION");
opt_count++;
break;
case "inherit":
if (opt_count > 0)
{
appendStringInfo(buf, ", ");
}
appendStringInfo(buf, "INHERIT OPTION ");
opt_count++;
break; break;

35
src/test/regress/sql/pg16.sql
View File

@ -914,38 +914,3 @@ GRANT SET SESSION AUTHORIZATION TO role_name;
SELECT * FROM table_name WHERE column_name = 'value'; SELECT * FROM table_name WHERE column_name = 'value';
SELECT COUNT(*) FROM table_name WHERE column_name = 'value'; SELECT COUNT(*) FROM table_name WHERE column_name = 'value';
--
-- PG16 allows GRANT WITH ADMIN | INHERIT | SET
--
-- GRANT privileges to a role or roles
\c - - - :master_port
CREATE ROLE create_role;
CREATE ROLE create_role_2;
CREATE ROLE create_role_3;
CREATE ROLE create_role_4;
CREATE USER create_user;
CREATE USER create_user_2;
CREATE GROUP create_group;
CREATE GROUP create_group_2;
--test grant role
GRANT create_group TO create_role;
GRANT create_group TO create_role_2 WITH ADMIN OPTION;
GRANT create_group TO create_role_3 WITH INHERIT;
GRANT create_group TO create_role_4 WITH SET;
-- ADMIN role can perfom administrative tasks
-- role can now access the data and permissions of the table (owner of table)
-- role can change current user to any other user/role that has access
GRANT ADMIN TO joe;
GRANT INHERIT ON ROLE joe TO james;
GRANT SELECT ON companies TO joe WITH GRANT OPTION;
GRANT SET (SELECT) ON companies TO james;
\set VERBOSITY terse
SET client_min_messages TO ERROR;
DROP SCHEMA pg16 CASCADE;