mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpq: Trace StartupMessage/SSLRequest/GSSENCRequest correctly

Browse Source 
libpq tracing via PQtrace would uselessly print the wrong thing for
these types of messages.  With this commit, their type and contents
would be correctly listed.  (This can be verified with PQconnectStart(),
but we don't use that in libpq_pipeline, so I (Álvaro) haven't bothered
to add any tests.)

Author: Jelte Fennema-Nio <postgres@jeltef.nl>
Discussion: https://postgr.es/m/CAGECzQSoPHtZ4xe0raJ6FYSEiPPS+YWXBhOGo+Y1YecLgknF3g@mail.gmail.com
This commit is contained in:
Alvaro Herrera 2024-08-09 17:55:01 -04:00
parent a79ed10e6c
commit 7adec2d5fc
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
1 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/interfaces/libpq/fe-trace.c
View File

@ -707,8 +707,12 @@ void
pqTraceOutputNoTypeByteMessage(PGconn *conn, const char *message) pqTraceOutputNoTypeByteMessage(PGconn *conn, const char *message)
{ {
int length; int length;
int version;
bool regress;
int logCursor = 0; int logCursor = 0;
regress = (conn->traceFlags & PQTRACE_REGRESS_MODE) != 0;
if ((conn->traceFlags & PQTRACE_SUPPRESS_TIMESTAMPS) == 0) if ((conn->traceFlags & PQTRACE_SUPPRESS_TIMESTAMPS) == 0)
{ {
char timestr[128]; char timestr[128];
@ -723,19 +727,46 @@ pqTraceOutputNoTypeByteMessage(PGconn *conn, const char *message)
fprintf(conn->Pfdebug, "F\t%d\t", length); fprintf(conn->Pfdebug, "F\t%d\t", length);
switch (length) if (length < 8)
{
fprintf(conn->Pfdebug, "Unknown message\n");
return;
}
memcpy(&version, message + logCursor, 4);
version = (int) pg_ntoh32(version);
if (version == CANCEL_REQUEST_CODE && length >= 16)
{ {
case 16: /* CancelRequest */
fprintf(conn->Pfdebug, "CancelRequest\t"); fprintf(conn->Pfdebug, "CancelRequest\t");
pqTraceOutputInt32(conn->Pfdebug, message, &logCursor, false); pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
pqTraceOutputInt32(conn->Pfdebug, message, &logCursor, false); pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
pqTraceOutputInt32(conn->Pfdebug, message, &logCursor, false); pqTraceOutputInt32(conn->Pfdebug, message, &logCursor, regress);
break; pqTraceOutputInt32(conn->Pfdebug, message, &logCursor, regress);
case 8: /* GSSENCRequest or SSLRequest */ }
/* These messages do not reach here. */ else if (version == NEGOTIATE_SSL_CODE)
default: {
fprintf(conn->Pfdebug, "Unknown message: length is %d", length); fprintf(conn->Pfdebug, "SSLRequest\t");
break; pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
}
else if (version == NEGOTIATE_GSS_CODE)
{
fprintf(conn->Pfdebug, "GSSENCRequest\t");
pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
}
else
{
fprintf(conn->Pfdebug, "StartupMessage\t");
pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
pqTraceOutputInt16(conn->Pfdebug, message, &logCursor);
while (message[logCursor] != '\0')
{
/* XXX should we suppress anything in regress mode? */
pqTraceOutputString(conn->Pfdebug, message, &logCursor, false);
pqTraceOutputString(conn->Pfdebug, message, &logCursor, false);
}
} }
fputc('\n', conn->Pfdebug); fputc('\n', conn->Pfdebug);