database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Fix check for PGHOST[ADDR] in pg_upgrade with Windows and temporary paths

Browse Source 
The checks currently done at the startup of pg_upgrade on PGHOST and
PGHOSTADDR to avoid any attempts to access to an external cluster fail
setting those parameters to Windows paths or even temporary paths
prefixed by an '@', as it only considers as a valid path strings
beginning with a slash.

As mentioned by Andres, is_unixsock_path() is designed to detect such
cases, so, like any other code paths dealing with the same problem (psql
and libpq), use it rather than assuming that all valid paths are
prefixed with just a slash.

This issue has been found while testing the TAP tests of pg_upgrade
through the CI on Windows.  This is a bug, but nobody has complained
about it since pg_upgrade exists so no backpatch is done, at least for
now.

Analyzed-by: Andres Freund, Michael Paquier
Discussion: https://postgr.es/m/YeYj4DU5qY/rtKXT@paquier.xyz
This commit is contained in:
Michael Paquier 2022-03-02 07:37:07 +09:00
parent 9028cce426
commit dc57366c58
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/pg_upgrade/server.c
View File

@ -11,6 +11,7 @@
#include "common/connect.h" #include "common/connect.h"
#include "fe_utils/string_utils.h" #include "fe_utils/string_utils.h"
#include "libpq/pqcomm.h"
#include "pg_upgrade.h" #include "pg_upgrade.h"
static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name); static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name);
@ -368,7 +369,7 @@ check_pghost_envvar(void)
if (value && strlen(value) > 0 && if (value && strlen(value) > 0 &&
/* check for 'local' host values */ /* check for 'local' host values */
(strcmp(value, "localhost") != 0 && strcmp(value, "127.0.0.1") != 0 && (strcmp(value, "localhost") != 0 && strcmp(value, "127.0.0.1") != 0 &&
strcmp(value, "::1") != 0 && value[0] != '/')) strcmp(value, "::1") != 0 && !is_unixsock_path(value)))
pg_fatal("libpq environment variable %s has a non-local server value: %s\n", pg_fatal("libpq environment variable %s has a non-local server value: %s\n",
option->envvar, value); option->envvar, value);
} }