Prevent ALTER USER f RESET ALL from removing the settings that were put there

by a superuser -- "ALTER USER f RESET setting" already disallows removing such a
setting.

Apply the same treatment to ALTER DATABASE d RESET ALL when run by a database
owner that's not superuser.

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 70329ce39746911d24bec8ea2d7790eb8dede315..fdb2ed2fcbdf25cd3f7324e3b7fc1c95b7af186f 100644 (file)
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.148.4.3 2005/06/25 22:47:49 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.148.4.4 2010/03/25 14:45:51 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -812,9 +812,30 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 
        if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
        {
-               /* RESET ALL */
-               repl_null[Anum_pg_database_datconfig - 1] = 'n';
-               repl_val[Anum_pg_database_datconfig - 1] = (Datum) 0;
+               ArrayType  *new = NULL;
+               Datum           datum;
+               bool            isnull;
+
+               /*
+                * in RESET ALL, request GUC to reset the settings array; if none
+                * left, we can set datconfig to null; otherwise use the returned
+                * array
+                */
+               datum = heap_getattr(tuple, Anum_pg_database_datconfig,
+                                                        RelationGetDescr(rel), &isnull);
+               if (!isnull)
+                       new = GUCArrayReset(DatumGetArrayTypeP(datum));
+               if (new)
+               {
+                       repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(new);
+                       repl_repl[Anum_pg_database_datconfig - 1] = 'r';
+                       repl_null[Anum_pg_database_datconfig - 1] = ' ';
+               }
+               else
+               {
+                       repl_null[Anum_pg_database_datconfig - 1] = 'n';
+                       repl_val[Anum_pg_database_datconfig - 1] = (Datum) 0;
+               }
        }
        else
        {

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index c69956d41c97a8f0b3ac74f90017f6ff4ad7e67f..9ffb2fbf45685c927a1a2a92ad24eec2a1dd784b 100644 (file)
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.147.4.1 2005/10/26 13:43:28 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.147.4.2 2010/03/25 14:45:51 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1022,8 +1022,30 @@ AlterUserSet(AlterUserSetStmt *stmt)
        repl_repl[Anum_pg_shadow_useconfig - 1] = 'r';
        if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
        {
-               /* RESET ALL */
-               repl_null[Anum_pg_shadow_useconfig - 1] = 'n';
+               ArrayType  *new = NULL;
+               Datum           datum;
+               bool            isnull;
+
+               /*
+                * in RESET ALL, request GUC to reset the settings array; if none
+                * left, we can set useconfig to null; otherwise use the returned
+                * array
+                */
+               datum = SysCacheGetAttr(SHADOWNAME, oldtuple,
+                                                               Anum_pg_shadow_useconfig, &isnull);
+               if (!isnull)
+                       new = GUCArrayReset(DatumGetArrayTypeP(datum));
+               if (new)
+               {
+                       repl_val[Anum_pg_shadow_useconfig - 1] = PointerGetDatum(new);
+                       repl_repl[Anum_pg_shadow_useconfig - 1] = 'r';
+                       repl_null[Anum_pg_shadow_useconfig - 1] = ' ';
+               }
+               else
+               {
+                       repl_null[Anum_pg_shadow_useconfig - 1] = 'n';
+                       repl_val[Anum_pg_shadow_useconfig - 1] = (Datum) 0;
+               }
        }
        else
        {

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 78840bb1aea5e31570b0e71b62c91c0590126d09..034f469b05b61e47391ae6aa7c222321a4419f75 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <[email protected]>.
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.252.4.9 2010/02/25 23:45:04 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.252.4.10 2010/03/25 14:45:51 alvherre Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -5187,6 +5187,7 @@ ProcessGUCArray(ArrayType *array, GucSource source)
                free(name);
                if (value)
                        free(value);
+               pfree(s);
        }
 }
 
@@ -5322,6 +5323,85 @@ GUCArrayDelete(ArrayType *array, const char *name)
                        && val[strlen(name)] == '=')
                        continue;
 
+
+               /* else add it to the output array */
+               if (newarray)
+               {
+                       newarray = array_set(newarray, 1, &index,
+                                                                d,
+                                                                false,
+                                                                -1 /* varlenarray */ ,
+                                                                -1 /* TEXT's typlen */ ,
+                                                                false /* TEXT's typbyval */ ,
+                                                                'i' /* TEXT's typalign */ );
+               }
+               else
+                       newarray = construct_array(&d, 1,
+                                                                          TEXTOID,
+                                                                          -1, false, 'i');
+
+               index++;
+       }
+
+       return newarray;
+}
+
+/*
+ * Given a GUC array, delete all settings from it that our permission
+ * level allows: if superuser, delete them all; if regular user, only
+ * those that are PGC_USERSET
+ */
+ArrayType *
+GUCArrayReset(ArrayType *array)
+{
+       ArrayType  *newarray;
+       int                     i;
+       int                     index;
+
+       /* if array is currently null, nothing to do */
+       if (!array)
+               return NULL;
+
+       /* if we're superuser, we can delete everything */
+       if (superuser())
+               return NULL;
+
+       newarray = NULL;
+       index = 1;
+
+       for (i = 1; i <= ARR_DIMS(array)[0]; i++)
+       {
+               Datum           d;
+               char       *val;
+               char       *eqsgn;
+               bool            isnull;
+               struct config_generic *gconf;
+
+               d = array_ref(array, 1, &i,
+                                         -1 /* varlenarray */ ,
+                                         -1 /* TEXT's typlen */ ,
+                                         false /* TEXT's typbyval */ ,
+                                         'i' /* TEXT's typalign */ ,
+                                         &isnull);
+
+               if (isnull)
+                       continue;
+               val = DatumGetCString(DirectFunctionCall1(textout, d));
+
+               eqsgn = strchr(val, '=');
+               *eqsgn = '\0';
+
+               gconf = find_option(val, WARNING);
+               if (!gconf)
+                       continue;
+
+               /* note: superuser-ness was already checked above */
+               /* skip entry if OK to delete */
+               if (gconf->context == PGC_USERSET)
+                       continue;
+
+               /* XXX do we need to worry about database owner? */
+
                /* else add it to the output array */
                if (newarray)
                {
@@ -5340,6 +5420,7 @@ GUCArrayDelete(ArrayType *array, const char *name)
                                                                           -1, false, 'i');
 
                index++;
+               pfree(val);
        }
 
        return newarray;

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 18d1dc17dabc2b9b284258d96f441abfb9dd60df..883e63403eaaa5cc17b8024f2e823e13d964670d 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <[email protected]>.
  *
- * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.58.4.2 2009/12/09 21:58:56 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.58.4.3 2010/03/25 14:45:51 alvherre Exp $
  *--------------------------------------------------------------------
  */
 #ifndef GUC_H
@@ -206,6 +206,7 @@ extern char *flatten_set_variable_args(const char *name, List *args);
 extern void ProcessGUCArray(ArrayType *array, GucSource source);
 extern ArrayType *GUCArrayAdd(ArrayType *array, const char *name, const char *value);
 extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
+extern ArrayType *GUCArrayReset(ArrayType *array);
 
 #ifdef EXEC_BACKEND
 extern void write_nondefault_variables(GucContext context);