mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-09 08:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use aclcheck_error() in place of ad-hoc permissions complaints.

Browse Source
This commit is contained in:
Tom Lane 2002-07-29 23:44:44 +00:00
parent ea4686e3e1
commit 7b970bc1bc
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/backend/commands/functioncmds.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.14 2002/07/29 20:45:44 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.15 2002/07/29 23:44:44 tgl Exp $
* *
* DESCRIPTION * DESCRIPTION
* These routines take the parse tree and pick out the * These routines take the parse tree and pick out the
@ -47,6 +47,7 @@
#include "parser/parse_func.h" #include "parser/parse_func.h"
#include "parser/parse_type.h" #include "parser/parse_type.h"
#include "utils/acl.h" #include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
@ -633,10 +634,14 @@ CreateCast(CreateCastStmt *stmt)
if (stmt->func != NULL) if (stmt->func != NULL)
{ {
funcid = LookupFuncNameTypeNames(stmt->func->funcname, stmt->func->funcargs, false, "CreateCast"); funcid = LookupFuncNameTypeNames(stmt->func->funcname,
stmt->func->funcargs,
false,
"CreateCast");
if(!pg_proc_ownercheck(funcid, GetUserId())) if (!pg_proc_ownercheck(funcid, GetUserId()))
elog(ERROR, "permission denied"); aclcheck_error(ACLCHECK_NOT_OWNER,
NameListToString(stmt->func->funcname));
tuple = SearchSysCache(PROCOID, ObjectIdGetDatum(funcid), 0, 0, 0); tuple = SearchSysCache(PROCOID, ObjectIdGetDatum(funcid), 0, 0, 0);
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
@ -661,10 +666,13 @@ CreateCast(CreateCastStmt *stmt)
else else
{ {
/* indicates binary compatibility */ /* indicates binary compatibility */
if (!pg_type_ownercheck(sourcetypeid, GetUserId()) if (!pg_type_ownercheck(sourcetypeid, GetUserId()))
|| !pg_type_ownercheck(targettypeid, GetUserId())) aclcheck_error(ACLCHECK_NOT_OWNER,
elog(ERROR, "permission denied"); TypeNameToString(stmt->sourcetype));
funcid = 0; if (!pg_type_ownercheck(targettypeid, GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER,
TypeNameToString(stmt->targettype));
funcid = InvalidOid;
} }
/* ready to go */ /* ready to go */
@ -754,14 +762,18 @@ DropCast(DropCastStmt *stmt)
caststruct = (Form_pg_cast) GETSTRUCT(tuple); caststruct = (Form_pg_cast) GETSTRUCT(tuple);
if (caststruct->castfunc != InvalidOid) if (caststruct->castfunc != InvalidOid)
{ {
if(!pg_proc_ownercheck(caststruct->castfunc, GetUserId())) if (!pg_proc_ownercheck(caststruct->castfunc, GetUserId()))
elog(ERROR, "permission denied"); aclcheck_error(ACLCHECK_NOT_OWNER,
get_func_name(caststruct->castfunc));
} }
else else
{ {
if (!pg_type_ownercheck(sourcetypeid, GetUserId()) if (!pg_type_ownercheck(sourcetypeid, GetUserId()))
|| !pg_type_ownercheck(targettypeid, GetUserId())) aclcheck_error(ACLCHECK_NOT_OWNER,
elog(ERROR, "permission denied"); format_type_be(sourcetypeid));
if (!pg_type_ownercheck(targettypeid, GetUserId()))
aclcheck_error(ACLCHECK_NOT_OWNER,
format_type_be(targettypeid));
} }
/* /*