rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setRuleCheckAsUser has to be applied to any subqueries appearing in a 

rule's event_qual, not only to the rule's action.  Per example from
Arturs Zoldners.
This commit is contained in:
Tom Lane 2004-05-18 22:49:51 +00:00
parent 4c82cb9d40
commit 07f2b767dc
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/rewrite/rewriteDefine.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.93 2004/02/10 01:55:25 tgl Exp $ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.94 2004/05/18 22:49:51 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -33,7 +33,8 @@
#include "utils/syscache.h" #include "utils/syscache.h"
static void setRuleCheckAsUser(Query *qry, AclId userid); static void setRuleCheckAsUser_Query(Query *qry, AclId userid);
static void setRuleCheckAsUser_Expr(Node *node, AclId userid);
static bool setRuleCheckAsUser_walker(Node *node, AclId *context); static bool setRuleCheckAsUser_walker(Node *node, AclId *context);
@ -440,13 +441,15 @@ DefineQueryRewrite(RuleStmt *stmt)
* We want the rule's table references to be checked as though by the * We want the rule's table references to be checked as though by the
* rule owner, not the user referencing the rule. Therefore, scan * rule owner, not the user referencing the rule. Therefore, scan
* through the rule's rtables and set the checkAsUser field on all * through the rule's rtables and set the checkAsUser field on all
* rtable entries. * rtable entries. We have to look at event_qual as well, in case
* it contains sublinks.
*/ */
foreach(l, action) foreach(l, action)
{ {
query = (Query *) lfirst(l); query = (Query *) lfirst(l);
setRuleCheckAsUser(query, GetUserId()); setRuleCheckAsUser_Query(query, GetUserId());
} }
setRuleCheckAsUser_Expr(event_qual, GetUserId());
/* discard rule if it's null action and not INSTEAD; it's a no-op */ /* discard rule if it's null action and not INSTEAD; it's a no-op */
if (action != NIL || is_instead) if (action != NIL || is_instead)
@ -492,7 +495,7 @@ DefineQueryRewrite(RuleStmt *stmt)
} }
/* /*
* setRuleCheckAsUser * setRuleCheckAsUser_Query
* Recursively scan a query and set the checkAsUser field to the * Recursively scan a query and set the checkAsUser field to the
* given userid in all rtable entries. * given userid in all rtable entries.
* *
@ -504,7 +507,7 @@ DefineQueryRewrite(RuleStmt *stmt)
* them always. * them always.
*/ */
static void static void
setRuleCheckAsUser(Query *qry, AclId userid) setRuleCheckAsUser_Query(Query *qry, AclId userid)
{ {
List *l; List *l;
@ -516,7 +519,7 @@ setRuleCheckAsUser(Query *qry, AclId userid)
if (rte->rtekind == RTE_SUBQUERY) if (rte->rtekind == RTE_SUBQUERY)
{ {
/* Recurse into subquery in FROM */ /* Recurse into subquery in FROM */
setRuleCheckAsUser(rte->subquery, userid); setRuleCheckAsUser_Query(rte->subquery, userid);
} }
else else
rte->checkAsUser = userid; rte->checkAsUser = userid;
@ -532,6 +535,12 @@ setRuleCheckAsUser(Query *qry, AclId userid)
/* /*
* Expression-tree walker to find sublink queries * Expression-tree walker to find sublink queries
*/ */
static void
setRuleCheckAsUser_Expr(Node *node, AclId userid)
{
(void) setRuleCheckAsUser_walker(node, &userid);
}
static bool static bool
setRuleCheckAsUser_walker(Node *node, AclId *context) setRuleCheckAsUser_walker(Node *node, AclId *context)
{ {
@ -541,7 +550,7 @@ setRuleCheckAsUser_walker(Node *node, AclId *context)
{ {
Query *qry = (Query *) node; Query *qry = (Query *) node;
setRuleCheckAsUser(qry, *context); setRuleCheckAsUser_Query(qry, *context);
return false; return false;
} }
return expression_tree_walker(node, setRuleCheckAsUser_walker, return expression_tree_walker(node, setRuleCheckAsUser_walker,