Commit442f870

committed

Integrate superuser check into has_rolreplication()

This makes it consistent with similar functions likehas_createrole_privilege() and allows removing some explicit superuserchecks.Author: Nathan Bossart <nathandbossart@gmail.com>Discussion:https://www.postgresql.org/message-id/20230310000313.GA3992372%40nathanxps13

1 parent3b7cd8c commit442f870Copy full SHA for 442f870

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,7 @@ CheckSlotRequirements(void)`
`1140`	`1140`	`void`
`1141`	`1141`	`CheckSlotPermissions(void)`
`1142`	`1142`	`{`
`1143`		`-if (!superuser()&& !has_rolreplication(GetUserId()))`
	`1143`	`+if (!has_rolreplication(GetUserId()))`
`1144`	`1144`	`ereport(ERROR,`
`1145`	`1145`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`1146`	`1146`	`errmsg("must be superuser or replication role to use replication slots")));`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -709,6 +709,10 @@ has_rolreplication(Oid roleid)`
`709`	`709`	`boolresult= false;`
`710`	`710`	`HeapTupleutup;`
`711`	`711`
	`712`	`+/* Superusers bypass all permission checking. */`
	`713`	`+if (superuser_arg(roleid))`
	`714`	`+return true;`
	`715`	`+`
`712`	`716`	`utup=SearchSysCache1(AUTHOID,ObjectIdGetDatum(roleid));`
`713`	`717`	`if (HeapTupleIsValid(utup))`
`714`	`718`	`{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -962,7 +962,7 @@ InitPostgres(const char *in_dbname, Oid dboid,`
`962`	`962`	`{`
`963`	`963`	`Assert(!bootstrap);`
`964`	`964`
`965`		`-if (!superuser()&& !has_rolreplication(GetUserId()))`
	`965`	`+if (!has_rolreplication(GetUserId()))`
`966`	`966`	`ereport(FATAL,`
`967`	`967`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`968`	`968`	`errmsg("must be superuser or replication role to start walsender")));`

Comments

(0)