Disallow RESET ROLE and RESET SESSION AUTHORIZATION inside security-definer

[pg-rex/syncrep.git] / src / backend / commands / variable.c

diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1374b65..ca6babb 100644 (file)
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.130 2009/06/11 14:48:56 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.131 2009/09/03 22:08:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -717,21 +717,6 @@ assign_session_authorization(const char *value, bool doit, GucSource source)
                /* not a saved ID, so look it up */
                HeapTuple       roleTup;
 
-               if (InSecurityDefinerContext())
-               {
-                       /*
-                        * Disallow SET SESSION AUTHORIZATION inside a security definer
-                        * context.  We need to do this because when we exit the context,
-                        * GUC won't be notified, leaving things out of sync.  Note that
-                        * this test is positioned so that restoring a previously saved
-                        * setting isn't prevented.
-                        */
-                       ereport(GUC_complaint_elevel(source),
-                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("cannot set session authorization within security-definer function")));
-                       return NULL;
-               }
-
                if (!IsTransactionState())
                {
                        /*
@@ -838,24 +823,6 @@ assign_role(const char *value, bool doit, GucSource source)
                }
        }
 
-       if (roleid == InvalidOid && InSecurityDefinerContext())
-       {
-               /*
-                * Disallow SET ROLE inside a security definer context.  We need to do
-                * this because when we exit the context, GUC won't be notified,
-                * leaving things out of sync.  Note that this test is arranged so
-                * that restoring a previously saved setting isn't prevented.
-                *
-                * XXX it would be nice to allow this case in future, with the
-                * behavior being that the SET ROLE's effects end when the security
-                * definer context is exited.
-                */
-               ereport(GUC_complaint_elevel(source),
-                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                errmsg("cannot set role within security-definer function")));
-               return NULL;
-       }
-
        if (roleid == InvalidOid &&
                strcmp(actual_rolename, "none") != 0)
        {