From: | Stephen Frost <sfrost(at)snowman(dot)net> |
---|---|
To: | pgsql-committers(at)postgresql(dot)org |
Subject: | pgsql: Reset plan->row_security_env and planUserId |
Date: | 2016-03-28 13:04:15 |
Message-ID: | E1akWq7-0003e5-Fg@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
Reset plan->row_security_env and planUserId
In the plancache, we check if the environment we planned the query under
has changed in a way which requires us to re-plan, such as when the user
for whom the plan was prepared changes and RLS is being used (and,
therefore, there may be different policies to apply).
Unfortunately, while those values were set and checked, they were not
being reset when the query was re-planned and therefore, in cases where
we change role, re-plan, and then change role again, we weren't
re-planning again. This leads to potentially incorrect policies being
applied in cases where role-specific policies are used and a given query
is planned under one role and then executed under other roles, which
could happen under security definer functions or when a common user and
query is planned initially and then re-used across multiple SET ROLEs.
Further, extensions which made use of CopyCachedPlan() may suffer from
similar issues as the RLS-related fields were not properly copied as
part of the plan and therefore RevalidateCachedQuery() would copy in the
current settings without invalidating the query.
Fix by using the same approach used for 'search_path', where we set the
correct values in CompleteCachedPlan(), check them early on in
RevalidateCachedQuery() and then properly reset them if re-planning.
Also, copy through the values during CopyCachedPlan().
Pointed out by Ashutosh Bapat. Reviewed by Michael Paquier.
Back-patch to 9.5 where RLS was introduced.
Security: CVE-2016-2193
Branch
------
REL9_5_STABLE
Details
-------
http://git.postgresql.org/pg/commitdiff/db69e58a0642ef7fa46d62f6c4cf2460c3a1b41b
Modified Files
--------------
src/backend/utils/cache/plancache.c | 40 ++++++++++++++++++++-----------
src/test/regress/expected/rowsecurity.out | 14 +++++++++++
src/test/regress/sql/rowsecurity.sql | 9 +++++++
3 files changed, 49 insertions(+), 14 deletions(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Alvaro Herrera | 2016-03-28 14:00:45 | pgsql: Add missing checks to some of pageinspect's BRIN functions |
Previous Message | Peter Eisentraut | 2016-03-28 07:06:58 | pgsql: Translation updates |