summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2013-06-09 15:26:48 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2013-06-09 15:26:48 -0400
commit5f4a3116865c6482f6e62f4ec4c9152053bc28ca (patch)
treeaf19982d62c34961ac8e2a3ccdb5fb5367fba821
parenta9ec978eb730e0ee9a0aa329009b15f1ead78386 (diff)
Remove ALTER DEFAULT PRIVILEGES' requirement of schema CREATE permissions.
Per discussion, this restriction isn't needed for any real security reason, and it seems to confuse people more often than it helps them. It could also result in some database states being unrestorable. So just drop it. Back-patch to 9.0, where ALTER DEFAULT PRIVILEGES was introduced.
-rw-r--r--doc/src/sgml/ref/alter_default_privileges.sgml4
-rw-r--r--src/backend/catalog/aclchk.c25
2 files changed, 14 insertions, 15 deletions
diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml
index b5c8bb3a36b..fdd9c83800e 100644
--- a/doc/src/sgml/ref/alter_default_privileges.sgml
+++ b/doc/src/sgml/ref/alter_default_privileges.sgml
@@ -121,8 +121,8 @@ REVOKE [ GRANT OPTION FOR ]
<term><replaceable>schema_name</replaceable></term>
<listitem>
<para>
- The name of an existing schema. Each <replaceable>target_role</>
- must have <literal>CREATE</> privileges for each specified schema.
+ The name of an existing schema. If specified, the default privileges
+ are altered for objects later created in that schema.
If <literal>IN SCHEMA</> is omitted, the global default privileges
are altered.
</para>
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 296dfd31422..43134606d01 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -1030,27 +1030,26 @@ SetDefaultACLsInSchemas(InternalDefaultACL *iacls, List *nspnames)
}
else
{
- /* Look up the schema OIDs and do permissions checks */
+ /* Look up the schema OIDs and set permissions for each one */
ListCell *nspcell;
foreach(nspcell, nspnames)
{
char *nspname = strVal(lfirst(nspcell));
- AclResult aclresult;
- /*
- * Note that we must do the permissions check against the target
- * role not the calling user. We require CREATE privileges, since
- * without CREATE you won't be able to do anything using the
- * default privs anyway.
- */
iacls->nspid = get_namespace_oid(nspname, false);
- aclresult = pg_namespace_aclcheck(iacls->nspid, iacls->roleid,
- ACL_CREATE);
- if (aclresult != ACLCHECK_OK)
- aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
- nspname);
+ /*
+ * We used to insist that the target role have CREATE privileges
+ * on the schema, since without that it wouldn't be able to create
+ * an object for which these default privileges would apply.
+ * However, this check proved to be more confusing than helpful,
+ * and it also caused certain database states to not be
+ * dumpable/restorable, since revoking CREATE doesn't cause
+ * default privileges for the schema to go away. So now, we just
+ * allow the ALTER; if the user lacks CREATE he'll find out when
+ * he tries to create an object.
+ */
SetDefaultACL(iacls);
}