From d691cb91415542e398aa6ad015ea6a5eab53ab0d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 2 Oct 2009 18:13:04 +0000 Subject: [PATCH] Fix erroneous handling of shared dependencies (ie dependencies on roles) in CREATE OR REPLACE FUNCTION. The original code would update pg_shdepend as if a new function was being created, even if it wasn't, with two bad consequences: pg_shdepend might record the wrong owner for the function, and any dependencies for roles mentioned in the function's ACL would be lost. The fix is very easy: just don't touch pg_shdepend at all when doing a function replacement. Also update the CREATE FUNCTION reference page, which never explained exactly what changes and doesn't change in a function replacement. In passing, fix the CREATE VIEW reference page similarly; there's no code bug there, but the docs didn't say what happens. --- doc/src/sgml/ref/create_function.sgml | 10 +++++++++- doc/src/sgml/ref/create_view.sgml | 10 +++++++++- src/backend/catalog/pg_proc.c | 20 ++++++++++++-------- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml index 5b5cda3a81..0843a17563 100644 --- a/doc/src/sgml/ref/create_function.sgml +++ b/doc/src/sgml/ref/create_function.sgml @@ -1,5 +1,5 @@ @@ -562,6 +562,14 @@ CREATE FUNCTION foo(int, int default 42) ... USAGE privilege on the language. + + When CREATE OR REPLACE FUNCTION is used to replace an + existing function, the ownership and permissions of the function + do not change. All other function properties are assigned the + values specified or implied in the command. You must own the function + to replace it (this includes being a member of the owning role). + + diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml index 1a3281dda6..f65e06c84c 100644 --- a/doc/src/sgml/ref/create_view.sgml +++ b/doc/src/sgml/ref/create_view.sgml @@ -1,5 +1,5 @@ @@ -149,6 +149,14 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello; used by the view. + + When CREATE OR REPLACE VIEW is used on an + existing view, only the view's defining SELECT rule is changed. + Other view properties, including ownership, permissions, and non-SELECT + rules, remain unchanged. You must own the view + to replace it (this includes being a member of the owning role). + + diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 41c6d1e2fb..1fda61cc16 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.165 2009/09/22 23:43:37 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.166 2009/10/02 18:13:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -89,6 +89,7 @@ ProcedureCreate(const char *procedureName, bool internalInParam = false; bool internalOutParam = false; Oid variadicType = InvalidOid; + Oid proowner = GetUserId(); Relation rel; HeapTuple tup; HeapTuple oldtup; @@ -290,7 +291,7 @@ ProcedureCreate(const char *procedureName, namestrcpy(&procname, procedureName); values[Anum_pg_proc_proname - 1] = NameGetDatum(&procname); values[Anum_pg_proc_pronamespace - 1] = ObjectIdGetDatum(procNamespace); - values[Anum_pg_proc_proowner - 1] = ObjectIdGetDatum(GetUserId()); + values[Anum_pg_proc_proowner - 1] = ObjectIdGetDatum(proowner); values[Anum_pg_proc_prolang - 1] = ObjectIdGetDatum(languageObjectId); values[Anum_pg_proc_procost - 1] = Float4GetDatum(procost); values[Anum_pg_proc_prorows - 1] = Float4GetDatum(prorows); @@ -353,7 +354,7 @@ ProcedureCreate(const char *procedureName, (errcode(ERRCODE_DUPLICATE_FUNCTION), errmsg("function \"%s\" already exists with same argument types", procedureName))); - if (!pg_proc_ownercheck(HeapTupleGetOid(oldtup), GetUserId())) + if (!pg_proc_ownercheck(HeapTupleGetOid(oldtup), proowner)) aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, procedureName); @@ -471,7 +472,10 @@ ProcedureCreate(const char *procedureName, procedureName))); } - /* do not change existing ownership or permissions, either */ + /* + * Do not change existing ownership or permissions, either. Note + * dependency-update code below has to agree with this decision. + */ replaces[Anum_pg_proc_proowner - 1] = false; replaces[Anum_pg_proc_proacl - 1] = false; @@ -498,12 +502,11 @@ ProcedureCreate(const char *procedureName, /* * Create dependencies for the new function. If we are updating an * existing function, first delete any existing pg_depend entries. + * (However, since we are not changing ownership or permissions, the + * shared dependencies do *not* need to change, and we leave them alone.) */ if (is_update) - { deleteDependencyRecordsFor(ProcedureRelationId, retval); - deleteSharedDependencyRecordsFor(ProcedureRelationId, retval, 0); - } myself.classId = ProcedureRelationId; myself.objectId = retval; @@ -537,7 +540,8 @@ ProcedureCreate(const char *procedureName, } /* dependency on owner */ - recordDependencyOnOwner(ProcedureRelationId, retval, GetUserId()); + if (!is_update) + recordDependencyOnOwner(ProcedureRelationId, retval, proowner); heap_freetuple(tup); -- 2.40.0