diff options
| author | Stephen Frost <sfrost@snowman.net> | 2014-09-24 16:32:22 -0400 |
|---|---|---|
| committer | Stephen Frost <sfrost@snowman.net> | 2014-09-24 16:32:22 -0400 |
| commit | 6550b901fe7c47c03775400e0c790c6c1234a017 (patch) | |
| tree | f67c2cabd58ef765f0bcaf4307d73d7eac51e5fc /src/backend/utils/adt/ri_triggers.c | |
| parent | 3f6f9260e308a331e6809d5309b17d1613ff900f (diff) | |
| download | postgresql-6550b901fe7c47c03775400e0c790c6c1234a017.tar.gz postgresql-6550b901fe7c47c03775400e0c790c6c1234a017.zip | |
Code review for row security.
Buildfarm member tick identified an issue where the policies in the
relcache for a relation were were being replaced underneath a running
query, leading to segfaults while processing the policies to be added
to a query. Similar to how TupleDesc RuleLocks are handled, add in a
equalRSDesc() function to check if the policies have actually changed
and, if not, swap back the rsdesc field (using the original instead of
the temporairly built one; the whole structure is swapped and then
specific fields swapped back). This now passes a CLOBBER_CACHE_ALWAYS
for me and should resolve the buildfarm error.
In addition to addressing this, add a new chapter in Data Definition
under Privileges which explains row security and provides examples of
its usage, change \d to always list policies (even if row security is
disabled- but note that it is disabled, or enabled with no policies),
rework check_role_for_policy (it really didn't need the entire policy,
but it did need to be using has_privs_of_role()), and change the field
in pg_class to relrowsecurity from relhasrowsecurity, based on
Heikki's suggestion. Also from Heikki, only issue SET ROW_SECURITY in
pg_restore when talking to a 9.5+ server, list Bypass RLS in \du, and
document --enable-row-security options for pg_dump and pg_restore.
Lastly, fix a number of minor whitespace and typo issues from Heikki,
Dimitri, add a missing #include, per Peter E, fix a few minor
variable-assigned-but-not-used and resource leak issues from Coverity
and add tab completion for role attribute bypassrls as well.
Diffstat (limited to 'src/backend/utils/adt/ri_triggers.c')
| -rw-r--r-- | src/backend/utils/adt/ri_triggers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index ed4a3769e45..c0156fab1f9 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -2309,9 +2309,9 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel) * have RLS enabled. */ if (!has_bypassrls_privilege(GetUserId()) && - ((pk_rel->rd_rel->relhasrowsecurity && + ((pk_rel->rd_rel->relrowsecurity && !pg_class_ownercheck(pkrte->relid, GetUserId())) || - (fk_rel->rd_rel->relhasrowsecurity && + (fk_rel->rd_rel->relrowsecurity && !pg_class_ownercheck(fkrte->relid, GetUserId())))) return false; |