Fix pg_stat_ssl.clientdn

petere · petere · commit e77cfa54d700 · 2019-01-29T13:06:33.000+01:00
Return null if there is no client certificate. This is how it has always been documented, but in reality it returned an empty string. Reviewed-by: Kyotaro HORIGUCHI <horiguchi.kyotaro@lab.ntt.co.jp> Discussion: https://www.postgresql.org/message-id/flat/398754d8-6bb5-c5cf-e7b8-22e5f0983caf@2ndquadrant.com/
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
@@ -652,7 +652,10 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 			values[20] = CStringGetTextDatum(beentry->st_sslstatus->ssl_cipher);
 			values[21] = Int32GetDatum(beentry->st_sslstatus->ssl_bits);
 			values[22] = BoolGetDatum(beentry->st_sslstatus->ssl_compression);
-			values[23] = CStringGetTextDatum(beentry->st_sslstatus->ssl_clientdn);
+			if (beentry->st_sslstatus->ssl_clientdn[0])
+				values[23] = CStringGetTextDatum(beentry->st_sslstatus->ssl_clientdn);
+			else
+				nulls[23] = true;
 		}
 		else
 		{
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
@@ -316,7 +316,7 @@
 	'-c', "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
 			 ],
 			 qr{^pid,ssl,version,cipher,bits,compression,clientdn\n
-				^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,$}mx,
+				^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,_null_$}mx,
 			 'pg_stat_ssl view without client certificate');
 
 ### Server-side tests.

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,10 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)`
`652`	`652`	`values[20] = CStringGetTextDatum(beentry->st_sslstatus->ssl_cipher);`
`653`	`653`	`values[21] = Int32GetDatum(beentry->st_sslstatus->ssl_bits);`
`654`	`654`	`values[22] = BoolGetDatum(beentry->st_sslstatus->ssl_compression);`
`655`		`- values[23] = CStringGetTextDatum(beentry->st_sslstatus->ssl_clientdn);`
	`655`	`+ if (beentry->st_sslstatus->ssl_clientdn[0])`
	`656`	`+ values[23] = CStringGetTextDatum(beentry->st_sslstatus->ssl_clientdn);`
	`657`	`+ else`
	`658`	`+ nulls[23] = true;`
`656`	`659`	`}`
`657`	`660`	`else`
`658`	`661`	`{`