mirror of
https://github.com/timescale/timescaledb.git
synced 2025-05-16 02:23:49 +08:00
Fix permission handling for compressed chunks on PG16
Before this patch we required the user to have select permissions on the compressed chunks in addition to permissions on the hypertable. This patch changes our code to not require permission on the compressed chunk when querying through the uncompressed hypertable or chunk similar to how we handle this on PG < 16. This fixes views with security_barrier that have constraints on the user. Fixes: #6425
This commit is contained in:
parent
6e76702ca0
commit
a1f7d3530b
3
.unreleased/pr_6439
Normal file
3
.unreleased/pr_6439
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Fixes: #6439 Fix compressed chunk permission handling on PG16
|
||||||
|
|
||||||
|
Thanks: @adriangb for reporting an issue with security barrier views on pg16
|
@ -1642,6 +1642,20 @@ decompress_chunk_add_plannerinfo(PlannerInfo *root, CompressionInfo *info, Chunk
|
|||||||
root->simple_rel_array[compressed_index] = NULL;
|
root->simple_rel_array[compressed_index] = NULL;
|
||||||
|
|
||||||
RelOptInfo *compressed_rel = build_simple_rel(root, compressed_index, NULL);
|
RelOptInfo *compressed_rel = build_simple_rel(root, compressed_index, NULL);
|
||||||
|
|
||||||
|
#if PG16_GE
|
||||||
|
/*
|
||||||
|
* When initially creating the RTE we add a RTEPerminfo entry for the
|
||||||
|
* RTE but that is only to make build_simple_rel happy.
|
||||||
|
* Asserts in the permission check code will fail with an RTEPerminfo
|
||||||
|
* with no permissions to check so we remove it again here as we don't
|
||||||
|
* want permission checks on the compressed chunks when querying
|
||||||
|
* hypertables with compressed data.
|
||||||
|
*/
|
||||||
|
root->parse->rteperminfos = list_delete_last(root->parse->rteperminfos);
|
||||||
|
info->compressed_rte->perminfoindex = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* github issue :1558
|
/* github issue :1558
|
||||||
* set up top_parent_relids for this rel as the same as the
|
* set up top_parent_relids for this rel as the same as the
|
||||||
* original hypertable, otherwise eq classes are not computed correctly
|
* original hypertable, otherwise eq classes are not computed correctly
|
||||||
@ -1858,9 +1872,8 @@ decompress_chunk_make_rte(Oid compressed_relid, LOCKMODE lockmode, Query *parse)
|
|||||||
rte->insertedCols = NULL;
|
rte->insertedCols = NULL;
|
||||||
rte->updatedCols = NULL;
|
rte->updatedCols = NULL;
|
||||||
#else
|
#else
|
||||||
/* add perminfo for the new RTE */
|
/* Add empty perminfo for the new RTE to make build_simple_rel happy. */
|
||||||
RTEPermissionInfo *perminfo = addRTEPermissionInfo(&parse->rteperminfos, rte);
|
addRTEPermissionInfo(&parse->rteperminfos, rte);
|
||||||
perminfo->requiredPerms |= ACL_SELECT;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return rte;
|
return rte;
|
||||||
|
56
tsl/test/shared/expected/security_barrier.out
Normal file
56
tsl/test/shared/expected/security_barrier.out
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
-- This file and its contents are licensed under the Timescale License.
|
||||||
|
-- Please see the included NOTICE for copyright information and
|
||||||
|
-- LICENSE-TIMESCALE for a copy of the license.
|
||||||
|
\c :TEST_DBNAME :ROLE_SUPERUSER
|
||||||
|
CREATE TABLE test_security_barrier (time TIMESTAMPTZ NOT NULL, tenant TEXT NOT NULL, data TEXT);
|
||||||
|
SELECT FROM create_hypertable('test_security_barrier', by_range('time'));
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
INSERT INTO test_security_barrier(time, tenant, data) VALUES
|
||||||
|
('2020-01-01', :'ROLE_DEFAULT_PERM_USER','data1'),
|
||||||
|
('2020-01-01', :'ROLE_DEFAULT_PERM_USER_2','data2');
|
||||||
|
CREATE VIEW test_security_barrier_view WITH (security_barrier) AS SELECT * FROM test_security_barrier WHERE tenant = current_user;
|
||||||
|
GRANT SELECT ON test_security_barrier_view TO :ROLE_DEFAULT_PERM_USER;
|
||||||
|
GRANT SELECT ON test_security_barrier_view TO :ROLE_DEFAULT_PERM_USER_2;
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
time | tenant | data
|
||||||
|
------------------------------+-------------------+-------
|
||||||
|
Wed Jan 01 00:00:00 2020 PST | default_perm_user | data1
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
RESET ROLE;
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER_2;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
time | tenant | data
|
||||||
|
------------------------------+---------------------+-------
|
||||||
|
Wed Jan 01 00:00:00 2020 PST | default_perm_user_2 | data2
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
RESET ROLE;
|
||||||
|
ALTER TABLE test_security_barrier SET (timescaledb.compress);
|
||||||
|
-- Compress the chunk
|
||||||
|
SELECT compress_chunk(show_chunks('test_security_barrier')) IS NOT NULL AS compressed;
|
||||||
|
compressed
|
||||||
|
t
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
time | tenant | data
|
||||||
|
------------------------------+-------------------+-------
|
||||||
|
Wed Jan 01 00:00:00 2020 PST | default_perm_user | data1
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
RESET ROLE;
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER_2;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
time | tenant | data
|
||||||
|
------------------------------+---------------------+-------
|
||||||
|
Wed Jan 01 00:00:00 2020 PST | default_perm_user_2 | data2
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
RESET ROLE;
|
||||||
|
DROP TABLE test_security_barrier CASCADE;
|
||||||
|
NOTICE: drop cascades to table _timescaledb_internal.compress_hyper_X_X_chunk
|
||||||
|
NOTICE: drop cascades to view test_security_barrier_view
|
@ -7,6 +7,7 @@ set(TEST_FILES_SHARED
|
|||||||
constraint_exclusion_prepared.sql
|
constraint_exclusion_prepared.sql
|
||||||
decompress_join.sql
|
decompress_join.sql
|
||||||
decompress_placeholdervar.sql
|
decompress_placeholdervar.sql
|
||||||
|
security_barrier.sql
|
||||||
subtract_integer_from_now.sql)
|
subtract_integer_from_now.sql)
|
||||||
|
|
||||||
set(TEST_TEMPLATES_SHARED
|
set(TEST_TEMPLATES_SHARED
|
||||||
|
41
tsl/test/shared/sql/security_barrier.sql
Normal file
41
tsl/test/shared/sql/security_barrier.sql
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
-- This file and its contents are licensed under the Timescale License.
|
||||||
|
-- Please see the included NOTICE for copyright information and
|
||||||
|
-- LICENSE-TIMESCALE for a copy of the license.
|
||||||
|
|
||||||
|
\c :TEST_DBNAME :ROLE_SUPERUSER
|
||||||
|
|
||||||
|
CREATE TABLE test_security_barrier (time TIMESTAMPTZ NOT NULL, tenant TEXT NOT NULL, data TEXT);
|
||||||
|
SELECT FROM create_hypertable('test_security_barrier', by_range('time'));
|
||||||
|
|
||||||
|
INSERT INTO test_security_barrier(time, tenant, data) VALUES
|
||||||
|
('2020-01-01', :'ROLE_DEFAULT_PERM_USER','data1'),
|
||||||
|
('2020-01-01', :'ROLE_DEFAULT_PERM_USER_2','data2');
|
||||||
|
|
||||||
|
CREATE VIEW test_security_barrier_view WITH (security_barrier) AS SELECT * FROM test_security_barrier WHERE tenant = current_user;
|
||||||
|
|
||||||
|
GRANT SELECT ON test_security_barrier_view TO :ROLE_DEFAULT_PERM_USER;
|
||||||
|
GRANT SELECT ON test_security_barrier_view TO :ROLE_DEFAULT_PERM_USER_2;
|
||||||
|
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
RESET ROLE;
|
||||||
|
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER_2;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
RESET ROLE;
|
||||||
|
|
||||||
|
ALTER TABLE test_security_barrier SET (timescaledb.compress);
|
||||||
|
|
||||||
|
-- Compress the chunk
|
||||||
|
SELECT compress_chunk(show_chunks('test_security_barrier')) IS NOT NULL AS compressed;
|
||||||
|
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
RESET ROLE;
|
||||||
|
|
||||||
|
SET ROLE :ROLE_DEFAULT_PERM_USER_2;
|
||||||
|
SELECT * FROM test_security_barrier_view;
|
||||||
|
RESET ROLE;
|
||||||
|
|
||||||
|
DROP TABLE test_security_barrier CASCADE;
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user