Field conninfo strings throughout src/bin/scripts.

These programs nominally accepted conninfo strings, but they would
proceed to use the original dbname parameter as though it were an
unadorned database name.  This caused "reindexdb dbname=foo" to issue an
SQL command that always failed, and other programs printed a conninfo
string in error messages that purported to print a database name.  Fix
both problems by using PQdb() to retrieve actual database names.
Continue to print the full conninfo string when reporting a connection
failure.  It is informative there, and if the database name is the sole
problem, the server-side error message will include the name.  Beyond
those user-visible fixes, this allows a subsequent commit to synthesize
and use conninfo strings without that implementation detail leaking into
messages.  As a side effect, the "vacuuming database" message now
appears after, not before, the connection attempt.  Back-patch to 9.1
(all supported versions).

Reviewed by Michael Paquier and Peter Eisentraut.

Security: CVE-2016-5424

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 0ac213d3c3137b8fda88878c8fa83f97c09a87a8..4481d3f2e646b30f942a7bb21588e88cabbbc008 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -209,10 +209,10 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
    {
        if (table)
            fprintf(stderr, _("%s: clustering of table \"%s\" in database \"%s\" failed: %s"),
-                   progname, table, dbname, PQerrorMessage(conn));
+                   progname, table, PQdb(conn), PQerrorMessage(conn));
        else
            fprintf(stderr, _("%s: clustering of database \"%s\" failed: %s"),
-                   progname, dbname, PQerrorMessage(conn));
+                   progname, PQdb(conn), PQerrorMessage(conn));
        PQfinish(conn);
        exit(1);
    }

diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index ff544a803d1335705814e7fba869c81b8ad30ae8..587ef0573fd61120b30869c3175e7ab65b23a3a9 100644 (file)
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -190,10 +190,10 @@ main(int argc, char *argv[])
    result = executeQuery(conn, sql.data, progname, echo);
    if (PQntuples(result) > 0)
    {
-       PQfinish(conn);
        fprintf(stderr,
          _("%s: language \"%s\" is already installed in database \"%s\"\n"),
-               progname, langname, dbname);
+               progname, langname, PQdb(conn));
+       PQfinish(conn);
        /* separate exit status for "already installed" */
        exit(2);
    }

diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index de20317343878f3b18b9f82dece0fa2385c1e580..46d4ae1d5dda71cfc59f38e08e49e1762d7bce23 100644 (file)
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -197,10 +197,10 @@ main(int argc, char *argv[])
    result = executeQuery(conn, sql.data, progname, echo);
    if (PQntuples(result) == 0)
    {
-       PQfinish(conn);
        fprintf(stderr, _("%s: language \"%s\" is not installed in "
                          "database \"%s\"\n"),
-               progname, langname, dbname);
+               progname, langname, PQdb(conn));
+       PQfinish(conn);
        exit(1);
    }
    PQclear(result);

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 342e4c94d1a1cb8032062b0794805522f3bcbc0e..780b4df21d8cc4274ed93089ff811c09e575edfb 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
        }
        /* reindex database only if neither index nor table is specified */
        if (indexes.head == NULL && tables.head == NULL)
-           reindex_one_database(dbname, dbname, "DATABASE", host, port,
+           reindex_one_database(NULL, dbname, "DATABASE", host, port,
                                 username, prompt_password, progname, echo);
    }
 
@@ -244,6 +244,9 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 
    PGconn     *conn;
 
+   conn = connectDatabase(dbname, host, port, username, prompt_password,
+                          progname, false);
+
    initPQExpBuffer(&sql);
 
    appendPQExpBuffer(&sql, "REINDEX");
@@ -252,23 +255,20 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
    else if (strcmp(type, "INDEX") == 0)
        appendPQExpBuffer(&sql, " INDEX %s", name);
    else if (strcmp(type, "DATABASE") == 0)
-       appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
+       appendPQExpBuffer(&sql, " DATABASE %s", fmtId(PQdb(conn)));
    appendPQExpBuffer(&sql, ";\n");
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, false);
-
    if (!executeMaintenanceCommand(conn, sql.data, echo))
    {
        if (strcmp(type, "TABLE") == 0)
            fprintf(stderr, _("%s: reindexing of table \"%s\" in database \"%s\" failed: %s"),
-                   progname, name, dbname, PQerrorMessage(conn));
+                   progname, name, PQdb(conn), PQerrorMessage(conn));
        if (strcmp(type, "INDEX") == 0)
            fprintf(stderr, _("%s: reindexing of index \"%s\" in database \"%s\" failed: %s"),
-                   progname, name, dbname, PQerrorMessage(conn));
+                   progname, name, PQdb(conn), PQerrorMessage(conn));
        else
            fprintf(stderr, _("%s: reindexing of database \"%s\" failed: %s"),
-                   progname, dbname, PQerrorMessage(conn));
+                   progname, PQdb(conn), PQerrorMessage(conn));
        PQfinish(conn);
        exit(1);
    }
@@ -314,16 +314,16 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
                        const char *username, enum trivalue prompt_password,
                        const char *progname, bool echo)
 {
+   PGconn     *conn;
    PQExpBufferData sql;
 
-   PGconn     *conn;
+   conn = connectDatabase(dbname, host, port, username, prompt_password,
+                          progname, false);
 
    initPQExpBuffer(&sql);
 
-   appendPQExpBuffer(&sql, "REINDEX SYSTEM %s;\n", dbname);
+   appendPQExpBuffer(&sql, "REINDEX SYSTEM %s;\n", PQdb(conn));
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, false);
    if (!executeMaintenanceCommand(conn, sql.data, echo))
    {
        fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"),

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index e4dde1fc9bf34481f226de1874ad16c31de153aa..5ac3222bb6d3e04a99b0793f729611bac323be81 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -304,10 +304,10 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool and_analyz
    {
        if (table)
            fprintf(stderr, _("%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"),
-                   progname, table, dbname, PQerrorMessage(conn));
+                   progname, table, PQdb(conn), PQerrorMessage(conn));
        else
            fprintf(stderr, _("%s: vacuuming of database \"%s\" failed: %s"),
-                   progname, dbname, PQerrorMessage(conn));
+                   progname, PQdb(conn), PQerrorMessage(conn));
        PQfinish(conn);
        exit(1);
    }