diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index cc7d797..10732b2 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1029,11 +1029,96 @@ INSERT INTO tbl1 VALUES ($1, $2) \bind 'first value' 'second value' \g - \conninfo + \conninfo[+] Outputs information about the current database connection. + When no + is appended, it simply prints + a textual (string) description of a few connection options. + When + is given, more complete information + is displayed as a table containing the following columns. + + + General columns: + + + + Database: blah blah blah + + + + Authenticated User: blah blah blah + + + + System User: blah blah blah + + + + Current User: blah blah blah + + + + Session User: blah blah blah + + + + Backend PID: blah blah blah + + + + Server Address: blah blah blah + + + + Server Port: blah blah blah + + + + Client Address: blah blah blah + + + + Client Port: blah blah blah + + + + Socket Directory: blah blah blah + + + + Host: blah blah blah + + + + TLS (SSL) authentication columns: + + + + Encryption: blah blah blah + + + + Protocol: blah blah blah + + + + Cipher: blah blah blah + + + + Compression: blah blah blah + + + + GSS authentication column: + + + + GSSAPI: blah blah blah + + diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 5c906e4..cb5429f 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -68,7 +68,8 @@ static backslashResult exec_command_C(PsqlScanState scan_state, bool active_bran static backslashResult exec_command_connect(PsqlScanState scan_state, bool active_branch); static backslashResult exec_command_cd(PsqlScanState scan_state, bool active_branch, const char *cmd); -static backslashResult exec_command_conninfo(PsqlScanState scan_state, bool active_branch); +static backslashResult exec_command_conninfo(PsqlScanState scan_state, bool active_branch, + const char *cmd); static backslashResult exec_command_copy(PsqlScanState scan_state, bool active_branch); static backslashResult exec_command_copyright(PsqlScanState scan_state, bool active_branch); static backslashResult exec_command_crosstabview(PsqlScanState scan_state, bool active_branch); @@ -317,8 +318,8 @@ exec_command(const char *cmd, status = exec_command_connect(scan_state, active_branch); else if (strcmp(cmd, "cd") == 0) status = exec_command_cd(scan_state, active_branch, cmd); - else if (strcmp(cmd, "conninfo") == 0) - status = exec_command_conninfo(scan_state, active_branch); + else if (strcmp(cmd, "conninfo") == 0 || strcmp(cmd, "conninfo+") == 0) + status = exec_command_conninfo(scan_state, active_branch, cmd); else if (pg_strcasecmp(cmd, "copy") == 0) status = exec_command_copy(scan_state, active_branch); else if (strcmp(cmd, "copyright") == 0) @@ -643,47 +644,80 @@ exec_command_cd(PsqlScanState scan_state, bool active_branch, const char *cmd) } /* - * \conninfo -- display information about the current connection + * \conninfo, \conninfo+ -- display information about the current connection */ static backslashResult -exec_command_conninfo(PsqlScanState scan_state, bool active_branch) +exec_command_conninfo(PsqlScanState scan_state, bool active_branch, const char *cmd) { + bool success = true; + if (active_branch) { char *db = PQdb(pset.db); + bool show_verbose; + + show_verbose = strchr(cmd, '+') ? true : false; - if (db == NULL) - printf(_("You are currently not connected to a database.\n")); + /* + * \conninfo+ + */ + if (show_verbose) + success = listConnectionInformation(); + + /* + * \conninfo + */ else { - char *host = PQhost(pset.db); - char *hostaddr = PQhostaddr(pset.db); + PGresult *res; + PQExpBufferData buf; - if (is_unixsock_path(host)) - { - /* hostaddr overrides host */ - if (hostaddr && *hostaddr) - printf(_("You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"), - db, PQuser(pset.db), hostaddr, PQport(pset.db)); - else - printf(_("You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"), - db, PQuser(pset.db), host, PQport(pset.db)); - } + initPQExpBuffer(&buf); + + printfPQExpBuffer(&buf, + "SELECT\n" + " inet_server_addr();"); + + res = PSQLexec(buf.data); + + termPQExpBuffer(&buf); + + if (!res) + return PSQL_CMD_ERROR; else { - if (hostaddr && *hostaddr && strcmp(host, hostaddr) != 0) - printf(_("You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"), - db, PQuser(pset.db), host, hostaddr, PQport(pset.db)); + char *host = PQhost(pset.db); + char *hostaddr = PQhostaddr(pset.db); + + if (is_unixsock_path(host)) + { + /* hostaddr overrides host */ + if (hostaddr && *hostaddr) + printf(_("You are connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"), + db, PQuser(pset.db), PQgetvalue(res, 0, 0), PQport(pset.db)); + else + printf(_("You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"), + db, PQuser(pset.db), host, PQport(pset.db)); + } else - printf(_("You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"), - db, PQuser(pset.db), host, PQport(pset.db)); + { + if (hostaddr && *hostaddr && strcmp(host, hostaddr) != 0) + printf(_("You are connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"), + db, PQuser(pset.db), host, PQgetvalue(res, 0, 0), PQport(pset.db)); + else + printf(_("You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"), + db, PQuser(pset.db), host, PQport(pset.db)); + } + PQclear(res); + printSSLInfo(); + printGSSInfo(); } - printSSLInfo(); - printGSSInfo(); } } + else + ignore_slash_options(scan_state); - return PSQL_CMD_SKIP_LINE; + return success ? PSQL_CMD_SKIP_LINE : PSQL_CMD_ERROR; } /* diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index b6a4eb1..2ef3db0 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -26,6 +26,7 @@ #include "fe_utils/mbprint.h" #include "fe_utils/print.h" #include "fe_utils/string_utils.h" +#include "libpq/pqcomm.h" #include "settings.h" #include "variables.h" @@ -901,6 +902,91 @@ error_return: return false; } +/* + * listConnectionInformation + * + * for \conninfo+ + */ +bool +listConnectionInformation(void) +{ + PGresult *res; + PQExpBufferData buf; + printQueryOpt myopt = pset.popt; + + char *host = PQhost(pset.db); + char *hostaddr = PQhostaddr(pset.db); + const char *protocol; + const char *cipher; + const char *compression; + + initPQExpBuffer(&buf); + + printfPQExpBuffer(&buf, + "SELECT\n" + " pg_catalog.current_database() AS \"Database\",\n" + " '%s' AS \"Authenticated User\",\n", + PQuser(pset.db)); + if (pset.sversion >= 160000) + appendPQExpBuffer(&buf, + " pg_catalog.system_user() AS \"System User\",\n"); + appendPQExpBuffer(&buf, + " pg_catalog.current_user() AS \"Current User\",\n" + " pg_catalog.session_user() AS \"Session User\",\n" + " pg_catalog.pg_backend_pid() AS \"Backend PID\",\n" + " pg_catalog.inet_server_addr() AS \"Server Address\",\n" + " pg_catalog.current_setting('port') AS \"Server Port\",\n" + " pg_catalog.inet_client_addr() AS \"Client Address\",\n" + " pg_catalog.inet_client_port() AS \"Client Port\",\n"); + if (is_unixsock_path(host) && !(hostaddr && *hostaddr)) + appendPQExpBuffer(&buf, + " '%s' AS \"Socket Directory\",\n", + host); + else + appendPQExpBuffer(&buf, + " NULL AS \"Socket Directory\",\n"); + appendPQExpBuffer(&buf, + " CASE\n" + " WHEN\n" + " pg_catalog.inet_server_addr() IS NULL\n" + " AND pg_catalog.inet_client_addr() IS NULL\n" + " THEN NULL\n" + " ELSE '%s'\n" + " END AS \"Host\"\n", + host); + if (PQsslInUse(pset.db)) + { + protocol = PQsslAttribute(pset.db, "protocol"); + cipher = PQsslAttribute(pset.db, "cipher"); + compression = PQsslAttribute(pset.db, "compression"); + appendPQExpBuffer(&buf, + " ,'SSL' AS \"Encryption\",\n" + " '%s' AS \"Protocol\",\n" + " '%s' AS \"Cipher\",\n" + " '%s' AS \"Compression\"\n", + protocol ? protocol : _("unknown"), + cipher ? cipher : _("unknown"), + (compression && strcmp(compression, "off") != 0) ? _("on") : _("off")); + } + if (PQgssEncInUse(pset.db)) + appendPQExpBuffer(&buf, + " ,'GSSAPI' AS \"Encryption\"\n"); + appendPQExpBuffer(&buf, + " ;"); + + res = PSQLexec(buf.data); + termPQExpBuffer(&buf); + if (!res) + return false; + + myopt.title = _("Current Connection Information"); + myopt.translate_header = true; + + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + + PQclear(res); + return true; +} /* * listAllDbs diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 273f974..8a4e83f 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -64,6 +64,9 @@ extern bool listTSDictionaries(const char *pattern, bool verbose); /* \dFt */ extern bool listTSTemplates(const char *pattern, bool verbose); +/* \conninfo */ +extern bool listConnectionInformation(void); + /* \l */ extern bool listAllDbs(const char *pattern, bool verbose); diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 4e79a81..2c5426d 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -310,7 +310,7 @@ slashUsage(unsigned short int pager) else HELP0(" \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n" " connect to new database (currently no connection)\n"); - HELP0(" \\conninfo display information about current connection\n"); + HELP0(" \\conninfo[+] display information about current connection\n"); HELP0(" \\encoding [ENCODING] show or set client encoding\n"); HELP0(" \\password [USERNAME] securely change the password for a user\n"); HELP0("\n");