]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTEST: checks: Adapt SSL error message reported when connection is rejected
authorChristopher Faulet <cfaulet@haproxy.com>
Wed, 6 May 2020 09:10:51 +0000 (11:10 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Wed, 6 May 2020 10:45:11 +0000 (12:45 +0200)
Depending on the SSL library version, the reported error may differ when the
connection is rejected during the handshake. An empty handshke may be detected
or just an generic handshake error. So tcp-check-ssl.vtc has been adapted to
support both error messages.

reg-tests/checks/tcp-check-ssl.vtc

index e5863580cf6d91da0c74ee88e3b16def0ab51903..149bf7a039d82a8209fd5e4ada3c83e0f8896f2c 100644 (file)
@@ -32,14 +32,14 @@ syslog S3 -level notice {
     recv
     expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
     recv
-    expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+info: \"SSL handshake failure\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
+    expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+info: \"(Connection closed during SSL handshake|SSL handshake failure)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
 } -start
 
 syslog S4 -level notice {
     recv
     expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started."
     recv
-    expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer6 invalid response.+info: \"SSL handshake failure at step 1 of tcp-check \\(connect\\)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
+    expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer6 invalid response.+info: \"(Connection closed during SSL handshake|SSL handshake failure) at step 1 of tcp-check \\(connect\\)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
 } -start