rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_receivewal, pg_recvlogical: allow canceling initial password prompt. 

Previously it was impossible to terminate these programs via control-C
while they were prompting for a password.  We can fix that trivially
for their initial password prompts, by moving setup of the SIGINT
handler from just before to just after their initial GetConnection()
calls.

This fix doesn't permit escaping out of later re-prompts, but those
should be exceedingly rare, since the user's password or the server's
authentication setup would have to have changed meanwhile.  We
considered applying a fix similar to commit 46d665bc2, but that
seemed more complicated than it'd be worth.  Moreover, this way is
back-patchable, which that wasn't.

The misbehavior exists in all supported versions, so back-patch to all.

Tom Lane and Nathan Bossart

Discussion: https://postgr.es/m/747443.1635536754@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2021-11-21 14:13:35 -05:00
parent 33b6dd83e2
commit 33edf4a3ca
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/pg_basebackup/pg_receivewal.c
View File

@ -675,10 +675,6 @@ main(int argc, char **argv)
close_destination_dir(dir, basedir);
}
#ifndef WIN32
pqsignal(SIGINT, sigint_handler);
#endif
/*
* Obtain a connection before doing anything.
*/
@ -688,6 +684,14 @@ main(int argc, char **argv)
exit(1);
atexit(disconnect_atexit);
/*
* Trap signals. (Don't do this until after the initial password prompt,
* if one is needed, in GetConnection.)
*/
#ifndef WIN32
pqsignal(SIGINT, sigint_handler);
#endif
/*
* Run IDENTIFY_SYSTEM to make sure we've successfully have established a
* replication connection and haven't connected using a database specific

22
src/bin/pg_basebackup/pg_recvlogical.c
View File

@ -212,8 +212,6 @@ StreamLogicalLog(void)
output_written_lsn = InvalidXLogRecPtr;
output_fsync_lsn = InvalidXLogRecPtr;
query = createPQExpBuffer();
/*
* Connect in replication mode to the server
*/
@ -232,6 +230,7 @@ StreamLogicalLog(void)
replication_slot);
/* Initiate the replication stream at specified location */
query = createPQExpBuffer();
appendPQExpBuffer(query, "START_REPLICATION SLOT \"%s\" LOGICAL %X/%X",
replication_slot, (uint32) (startpos >> 32), (uint32) startpos);
@ -920,15 +919,9 @@ main(int argc, char **argv)
exit(1);
}
#ifndef WIN32
pqsignal(SIGINT, sigint_handler);
pqsignal(SIGHUP, sighup_handler);
#endif
/*
* Obtain a connection to server. This is not really necessary but it
* helps to get more precise error messages about authentication, required
* GUC parameters and such.
* Obtain a connection to server. Notably, if we need a password, we want
* to collect it from the user immediately.
*/
conn = GetConnection();
if (!conn)
@ -936,6 +929,15 @@ main(int argc, char **argv)
exit(1);
atexit(disconnect_atexit);
/*
* Trap signals. (Don't do this until after the initial password prompt,
* if one is needed, in GetConnection.)
*/
#ifndef WIN32
pqsignal(SIGINT, sigint_handler);
pqsignal(SIGHUP, sighup_handler);
#endif
/*
* Run IDENTIFY_SYSTEM to make sure we connected using a database specific
* replication connection.