database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-23 14:01:44 +03:00
Code Activity

Fix incorrect patch that removed permission checks on inheritance child

Browse Source 
tables --- the parent table no longer got checked, either.  Per bug #5458
from Takahiro Itagaki.
This commit is contained in:
Tom Lane
2010-05-11 15:31:37 +00:00
parent 5d6d037822
commit b7987f8a94
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/optimizer/prep/prepunion.c
View File

@ -22,7 +22,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.181 2010/02/26 02:00:46 momjian Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.182 2010/05/11 15:31:37 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1239,13 +1239,13 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
/* /*
* Build an RTE for the child, and attach to query's rangetable list. * Build an RTE for the child, and attach to query's rangetable list.
* We copy most fields of the parent's RTE, but replace relation OID, * We copy most fields of the parent's RTE, but replace relation OID,
* and set inh = false. * and set inh = false. Also, set requiredPerms to zero since all
* required permissions checks are done on the original RTE.
*/ */
childrte = copyObject(rte); childrte = copyObject(rte);
childrte->relid = childOID; childrte->relid = childOID;
childrte->inh = false; childrte->inh = false;
childrte->requiredPerms = 0; /* do not require permissions on child childrte->requiredPerms = 0;
* tables */
parse->rtable = lappend(parse->rtable, childrte); parse->rtable = lappend(parse->rtable, childrte);
childRTindex = list_length(parse->rtable); childRTindex = list_length(parse->rtable);
@ -1266,6 +1266,10 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
* Translate the column permissions bitmaps to the child's attnums (we * Translate the column permissions bitmaps to the child's attnums (we
* have to build the translated_vars list before we can do this). But * have to build the translated_vars list before we can do this). But
* if this is the parent table, leave copyObject's result alone. * if this is the parent table, leave copyObject's result alone.
*
* Note: we need to do this even though the executor won't run any
* permissions checks on the child RTE. The modifiedCols bitmap
* may be examined for trigger-firing purposes.
*/ */
if (childOID != parentOID) if (childOID != parentOID)
{ {
@ -1316,13 +1320,6 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
/* Otherwise, OK to add to root->append_rel_list */ /* Otherwise, OK to add to root->append_rel_list */
root->append_rel_list = list_concat(root->append_rel_list, appinfos); root->append_rel_list = list_concat(root->append_rel_list, appinfos);
/*
* The executor will check the parent table's access permissions when it
* examines the parent's added RTE entry. There's no need to check twice,
* so turn off access check bits in the original RTE.
*/
rte->requiredPerms = 0;
} }
/* /*