diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-01-14 23:01:55 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-01-14 23:01:55 +0000 |
| commit | cfd7fb7ed4b66da97f88338d991843fa7e2fe59d (patch) | |
| tree | f433f1281eba10a7ab2e563fa39eaf3228df32e8 /src/backend/rewrite/rewriteHandler.c | |
| parent | 01d320d421b3f82de799e86e8b9adac27c2f9a26 (diff) | |
| download | postgresql-cfd7fb7ed4b66da97f88338d991843fa7e2fe59d.tar.gz postgresql-cfd7fb7ed4b66da97f88338d991843fa7e2fe59d.zip | |
Fix permission-checking bug reported by Tim Burgess 10-Feb-03 (this time
for sure...). Rather than relying on the query context of a rangetable
entry to identify what permissions it wants checked, store a full AclMode
mask in each RTE, and check exactly those bits. This allows an RTE
specifying, say, INSERT privilege on a view to be copied into a derived
UPDATE query without changing meaning. Per recent discussion thread.
initdb forced due to change of stored rule representation.
Diffstat (limited to 'src/backend/rewrite/rewriteHandler.c')
| -rw-r--r-- | src/backend/rewrite/rewriteHandler.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 3f69110a36a..e66eb905f56 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.132 2004/01/14 03:39:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.133 2004/01/14 23:01:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -655,13 +655,11 @@ ApplyRetrieveRule(Query *parsetree, */ subrte = rt_fetch(PRS2_OLD_VARNO, rule_action->rtable); Assert(subrte->relid == relation->rd_id); - subrte->checkForRead = rte->checkForRead; - subrte->checkForWrite = rte->checkForWrite; + subrte->requiredPerms = rte->requiredPerms; subrte->checkAsUser = rte->checkAsUser; - rte->checkForRead = false; /* no permission check on subquery itself */ - rte->checkForWrite = false; - rte->checkAsUser = InvalidOid; + rte->requiredPerms = 0; /* no permission check on subquery itself */ + rte->checkAsUser = 0; /* * FOR UPDATE of view? @@ -713,7 +711,7 @@ markQueryForUpdate(Query *qry, bool skipOldNew) { if (!intMember(rti, qry->rowMarks)) qry->rowMarks = lappendi(qry->rowMarks, rti); - rte->checkForWrite = true; + rte->requiredPerms |= ACL_SELECT_FOR_UPDATE; } else if (rte->rtekind == RTE_SUBQUERY) { |