Commite77cfa5

committed

Fix pg_stat_ssl.clientdn

Return null if there is no client certificate. This is how it hasalways 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/

1 parent1805954 commite77cfa5Copy full SHA for e77cfa5

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

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`	`{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@`
`316`	`316`	`'-c',"SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"`
`317`	`317`	`],`
`318`	`318`	`qr{^pid,ssl,version,cipher,bits,compression,clientdn\n`
`319`		`-^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,$}mx,`
	`319`	`+^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,_null_$}mx,`
`320`	`320`	`'pg_stat_ssl view without client certificate');`
`321`	`321`
`322`	`322`	`### Server-side tests.`

Comments

(0)