pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  
help / color / mirror / Atom feed
From: Dean Rasheed <dean.a.rasheed@gmail.com>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: Fix RLS policy usage in MERGE.
Date: Mon, 07 Aug 2023 08:32:18 +0000
Message-ID: <E1qSvf0-000qO6-0Y@gemulon.postgresql.org> (raw)

Fix RLS policy usage in MERGE.

If MERGE executes an UPDATE action on a table with row-level security,
the code incorrectly applied the WITH CHECK clauses from the target
table's INSERT policies to new rows, instead of the clauses from the
table's UPDATE policies. In addition, it failed to check new rows
against the target table's SELECT policies, if SELECT permissions were
required (likely to always be the case).

In addition, if MERGE executes a DO NOTHING action for matched rows,
the code incorrectly applied the USING clauses from the target table's
DELETE policies to existing target tuples. These policies were applied
as checks that would throw an error, if they did not pass.

Fix this, so that a MERGE UPDATE action applies the same RLS policies
as a plain UPDATE query with a WHERE clause, and a DO NOTHING action
does not apply any RLS checks (other than adding clauses from SELECT
policies to the join).

Back-patch to v15, where MERGE was introduced.

Dean Rasheed, reviewed by Stephen Frost.

Security: CVE-2023-39418

Branch
------
REL_15_STABLE

Details
-------
https://git.postgresql.org/pg/commitdiff/cb2ae5741f2458a474ed3c31458d242e678ff229

Modified Files
--------------
src/backend/executor/nodeModifyTable.c    |  7 +--
src/backend/rewrite/rowsecurity.c         | 85 ++++++++++++++++++++++---------
src/test/regress/expected/rowsecurity.out | 58 ++++++++++++++++-----
src/test/regress/sql/rowsecurity.sql      | 52 +++++++++++++++----
4 files changed, 152 insertions(+), 50 deletions(-)



view thread (3+ messages)  latest in thread

Message-ID: <E1qSvf0-000qO6-0Y@gemulon.postgresql.org>
Permalink:  ../E1qSvf0-000qO6-0Y@gemulon.postgresql.org/
Also on:    postgresql.org/message-id/E1qSvf0-000qO6-0Y@gemulon.postgresql.org

 · 

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-committers@postgresql.org
  Cc: dean.a.rasheed@gmail.com, pgsql-committers@lists.postgresql.org
  Subject: Re: pgsql: Fix RLS policy usage in MERGE.
  In-Reply-To: <E1qSvf0-000qO6-0Y@gemulon.postgresql.org>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox