Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit07d1edb

Browse files
committed
Extend object access hook framework to support arguments, and DROP.
This allows loadable modules to get control at drop time, perhaps for thepurpose of performing additional security checks or to log the event.The initial purpose of this code is to support sepgsql, but otherapplications should be possible as well.KaiGai Kohei, reviewed by me.
1 parentb149539 commit07d1edb

23 files changed

+104
-36
lines changed

‎src/backend/catalog/dependency.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include"catalog/heap.h"
2121
#include"catalog/index.h"
2222
#include"catalog/namespace.h"
23+
#include"catalog/objectaccess.h"
2324
#include"catalog/pg_amop.h"
2425
#include"catalog/pg_amproc.h"
2526
#include"catalog/pg_attrdef.h"
@@ -991,6 +992,15 @@ deleteOneObject(const ObjectAddress *object, Relation depRel, int flags)
991992
SysScanDescscan;
992993
HeapTupletup;
993994

995+
/* DROP hook of the objects being removed */
996+
if (object_access_hook)
997+
{
998+
ObjectAccessDropdrop_arg;
999+
drop_arg.dropflags=flags;
1000+
InvokeObjectAccessHook(OAT_DROP,object->classId,object->objectId,
1001+
object->objectSubId,&drop_arg);
1002+
}
1003+
9941004
/*
9951005
* First remove any pg_depend records that link from this object to
9961006
* others.(Any records linking to this object should be gone already.)

‎src/backend/catalog/heap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,8 @@ heap_create_with_catalog(const char *relname,
12861286
}
12871287

12881288
/* Post creation hook for new relation */
1289-
InvokeObjectAccessHook(OAT_POST_CREATE,RelationRelationId,relid,0);
1289+
InvokeObjectAccessHook(OAT_POST_CREATE,
1290+
RelationRelationId,relid,0,NULL);
12901291

12911292
/*
12921293
* Store any supplied constraints and defaults.

‎src/backend/catalog/pg_collation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ CollationCreate(const char *collname, Oid collnamespace,
136136

137137
/* Post creation hook for new collation */
138138
InvokeObjectAccessHook(OAT_POST_CREATE,
139-
CollationRelationId,oid,0);
139+
CollationRelationId,oid,0,NULL);
140140

141141
heap_freetuple(tup);
142142
heap_close(rel,RowExclusiveLock);

‎src/backend/catalog/pg_constraint.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ CreateConstraintEntry(const char *constraintName,
366366
}
367367

368368
/* Post creation hook for new constraint */
369-
InvokeObjectAccessHook(OAT_POST_CREATE,ConstraintRelationId,conOid,0);
369+
InvokeObjectAccessHook(OAT_POST_CREATE,
370+
ConstraintRelationId,conOid,0,NULL);
370371

371372
returnconOid;
372373
}

‎src/backend/catalog/pg_conversion.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ ConversionCreate(const char *conname, Oid connamespace,
134134
recordDependencyOnCurrentExtension(&myself, false);
135135

136136
/* Post creation hook for new conversion */
137-
InvokeObjectAccessHook(OAT_POST_CREATE,
138-
ConversionRelationId,HeapTupleGetOid(tup),0);
137+
InvokeObjectAccessHook(OAT_POST_CREATE,ConversionRelationId,
138+
HeapTupleGetOid(tup),0,NULL);
139139

140140
heap_freetuple(tup);
141141
heap_close(rel,RowExclusiveLock);

‎src/backend/catalog/pg_namespace.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ NamespaceCreate(const char *nspName, Oid ownerId, bool isTemp)
9595
recordDependencyOnCurrentExtension(&myself, false);
9696

9797
/* Post creation hook for new schema */
98-
InvokeObjectAccessHook(OAT_POST_CREATE,NamespaceRelationId,nspoid,0);
98+
InvokeObjectAccessHook(OAT_POST_CREATE,
99+
NamespaceRelationId,nspoid,0,NULL);
99100

100101
returnnspoid;
101102
}

‎src/backend/catalog/pg_operator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ OperatorShellMake(const char *operatorName,
275275

276276
/* Post creation hook for new shell operator */
277277
InvokeObjectAccessHook(OAT_POST_CREATE,
278-
OperatorRelationId,operatorObjectId,0);
278+
OperatorRelationId,operatorObjectId,0,NULL);
279279

280280
/*
281281
* Make sure the tuple is visible for subsequent lookups/updates.
@@ -544,7 +544,7 @@ OperatorCreate(const char *operatorName,
544544

545545
/* Post creation hook for new operator */
546546
InvokeObjectAccessHook(OAT_POST_CREATE,
547-
OperatorRelationId,operatorObjectId,0);
547+
OperatorRelationId,operatorObjectId,0,NULL);
548548

549549
heap_close(pg_operator_desc,RowExclusiveLock);
550550

‎src/backend/catalog/pg_proc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,8 @@ ProcedureCreate(const char *procedureName,
655655
heap_freetuple(tup);
656656

657657
/* Post creation hook for new function */
658-
InvokeObjectAccessHook(OAT_POST_CREATE,ProcedureRelationId,retval,0);
658+
InvokeObjectAccessHook(OAT_POST_CREATE,
659+
ProcedureRelationId,retval,0,NULL);
659660

660661
heap_close(rel,RowExclusiveLock);
661662

‎src/backend/catalog/pg_type.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId)
162162
false);
163163

164164
/* Post creation hook for new shell type */
165-
InvokeObjectAccessHook(OAT_POST_CREATE,TypeRelationId,typoid,0);
165+
InvokeObjectAccessHook(OAT_POST_CREATE,
166+
TypeRelationId,typoid,0,NULL);
166167

167168
/*
168169
* clean up and return the type-oid
@@ -474,7 +475,8 @@ TypeCreate(Oid newTypeOid,
474475
rebuildDeps);
475476

476477
/* Post creation hook for new type */
477-
InvokeObjectAccessHook(OAT_POST_CREATE,TypeRelationId,typeObjectId,0);
478+
InvokeObjectAccessHook(OAT_POST_CREATE,
479+
TypeRelationId,typeObjectId,0,NULL);
478480

479481
/*
480482
* finish up

‎src/backend/commands/dbcommands.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,8 @@ createdb(const CreatedbStmt *stmt)
515515
copyTemplateDependencies(src_dboid,dboid);
516516

517517
/* Post creation hook for new database */
518-
InvokeObjectAccessHook(OAT_POST_CREATE,DatabaseRelationId,dboid,0);
518+
InvokeObjectAccessHook(OAT_POST_CREATE,
519+
DatabaseRelationId,dboid,0,NULL);
519520

520521
/*
521522
* Force a checkpoint before starting the copy. This will force dirty
@@ -777,6 +778,15 @@ dropdb(const char *dbname, bool missing_ok)
777778
aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_DATABASE,
778779
dbname);
779780

781+
/* DROP hook for the database being removed */
782+
if (object_access_hook)
783+
{
784+
ObjectAccessDropdrop_arg;
785+
memset(&drop_arg,0,sizeof(ObjectAccessDrop));
786+
InvokeObjectAccessHook(OAT_DROP,
787+
DatabaseRelationId,db_id,0,&drop_arg);
788+
}
789+
780790
/*
781791
* Disallow dropping a DB that is marked istemplate. This is just to
782792
* prevent people from accidentally dropping template0 or template1; they

‎src/backend/commands/extension.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,7 @@ InsertExtensionTuple(const char *extName, Oid extOwner,
15581558
}
15591559
/* Post creation hook for new extension */
15601560
InvokeObjectAccessHook(OAT_POST_CREATE,
1561-
ExtensionRelationId,extensionOid,0);
1561+
ExtensionRelationId,extensionOid,0,NULL);
15621562

15631563
returnextensionOid;
15641564
}

‎src/backend/commands/foreigncmds.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
666666

667667
/* Post creation hook for new foreign data wrapper */
668668
InvokeObjectAccessHook(OAT_POST_CREATE,
669-
ForeignDataWrapperRelationId,fdwId,0);
669+
ForeignDataWrapperRelationId,fdwId,0,NULL);
670670

671671
heap_close(rel,RowExclusiveLock);
672672
}
@@ -962,7 +962,8 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
962962
recordDependencyOnCurrentExtension(&myself, false);
963963

964964
/* Post creation hook for new foreign server */
965-
InvokeObjectAccessHook(OAT_POST_CREATE,ForeignServerRelationId,srvId,0);
965+
InvokeObjectAccessHook(OAT_POST_CREATE,
966+
ForeignServerRelationId,srvId,0,NULL);
966967

967968
heap_close(rel,RowExclusiveLock);
968969
}
@@ -1202,7 +1203,8 @@ CreateUserMapping(CreateUserMappingStmt *stmt)
12021203
recordDependencyOnCurrentExtension(&myself, false);
12031204

12041205
/* Post creation hook for new user mapping */
1205-
InvokeObjectAccessHook(OAT_POST_CREATE,UserMappingRelationId,umId,0);
1206+
InvokeObjectAccessHook(OAT_POST_CREATE,
1207+
UserMappingRelationId,umId,0,NULL);
12061208

12071209
heap_close(rel,RowExclusiveLock);
12081210
}

‎src/backend/commands/functioncmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,8 @@ CreateCast(CreateCastStmt *stmt)
17591759
recordDependencyOnCurrentExtension(&myself, false);
17601760

17611761
/* Post creation hook for new cast */
1762-
InvokeObjectAccessHook(OAT_POST_CREATE,CastRelationId,castid,0);
1762+
InvokeObjectAccessHook(OAT_POST_CREATE,
1763+
CastRelationId,castid,0,NULL);
17631764

17641765
heap_freetuple(tuple);
17651766

‎src/backend/commands/opclasscmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ CreateOpFamily(char *amname, char *opfname, Oid namespaceoid, Oid amoid)
314314

315315
/* Post creation hook for new operator family */
316316
InvokeObjectAccessHook(OAT_POST_CREATE,
317-
OperatorFamilyRelationId,opfamilyoid,0);
317+
OperatorFamilyRelationId,opfamilyoid,0,NULL);
318318

319319
heap_close(rel,RowExclusiveLock);
320320

@@ -717,7 +717,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
717717

718718
/* Post creation hook for new operator class */
719719
InvokeObjectAccessHook(OAT_POST_CREATE,
720-
OperatorClassRelationId,opclassoid,0);
720+
OperatorClassRelationId,opclassoid,0,NULL);
721721

722722
heap_close(rel,RowExclusiveLock);
723723
}

‎src/backend/commands/proclang.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ create_proc_lang(const char *languageName, bool replace,
428428

429429
/* Post creation hook for new procedural language */
430430
InvokeObjectAccessHook(OAT_POST_CREATE,
431-
LanguageRelationId,myself.objectId,0);
431+
LanguageRelationId,myself.objectId,0,NULL);
432432

433433
heap_close(rel,RowExclusiveLock);
434434
}

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4382,7 +4382,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
43824382

43834383
/* Post creation hook for new attribute */
43844384
InvokeObjectAccessHook(OAT_POST_CREATE,
4385-
RelationRelationId,myrelid,newattnum);
4385+
RelationRelationId,myrelid,newattnum,NULL);
43864386

43874387
heap_close(pgclass,RowExclusiveLock);
43884388

‎src/backend/commands/tablespace.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
330330

331331
/* Post creation hook for new tablespace */
332332
InvokeObjectAccessHook(OAT_POST_CREATE,
333-
TableSpaceRelationId,tablespaceoid,0);
333+
TableSpaceRelationId,tablespaceoid,0,NULL);
334334

335335
create_tablespace_directories(location,tablespaceoid);
336336

@@ -434,6 +434,15 @@ DropTableSpace(DropTableSpaceStmt *stmt)
434434
aclcheck_error(ACLCHECK_NO_PRIV,ACL_KIND_TABLESPACE,
435435
tablespacename);
436436

437+
/* DROP hook for the tablespace being removed */
438+
if (object_access_hook)
439+
{
440+
ObjectAccessDropdrop_arg;
441+
memset(&drop_arg,0,sizeof(ObjectAccessDrop));
442+
InvokeObjectAccessHook(OAT_DROP,TableSpaceRelationId,
443+
tablespaceoid,0,&drop_arg);
444+
}
445+
437446
/*
438447
* Remove the pg_tablespace tuple (this will roll back if we fail below)
439448
*/

‎src/backend/commands/trigger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
756756

757757
/* Post creation hook for new trigger */
758758
InvokeObjectAccessHook(OAT_POST_CREATE,
759-
TriggerRelationId,trigoid,0);
759+
TriggerRelationId,trigoid,0,NULL);
760760

761761
/* Keep lock on target rel until end of xact */
762762
heap_close(rel,NoLock);

‎src/backend/commands/tsearchcmds.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ DefineTSParser(List *names, List *parameters)
271271
makeParserDependencies(tup);
272272

273273
/* Post creation hook for new text search parser */
274-
InvokeObjectAccessHook(OAT_POST_CREATE,TSParserRelationId,prsOid,0);
274+
InvokeObjectAccessHook(OAT_POST_CREATE,
275+
TSParserRelationId,prsOid,0,NULL);
275276

276277
heap_freetuple(tup);
277278

@@ -565,7 +566,7 @@ DefineTSDictionary(List *names, List *parameters)
565566

566567
/* Post creation hook for new text search dictionary */
567568
InvokeObjectAccessHook(OAT_POST_CREATE,
568-
TSDictionaryRelationId,dictOid,0);
569+
TSDictionaryRelationId,dictOid,0,NULL);
569570

570571
heap_freetuple(tup);
571572

@@ -1036,7 +1037,8 @@ DefineTSTemplate(List *names, List *parameters)
10361037
makeTSTemplateDependencies(tup);
10371038

10381039
/* Post creation hook for new text search template */
1039-
InvokeObjectAccessHook(OAT_POST_CREATE,TSTemplateRelationId,dictOid,0);
1040+
InvokeObjectAccessHook(OAT_POST_CREATE,
1041+
TSTemplateRelationId,dictOid,0,NULL);
10401042

10411043
heap_freetuple(tup);
10421044

@@ -1419,7 +1421,8 @@ DefineTSConfiguration(List *names, List *parameters)
14191421
makeConfigurationDependencies(tup, false,mapRel);
14201422

14211423
/* Post creation hook for new text search configuration */
1422-
InvokeObjectAccessHook(OAT_POST_CREATE,TSConfigRelationId,cfgOid,0);
1424+
InvokeObjectAccessHook(OAT_POST_CREATE,
1425+
TSConfigRelationId,cfgOid,0,NULL);
14231426

14241427
heap_freetuple(tup);
14251428

‎src/backend/commands/user.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ CreateRole(CreateRoleStmt *stmt)
425425
GetUserId(), false);
426426

427427
/* Post creation hook for new role */
428-
InvokeObjectAccessHook(OAT_POST_CREATE,AuthIdRelationId,roleid,0);
428+
InvokeObjectAccessHook(OAT_POST_CREATE,
429+
AuthIdRelationId,roleid,0,NULL);
429430

430431
/*
431432
* Close pg_authid, but keep lock till commit.
@@ -932,6 +933,15 @@ DropRole(DropRoleStmt *stmt)
932933
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
933934
errmsg("must be superuser to drop superusers")));
934935

936+
/* DROP hook for the role being removed */
937+
if (object_access_hook)
938+
{
939+
ObjectAccessDropdrop_arg;
940+
memset(&drop_arg,0,sizeof(ObjectAccessDrop));
941+
InvokeObjectAccessHook(OAT_DROP,
942+
AuthIdRelationId,roleid,0,&drop_arg);
943+
}
944+
935945
/*
936946
* Lock the role, so nobody can add dependencies to her while we drop
937947
* her. We keep the lock until the end of transaction.

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ InsertRule(char *rulname,
178178

179179
/* Post creation hook for new rule */
180180
InvokeObjectAccessHook(OAT_POST_CREATE,
181-
RewriteRelationId,rewriteObjectId,0);
181+
RewriteRelationId,rewriteObjectId,0,NULL);
182182

183183
heap_close(pg_rewrite_desc,RowExclusiveLock);
184184

‎src/backend/storage/large_object/inv_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ inv_create(Oid lobjId)
217217

218218
/* Post creation hook for new large object */
219219
InvokeObjectAccessHook(OAT_POST_CREATE,
220-
LargeObjectRelationId,lobjId_new,0);
220+
LargeObjectRelationId,lobjId_new,0,NULL);
221221

222222
/*
223223
* Advance command counter to make new tuple visible to later operations.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp