Skip to content

Commit 2346130

Browse files
kelvichtristan957
authored andcommitted
Fix regression tests after the patch with CREATEROLE restrictions
1 parent af2fc2d commit 2346130

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/test/regress/expected/privileges.out

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,8 @@ REFRESH MATERIALIZED VIEW sro_mv;
15591559
ERROR: cannot fire deferred trigger within security-restricted operation
15601560
CONTEXT: SQL function "mv_action" statement 1
15611561
BEGIN; SET CONSTRAINTS ALL IMMEDIATE; REFRESH MATERIALIZED VIEW sro_mv; COMMIT;
1562-
ERROR: must have admin option on role "regress_priv_group2"
1562+
ERROR: permission denied to grant role "regress_priv_group2"
1563+
DETAIL: Only roles with the ADMIN option on role "regress_priv_group2" may grant this role.
15631564
CONTEXT: SQL function "unwanted_grant" statement 1
15641565
SQL statement "SELECT unwanted_grant()"
15651566
PL/pgSQL function sro_trojan() line 1 at PERFORM
@@ -1589,10 +1590,12 @@ CREATE FUNCTION dogrant_ok() RETURNS void LANGUAGE sql SECURITY DEFINER AS
15891590
GRANT regress_priv_group2 TO regress_priv_user5; -- ok: had ADMIN OPTION
15901591
SET ROLE regress_priv_group2;
15911592
GRANT regress_priv_group2 TO regress_priv_user5; -- fails: SET ROLE suspended privilege
1592-
ERROR: must have admin option on role "regress_priv_group2"
1593+
ERROR: permission denied to grant role "regress_priv_group2"
1594+
DETAIL: Only roles with the ADMIN option on role "regress_priv_group2" may grant this role.
15931595
SET SESSION AUTHORIZATION regress_priv_user1;
15941596
GRANT regress_priv_group2 TO regress_priv_user5; -- fails: no ADMIN OPTION
1595-
ERROR: must have admin option on role "regress_priv_group2"
1597+
ERROR: permission denied to grant role "regress_priv_group2"
1598+
DETAIL: Only roles with the ADMIN option on role "regress_priv_group2" may grant this role.
15961599
SELECT dogrant_ok(); -- ok: SECURITY DEFINER conveys ADMIN
15971600
NOTICE: role "regress_priv_user5" is already a member of role "regress_priv_group2"
15981601
dogrant_ok
@@ -1602,14 +1605,16 @@ NOTICE: role "regress_priv_user5" is already a member of role "regress_priv_gro
16021605

16031606
SET ROLE regress_priv_group2;
16041607
GRANT regress_priv_group2 TO regress_priv_user5; -- fails: SET ROLE did not help
1605-
ERROR: must have admin option on role "regress_priv_group2"
1608+
ERROR: permission denied to grant role "regress_priv_group2"
1609+
DETAIL: Only roles with the ADMIN option on role "regress_priv_group2" may grant this role.
16061610
SET SESSION AUTHORIZATION regress_priv_group2;
16071611
GRANT regress_priv_group2 TO regress_priv_user5; -- ok: a role can self-admin
16081612
NOTICE: role "regress_priv_user5" is already a member of role "regress_priv_group2"
16091613
CREATE FUNCTION dogrant_fails() RETURNS void LANGUAGE sql SECURITY DEFINER AS
16101614
'GRANT regress_priv_group2 TO regress_priv_user5';
16111615
SELECT dogrant_fails(); -- fails: no self-admin in SECURITY DEFINER
1612-
ERROR: must have admin option on role "regress_priv_group2"
1616+
ERROR: permission denied to grant role "regress_priv_group2"
1617+
DETAIL: Only roles with the ADMIN option on role "regress_priv_group2" may grant this role.
16131618
CONTEXT: SQL function "dogrant_fails" statement 1
16141619
DROP FUNCTION dogrant_fails();
16151620
SET SESSION AUTHORIZATION regress_priv_user4;

0 commit comments

Comments
 (0)