database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

psql: Don't do backquote expansion in \unrestrict.

Browse Source 
This oversight in commit 71ea0d6795 allows a malicious server to
inject shell commands into plain-text dump output that are run at
restore time on the machine running psql.  To fix, interpret all
text after \unrestrict until the end of the line as its argument.

Reported-by: Lucas Velgus <velgusgus599@gmail.com>
Reported-by: Filip Janus <fjanus@redhat.com>
Reported-by: Daniel Bakker <daniel@jackds.nl>
Author: Nathan Bossart <nathandbossart@gmail.com>
Reviewed-by: Robert Haas <robertmhaas@gmail.com>
Reviewed-by: Noah Misch <noah@leadboat.com>
Security: CVE-2026-18408
Backpatch-through: 14
This commit is contained in:
Nathan Bossart
2026-08-10 06:38:31 -07:00
committed by Noah Misch
parent 953be116c9
commit df245c3745
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/sgml/ref/psql-ref.sgml
View File

@@ -3451,6 +3451,11 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
<application>pg_dumpall</application>, and
<application>pg_restore</application>, but it may be useful elsewhere.
</para>
<para>
Unlike most other meta-commands, the entire remainder of the line is
always taken to be the argument of <command>\unrestrict</command>, and
neither variable interpolation nor backquote expansion are performed.
</para>
</listitem>
</varlistentry>

19
src/bin/psql/command.c
View File

@@ -2349,6 +2349,12 @@ exec_command_restrict(PsqlScanState scan_state, bool active_branch,
Assert(!restricted);
/*
* Unlike \unrestrict, this argument may safely undergo backquote and
* variable expansion: HandleSlashCmds() rejects \restrict in
* restricted mode before its argument is scanned, so we only get here
* when the input could execute such things anyway.
*/
opt = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, true);
if (opt == NULL || opt[0] == '\0')
{
@@ -2663,14 +2669,23 @@ exec_command_unrestrict(PsqlScanState scan_state, bool active_branch,
if (active_branch)
{
char *opt;
size_t len;
opt = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, true);
opt = psql_scan_slash_option(scan_state, OT_WHOLE_LINE, NULL, true);
if (opt == NULL || opt[0] == '\0')
{
pg_log_error("\\%s: missing required argument", cmd);
return PSQL_CMD_ERROR;
}
/* strip any trailing spaces and semicolons */
len = strlen(opt);
while (len > 0 &&
(opt[len - 1] == ';' ||
(isascii((unsigned char) opt[len - 1]) &&
isspace((unsigned char) opt[len - 1]))))
opt[--len] = '\0';
if (!restricted)
{
pg_log_error("\\%s: not currently in restricted mode", cmd);
@@ -2688,7 +2703,7 @@ exec_command_unrestrict(PsqlScanState scan_state, bool active_branch,
}
}
else
ignore_slash_options(scan_state);
ignore_slash_whole_line(scan_state);
return PSQL_CMD_SKIP_LINE;
}

7
src/bin/psql/t/001_basic.pl
View File

@@ -332,4 +332,11 @@ psql_fails_like(
qr/backslash commands are restricted; only \\unrestrict is allowed/,
'meta-command in restrict mode fails');
psql_fails_like(
$node,
qq{\\restrict test
\\unrestrict `echo test`},
qr/wrong key/,
'\unrestrict does not do backquote expansion');
done_testing();