diff --git a/backend/app/engine/masking.py b/backend/app/engine/masking.py index 50526a4c..8f58f957 100644 --- a/backend/app/engine/masking.py +++ b/backend/app/engine/masking.py @@ -1741,7 +1741,8 @@ INDIRECT_FUNCTIONS = ( #: column_statistics(直方图里是列的原值)、innodb_ft_*,MariaDB 的 column_stats,Oracle 的直方图、列统计和记着最小最大值 #: 的 *_tab_columns、*_tab_cols(LOW_VALUE、HIGH_VALUE 按字节交回来就是号码、姓名的原文),以及它们的底表 histgrm$、 #: hist_head$ -#: - 别的会话执行过的 SQL 原文:Postgres 的 pg_stat_activity、pg_stat_statements、本连接预备过的语句;MySQL 的 general_log、 +#: - 别的会话执行过的 SQL 原文:Postgres 的 pg_stat_activity、pg_stat_statements、本连接预备过的语句,以及扩展里同一类的 +#: pg_stat_monitor(语句原文)、pg_qualstats(条件里的常量 constvalue)、pg_store_plans(执行计划);MySQL 的 general_log、 #: slow_log、PROCESSLIST、正在执行的事务(information_schema.INNODB_TRX 的 trx_query)、performance_schema(语句历史 #: events_statements_*、线程正在执行的 SQL),sys 库里建在 performance_schema 上的会话、锁等待视图(只认这几张,Oracle #: 常写的 sys.dual 不算;带 x$ 的不排版的那一份按下面的 X$ 算)和读 performance_schema 的函数(按 sys.ps_ 开头认: @@ -1763,6 +1764,7 @@ INDIRECT_NAMES = ( r"pg_stat(?:s|istic)\w*", r"sqlite_stat\d", r"column_statistics", r"innodb_ft_\w+", r"column_stats", r"(?:all|dba|user|cdb)_(?:\w+_)?(?:histograms|col_statistics|tab_cols|tab_columns)", r"(?:histgrm|hist_head)\$", r"pg_stat_activity", r"pg_stat_statements", r"pg_prepared_statements", r"general_log", r"slow_log", + r"pg_stat_monitor\w*", r"pg_qualstats\w*", r"pg_store_plans\w*", r"processlist", r"innodb_trx", r"innodb_locks", r"query_cache_info", r"optimizer_trace", r"performance_schema", r"events_statements_\w+", r"sys[\"`]?\s*\.\s*[\"`]?(?:(?:x\$)?(?:session|processlist|innodb_lock_waits|schema_table_lock_waits)|ps_\w+)", diff --git a/backend/tests/test_masking_opaque_sql.py b/backend/tests/test_masking_opaque_sql.py index 4e81a02f..949bbd2e 100644 --- a/backend/tests/test_masking_opaque_sql.py +++ b/backend/tests/test_masking_opaque_sql.py @@ -225,6 +225,24 @@ def test_tables_and_sql_handed_to_functions_as_text_mask_the_whole_result(sql): assert done.columns == ["x"] and not _leaks(done) +@pytest.mark.parametrize("sql", [ + "SELECT query AS x FROM pg_stat_monitor", + "SELECT q.query AS x FROM pg_stat_monitor_internal(true) q", + "SELECT quals::text AS x FROM pg_qualstats", + "SELECT constvalue AS x FROM pg_qualstats()", + "SELECT plan AS x FROM pg_store_plans", +]) +def test_extensions_that_keep_other_sessions_sql_mask_the_whole_result(sql): + """Postgres 扩展里记着别的会话执行过的语句、条件里的常量的视图和函数(pg_stat_monitor 的 query、pg_qualstats 的 + constvalue、pg_store_plans 的计划):交回的就是带号码的原文,和 pg_stat_statements 同一类,整份遮;可验证报告用的是同 + 一份名单,也只给哈希。""" + from app.bundle import build + + done = masked(sql, ["x"], [[f"SELECT id FROM sales WHERE buyer_phone = '{PHONE}'"]]) + assert done.columns == ["x"] and not _leaks(done) + assert masking._INDIRECT.search(sql) and build._INDIRECT_READS.search(sql) + + def test_a_table_handed_to_a_function_masks_the_whole_result_even_when_the_sql_cannot_be_read(): sql = "SELECT table_to_xml('sales', true, false, '') AS x WHERE (" hidden, _ = masking._derived_hidden({"sql": sql, "columns": ["x"], "rows": []}, {"buyer_phone"}, "postgresql")