]> git.ipfire.org Git - thirdparty/postgresql.git/commit
Restrict psql meta-commands in plain-text dumps.
authorNathan Bossart <nathan@postgresql.org>
Mon, 11 Aug 2025 14:00:00 +0000 (09:00 -0500)
committerNathan Bossart <nathan@postgresql.org>
Mon, 11 Aug 2025 14:00:00 +0000 (09:00 -0500)
commit67a2fbb8f9e9f75df08208e75da412c43a814688
tree156f87dd678acdc8d6b264571e59a32c57b28144
parent13a67ce6034ed674a4e797c6f1545831189be02e
Restrict psql meta-commands in plain-text dumps.

A malicious server could inject psql meta-commands into plain-text
dump output (i.e., scripts created with pg_dump --format=plain,
pg_dumpall, or pg_restore --file) that are run at restore time on
the machine running psql.  To fix, introduce a new "restricted"
mode in psql that blocks all meta-commands (except for \unrestrict
to exit the mode), and teach pg_dump, pg_dumpall, and pg_restore to
use this mode in plain-text dumps.

While at it, encourage users to only restore dumps generated from
trusted servers or to inspect it beforehand, since restoring causes
the destination to execute arbitrary code of the source superusers'
choice.  However, the client running the dump and restore needn't
trust the source or destination superusers.

Reported-by: Martin Rakhmanov
Reported-by: Matthieu Denais <litezeraw@gmail.com>
Reported-by: RyotaK <ryotak.mail@gmail.com>
Suggested-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Noah Misch <noah@leadboat.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Peter Eisentraut <peter@eisentraut.org>
Security: CVE-2025-8714
Backpatch-through: 13
22 files changed:
doc/src/sgml/ref/pg_dump.sgml
doc/src/sgml/ref/pg_dumpall.sgml
doc/src/sgml/ref/pg_restore.sgml
doc/src/sgml/ref/pgupgrade.sgml
doc/src/sgml/ref/psql-ref.sgml
src/bin/pg_combinebackup/t/002_compare_backups.pl
src/bin/pg_dump/dumputils.c
src/bin/pg_dump/dumputils.h
src/bin/pg_dump/pg_backup.h
src/bin/pg_dump/pg_backup_archiver.c
src/bin/pg_dump/pg_dump.c
src/bin/pg_dump/pg_dumpall.c
src/bin/pg_dump/pg_restore.c
src/bin/pg_dump/t/002_pg_dump.pl
src/bin/pg_upgrade/t/002_pg_upgrade.pl
src/bin/psql/command.c
src/bin/psql/help.c
src/bin/psql/t/001_basic.pl
src/bin/psql/tab-complete.in.c
src/test/recovery/t/027_stream_regress.pl
src/test/regress/expected/psql.out
src/test/regress/sql/psql.sql