Fix assorted minor bogosity in GSSAPI transport error messages.

tglsfdc · tglsfdc · commit 8cde7f49483d · 2019-04-17T17:06:50.000-04:00
I noted that some buildfarm members were complaining about %ld being
used to format values that are (probably) declared size_t.  Use %zu
instead, and insert a cast just in case some versions of the GSSAPI
API declare the length field differently.  While at it, clean up
gratuitous differences in wording of equivalent messages, show
the complained-of length in all relevant messages not just some,
include trailing newline where needed, adjust random deviations
from project-standard code layout and message style, etc.
diff --git a/src/backend/libpq/be-secure-gssapi.c b/src/backend/libpq/be-secure-gssapi.c
@@ -14,17 +14,16 @@
 
 #include "postgres.h"
 
-#include "be-gssapi-common.h"
+#include <unistd.h>
 
+#include "be-gssapi-common.h"
 #include "libpq/auth.h"
 #include "libpq/libpq.h"
 #include "libpq/libpq-be.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 
-#include <unistd.h>
-
 
 /*
  * Handle the encryption/decryption of data using GSSAPI.
@@ -179,10 +178,13 @@ be_gssapi_write(Port *port, void *ptr, size_t len)
 			pg_GSS_error(FATAL, gettext_noop("GSSAPI wrap error"), major, minor);
 
 		if (conf == 0)
-			ereport(FATAL, (errmsg("GSSAPI did not provide confidentiality")));
+			ereport(FATAL,
+					(errmsg("GSSAPI did not provide confidentiality")));
 
 		if (output.length > PQ_GSS_SEND_BUFFER_SIZE - sizeof(uint32))
-			ereport(FATAL, (errmsg("GSSAPI tried to send packet of size: %ld", output.length)));
+			ereport(FATAL,
+					(errmsg("server tried to send oversize GSSAPI packet: %zu bytes",
+							(size_t) output.length)));
 
 		bytes_encrypted += input.length;
 		bytes_to_encrypt -= input.length;
@@ -297,7 +299,9 @@ be_gssapi_read(Port *port, void *ptr, size_t len)
 
 		/* Check for over-length packet */
 		if (input.length > PQ_GSS_RECV_BUFFER_SIZE - sizeof(uint32))
-			ereport(FATAL, (errmsg("Over-size GSSAPI packet sent by the client.")));
+			ereport(FATAL,
+					(errmsg("oversize GSSAPI packet sent by the client: %zu bytes",
+							(size_t) input.length)));
 
 		/*
 		 * Read as much of the packet as we are able to on this call into
@@ -341,7 +345,8 @@ be_gssapi_read(Port *port, void *ptr, size_t len)
 						 major, minor);
 
 		if (conf == 0)
-			ereport(FATAL, (errmsg("GSSAPI did not provide confidentiality")));
+			ereport(FATAL,
+					(errmsg("GSSAPI did not provide confidentiality")));
 
 		memcpy(PqGSSResultBuffer, output.value, output.length);
 
@@ -492,7 +497,9 @@ secure_open_gssapi(Port *port)
 		 * Verify on our side that the client doesn't do something funny.
 		 */
 		if (input.length > PQ_GSS_RECV_BUFFER_SIZE)
-			ereport(FATAL, (errmsg("Over-size GSSAPI packet sent by the client: %ld", input.length)));
+			ereport(FATAL,
+					(errmsg("oversize GSSAPI packet sent by the client: %zu bytes",
+							(size_t) input.length)));
 
 		/*
 		 * Get the rest of the packet so we can pass it to GSSAPI to accept
@@ -538,7 +545,9 @@ secure_open_gssapi(Port *port)
 			uint32		netlen = htonl(output.length);
 
 			if (output.length > PQ_GSS_SEND_BUFFER_SIZE - sizeof(uint32))
-				ereport(FATAL, (errmsg("GSSAPI tried to send oversize packet")));
+				ereport(FATAL,
+						(errmsg("server tried to send oversize GSSAPI packet: %zu bytes",
+								(size_t) output.length)));
 
 			memcpy(PqGSSSendBuffer, (char *) &netlen, sizeof(uint32));
 			PqGSSSendPointer += sizeof(uint32);
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -16,7 +16,6 @@
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fe-gssapi-common.h"
-
 #include "port/pg_bswap.h"
 
 /*
@@ -163,15 +162,16 @@ pg_GSS_write(PGconn *conn, const void *ptr, size_t len)
 		}
 		else if (conf == 0)
 		{
-			printfPQExpBuffer(&conn->errorMessage, libpq_gettext(
-																 "GSSAPI did not provide confidentiality\n"));
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("GSSAPI did not provide confidentiality\n"));
 			goto cleanup;
 		}
 
 		if (output.length > PQ_GSS_SEND_BUFFER_SIZE - sizeof(uint32))
 		{
-			printfPQExpBuffer(&conn->errorMessage, libpq_gettext(
-																 "GSSAPI attempt to send oversize packet\n"));
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("client tried to send oversize GSSAPI packet: %zu bytes\n"),
+							  (size_t) output.length);
 			goto cleanup;
 		}
 
@@ -286,8 +286,8 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 		/* Check for over-length packet */
 		if (input.length > PQ_GSS_RECV_BUFFER_SIZE - sizeof(uint32))
 		{
-			printfPQExpBuffer(&conn->errorMessage, libpq_gettext(
-																 "GSSAPI did not provide confidentiality\n"));
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("GSSAPI did not provide confidentiality\n"));
 			ret = -1;
 			goto cleanup;
 		}
@@ -328,8 +328,8 @@ pg_GSS_read(PGconn *conn, void *ptr, size_t len)
 		}
 		else if (conf == 0)
 		{
-			printfPQExpBuffer(&conn->errorMessage, libpq_gettext(
-																 "GSSAPI did not provide confidentiality\n"));
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("GSSAPI did not provide confidentiality\n"));
 			ret = -1;
 			goto cleanup;
 		}
@@ -476,7 +476,7 @@ pqsecure_open_gss(PGconn *conn)
 
 			PqGSSRecvLength += ret;
 
-			printfPQExpBuffer(&conn->errorMessage, "%s", PqGSSRecvBuffer + 1);
+			printfPQExpBuffer(&conn->errorMessage, "%s\n", PqGSSRecvBuffer + 1);
 
 			return PGRES_POLLING_FAILED;
 		}
@@ -490,7 +490,9 @@ pqsecure_open_gss(PGconn *conn)
 		input.length = ntohl(*(uint32 *) PqGSSRecvBuffer);
 		if (input.length > PQ_GSS_RECV_BUFFER_SIZE - sizeof(uint32))
 		{
-			printfPQExpBuffer(&conn->errorMessage, libpq_gettext("Over-size GSSAPI packet sent by the server: %ld"), input.length);
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("oversize GSSAPI packet sent by the server: %zu bytes\n"),
+							  (size_t) input.length);
 			return PGRES_POLLING_FAILED;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`#include "libpq-fe.h"`
`17`	`17`	`#include "libpq-int.h"`
`18`	`18`	`#include "fe-gssapi-common.h"`
`19`		`-`
`20`	`19`	`#include "port/pg_bswap.h"`
`21`	`20`
`22`	`21`	`/*`
`@@ -163,15 +162,16 @@ pg_GSS_write(PGconn conn, const void ptr, size_t len)`
`163`	`162`	`}`
`164`	`163`	`else if (conf == 0)`
`165`	`164`	`{`
`166`		`- printfPQExpBuffer(&conn->errorMessage, libpq_gettext(`
`167`		`- "GSSAPI did not provide confidentiality\n"));`
	`165`	`+ printfPQExpBuffer(&conn->errorMessage,`
	`166`	`+ libpq_gettext("GSSAPI did not provide confidentiality\n"));`
`168`	`167`	`goto cleanup;`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`if (output.length > PQ_GSS_SEND_BUFFER_SIZE - sizeof(uint32))`
`172`	`171`	`{`
`173`		`- printfPQExpBuffer(&conn->errorMessage, libpq_gettext(`
`174`		`- "GSSAPI attempt to send oversize packet\n"));`
	`172`	`+ printfPQExpBuffer(&conn->errorMessage,`
	`173`	`+ libpq_gettext("client tried to send oversize GSSAPI packet: %zu bytes\n"),`
	`174`	`+ (size_t) output.length);`
`175`	`175`	`goto cleanup;`
`176`	`176`	`}`
`177`	`177`
`@@ -286,8 +286,8 @@ pg_GSS_read(PGconn conn, void ptr, size_t len)`
`286`	`286`	`/* Check for over-length packet */`
`287`	`287`	`if (input.length > PQ_GSS_RECV_BUFFER_SIZE - sizeof(uint32))`
`288`	`288`	`{`
`289`		`- printfPQExpBuffer(&conn->errorMessage, libpq_gettext(`
`290`		`- "GSSAPI did not provide confidentiality\n"));`
	`289`	`+ printfPQExpBuffer(&conn->errorMessage,`
	`290`	`+ libpq_gettext("GSSAPI did not provide confidentiality\n"));`
`291`	`291`	`ret = -1;`
`292`	`292`	`goto cleanup;`
`293`	`293`	`}`
`@@ -328,8 +328,8 @@ pg_GSS_read(PGconn conn, void ptr, size_t len)`
`328`	`328`	`}`
`329`	`329`	`else if (conf == 0)`
`330`	`330`	`{`
`331`		`- printfPQExpBuffer(&conn->errorMessage, libpq_gettext(`
`332`		`- "GSSAPI did not provide confidentiality\n"));`
	`331`	`+ printfPQExpBuffer(&conn->errorMessage,`
	`332`	`+ libpq_gettext("GSSAPI did not provide confidentiality\n"));`
`333`	`333`	`ret = -1;`
`334`	`334`	`goto cleanup;`
`335`	`335`	`}`
`@@ -476,7 +476,7 @@ pqsecure_open_gss(PGconn *conn)`
`476`	`476`
`477`	`477`	`PqGSSRecvLength += ret;`
`478`	`478`
`479`		`- printfPQExpBuffer(&conn->errorMessage, "%s", PqGSSRecvBuffer + 1);`
	`479`	`+ printfPQExpBuffer(&conn->errorMessage, "%s\n", PqGSSRecvBuffer + 1);`
`480`	`480`
`481`	`481`	`return PGRES_POLLING_FAILED;`
`482`	`482`	`}`
`@@ -490,7 +490,9 @@ pqsecure_open_gss(PGconn *conn)`
`490`	`490`	`input.length = ntohl((uint32 ) PqGSSRecvBuffer);`
`491`	`491`	`if (input.length > PQ_GSS_RECV_BUFFER_SIZE - sizeof(uint32))`
`492`	`492`	`{`
`493`		`- printfPQExpBuffer(&conn->errorMessage, libpq_gettext("Over-size GSSAPI packet sent by the server: %ld"), input.length);`
	`493`	`+ printfPQExpBuffer(&conn->errorMessage,`
	`494`	`+ libpq_gettext("oversize GSSAPI packet sent by the server: %zu bytes\n"),`
	`495`	`+ (size_t) input.length);`
`494`	`496`	`return PGRES_POLLING_FAILED;`
`495`	`497`	`}`
`496`	`498`