libpq: If ALPN is not used, make PQsslAttribute(conn, "alpn") == ""

hlinnaka · hlinnaka · commit 3c184092651b · 2024-04-29T12:26:46.000+03:00
The documentation says that PQsslAttribute(conn, "alpn") returns an empty string if ALPN is not used, but the code actually returned NULL. Fix the code to match the documentation. Reported-by: Michael Paquier Discussion: https://www.postgresql.org/message-id/ZideNHji0G4gxmc3@paquier.xyz
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -3896,7 +3896,7 @@ printSSLInfo(void)
 		   protocol ? protocol : _("unknown"),
 		   cipher ? cipher : _("unknown"),
 		   (compression && strcmp(compression, "off") != 0) ? _("on") : _("off"),
-		   alpn ? alpn : _("none"));
+		   (alpn && alpn[0] != '\0') ? alpn : _("none"));
 }
 
 /*
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
@@ -1837,7 +1837,7 @@ PQsslAttribute(PGconn *conn, const char *attribute_name)
 
 		SSL_get0_alpn_selected(conn->ssl, &data, &len);
 		if (data == NULL || len == 0 || len > sizeof(alpn_str) - 1)
-			return NULL;
+			return "";
 		memcpy(alpn_str, data, len);
 		alpn_str[len] = 0;
 		return alpn_str;

Original file line number	Diff line number	Diff line change
`@@ -3896,7 +3896,7 @@ printSSLInfo(void)`
`3896`	`3896`	`protocol ? protocol : _("unknown"),`
`3897`	`3897`	`cipher ? cipher : _("unknown"),`
`3898`	`3898`	`(compression && strcmp(compression, "off") != 0) ? _("on") : _("off"),`
`3899`		`- alpn ? alpn : _("none"));`
	`3899`	`+ (alpn && alpn[0] != '\0') ? alpn : _("none"));`
`3900`	`3900`	`}`
`3901`	`3901`
`3902`	`3902`	`/*`