diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2023-04-19 12:54:58 +0200 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2023-04-19 12:54:58 +0200 |
| commit | 0b5d1fb36adda612bd3d5d032463a6eeb0729237 (patch) | |
| tree | 0526f777b9b6ba94fe17d3e01b3ec97fcd85fd44 /src/test | |
| parent | 77dedeb2c45745f592b504e181fa9d391d9afff0 (diff) | |
| download | postgresql-0b5d1fb36adda612bd3d5d032463a6eeb0729237.tar.gz | |
Fix errormessage for missing system CA in OpenSSL 3.1
The error message for a missing or invalid system CA when using
sslrootcert=system differs based on the OpenSSL version used.
In OpenSSL 1.0.1-3.0 it is reported as SSL Error, with varying
degrees of helpfulness in the error message. With OpenSSL 3.1 it
is reported as an SSL SYSCALL error with "Undefined error" as
the error message. This fix pulls out the particular error in
OpenSSL 3.1 as a certificate verify error in order to help the
user better figure out what happened, and to keep the ssl test
working. While there is no evidence that extracing the errors
will clobber errno, this adds a guard against that regardless
to also make the consistent with how we handle OpenSSL errors
elsewhere. It also memorizes the output from OpenSSL 3.0 in
the test in cases where the system CA isn't responding.
Reported-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
Discussion: https://postgr.es/m/c39be3c5-c1a5-1e33-1024-16f527e251a4@enterprisedb.com
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ssl/t/001_ssltests.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl index 6fdc040cfc..e7956cb1a0 100644 --- a/src/test/ssl/t/001_ssltests.pl +++ b/src/test/ssl/t/001_ssltests.pl @@ -476,10 +476,12 @@ $common_connstr = "$default_ssl_connstr user=ssltestuser dbname=trustdb sslrootcert=system hostaddr=$SERVERHOSTADDR"; # By default our custom-CA-signed certificate should not be trusted. +# OpenSSL 3.0 reports a missing/invalid system CA as "unregistered schema" +# instead of a failed certificate verification. $node->connect_fails( "$common_connstr sslmode=verify-full host=common-name.pg-ssltest.test", "sslrootcert=system does not connect with private CA", - expected_stderr => qr/SSL error: certificate verify failed/); + expected_stderr => qr/SSL error: (certificate verify failed|unregistered scheme)/); # Modes other than verify-full cannot be mixed with sslrootcert=system. $node->connect_fails( |