NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitafbfc02

committed

Refactor ownercheck functions

Instead of dozens of mostly-duplicate pg_foo_ownercheck() functions,write one common function object_ownercheck() that can handle almostall of them. We already have all the information we need, such aswhich system catalog corresponds to which catalog table and whichcolumn is the owner column.Reviewed-by: Corey Huinker <corey.huinker@gmail.com>Reviewed-by: Antonin Houska <ah@cybertec.at>Discussion:https://www.postgresql.org/message-id/flat/95c30f96-4060-2f48-98b5-a4392d3b6066@enterprisedb.com

1 parentb4b7ce8 commitafbfc02Copy full SHA for afbfc02

File tree

37 files changed

+183

-806

lines changed

contrib/pg_surgery
- heap_surgery.c
src
- backend
  - access
    - brin
      - brin.c
    - gin
      - ginfast.c
  - catalog
  - commands
  - libpq
    - be-fsstubs.c
  - rewrite
    - rewriteDefine.c
  - utils
    - adt
      - ri_triggers.c
    - misc
      - rls.c
- include/utils
  - acl.h

37 files changed

+183

-806

lines changed

`‎contrib/pg_surgery/heap_surgery.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ heap_force_common(FunctionCallInfo fcinfo, HeapTupleForceOption heap_force_opt)`
`118`	`118`	`errmsg("only heap AM is supported")));`
`119`	`119`
`120`	`120`	`/* Must be owner of the table or superuser. */`
`121`		`-if (!pg_class_ownercheck(RelationGetRelid(rel),GetUserId()))`
	`121`	`+if (!object_ownercheck(RelationRelationId,RelationGetRelid(rel),GetUserId()))`
`122`	`122`	`aclcheck_error(ACLCHECK_NOT_OWNER,`
`123`	`123`	`get_relkind_objtype(rel->rd_rel->relkind),`
`124`	`124`	`RelationGetRelationName(rel));`

`‎src/backend/access/brin/brin.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1069,7 +1069,7 @@ brin_summarize_range(PG_FUNCTION_ARGS)`
`1069`	`1069`	`RelationGetRelationName(indexRel))));`
`1070`	`1070`
`1071`	`1071`	`/* User must own the index (comparable to privileges needed for VACUUM) */`
`1072`		`-if (heapRel!=NULL&& !pg_class_ownercheck(indexoid,save_userid))`
	`1072`	`+if (heapRel!=NULL&& !object_ownercheck(RelationRelationId,indexoid,save_userid))`
`1073`	`1073`	`aclcheck_error(ACLCHECK_NOT_OWNER,OBJECT_INDEX,`
`1074`	`1074`	`RelationGetRelationName(indexRel));`
`1075`	`1075`
`@@ -1152,7 +1152,7 @@ brin_desummarize_range(PG_FUNCTION_ARGS)`
`1152`	`1152`	`RelationGetRelationName(indexRel))));`
`1153`	`1153`
`1154`	`1154`	`/* User must own the index (comparable to privileges needed for VACUUM) */`
`1155`		`-if (!pg_class_ownercheck(indexoid,GetUserId()))`
	`1155`	`+if (!object_ownercheck(RelationRelationId,indexoid,GetUserId()))`
`1156`	`1156`	`aclcheck_error(ACLCHECK_NOT_OWNER,OBJECT_INDEX,`
`1157`	`1157`	`RelationGetRelationName(indexRel));`
`1158`	`1158`

`‎src/backend/access/gin/ginfast.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ gin_clean_pending_list(PG_FUNCTION_ARGS)`
`1054`	`1054`	`errmsg("cannot access temporary indexes of other sessions")));`
`1055`	`1055`
`1056`	`1056`	`/* User must own the index (comparable to privileges needed for VACUUM) */`
`1057`		`-if (!pg_class_ownercheck(indexoid,GetUserId()))`
	`1057`	`+if (!object_ownercheck(RelationRelationId,indexoid,GetUserId()))`
`1058`	`1058`	`aclcheck_error(ACLCHECK_NOT_OWNER,OBJECT_INDEX,`
`1059`	`1059`	`RelationGetRelationName(indexRel));`
`1060`	`1060`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitafbfc02

File tree

37 files changed

37 files changed

`‎contrib/pg_surgery/heap_surgery.c‎`

`‎src/backend/access/brin/brin.c‎`

`‎src/backend/access/gin/ginfast.c‎`

0 commit comments