diff options
| author | Noah Misch <noah@leadboat.com> | 2016-08-08 10:07:46 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2016-08-08 10:07:50 -0400 |
| commit | 286c8bc646468fe68c6af484463391dd414ee65d (patch) | |
| tree | f4d5ab9ff31211bbb9f82cdfd48dbb7e4319f9dc /src/bin/psql/command.c | |
| parent | 8adff378308b3500aad45a2d5bfa9ca808f37627 (diff) | |
Obstruct shell, SQL, and conninfo injection via database and role names.
Due to simplistic quoting and confusion of database names with conninfo
strings, roles with the CREATEDB or CREATEROLE option could escalate to
superuser privileges when a superuser next ran certain maintenance
commands. The new coding rule for PQconnectdbParams() calls, documented
at conninfo_array_parse(), is to pass expand_dbname=true and wrap
literal database names in a trivial connection string. Escape
zero-length values in appendConnStrVal(). Back-patch to 9.1 (all
supported versions).
Nathan Bossart, Michael Paquier, and Noah Misch. Reviewed by Peter
Eisentraut. Reported by Nathan Bossart.
Security: CVE-2016-5424
Diffstat (limited to 'src/bin/psql/command.c')
| -rw-r--r-- | src/bin/psql/command.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 6a885674d06..4537a7220a8 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -1630,6 +1630,7 @@ do_connect(enum trivalue reuse_previous_specification, bool keep_password; bool has_connection_string; bool reuse_previous; + PQExpBufferData connstr; if (!o_conn && (!dbname || !user || !host || !port)) { @@ -1693,7 +1694,15 @@ do_connect(enum trivalue reuse_previous_specification, * changes: passwords aren't (usually) database-specific. */ if (!dbname && reuse_previous) - dbname = PQdb(o_conn); + { + initPQExpBuffer(&connstr); + appendPQExpBuffer(&connstr, "dbname="); + appendConnStrVal(&connstr, PQdb(o_conn)); + dbname = connstr.data; + /* has_connection_string=true would be a dead store */ + } + else + connstr.data = NULL; /* * If the user asked to be prompted for a password, ask for one now. If @@ -1802,8 +1811,12 @@ do_connect(enum trivalue reuse_previous_specification, } PQfinish(n_conn); + if (connstr.data) + termPQExpBuffer(&connstr); return false; } + if (connstr.data) + termPQExpBuffer(&connstr); /* * Replace the old connection with the new one, and update |