From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 1 Apr 2020 15:13:22 +0000 (+0200)
Subject: REGTEST: ssl/cli: tests options and filters w/ add ssl crt-list
X-Git-Tag: v2.2-dev6~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdb6db485093510c8e697c82aa4481ed8eae3260;p=thirdparty%2Fhaproxy.git

REGTEST: ssl/cli: tests options and filters w/ add ssl crt-list

Now that the 'add ssl crt-list' command supports filters and options,
add some in the vtc file to test them.
---

diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc
index 173db56c18..a02ccf4a93 100644
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -46,7 +46,7 @@ shell {
    echo "new ssl cert ${testdir}/ecdsa.pem" | socat "${tmpdir}/h1/stats" -
    printf "set ssl cert ${testdir}/ecdsa.pem <<\n$(cat ${testdir}/ecdsa.pem)\n\n" | socat "${tmpdir}/h1/stats" -
    echo "commit ssl cert ${testdir}/ecdsa.pem" | socat "${tmpdir}/h1/stats" -
-   echo "add ssl crt-list ${testdir}/localhost.crt-list ${testdir}/ecdsa.pem" | socat "${tmpdir}/h1/stats" -
+   printf "add ssl crt-list ${testdir}/localhost.crt-list <<\n${testdir}/ecdsa.pem [verify none allow-0rtt] localhost !www.test1.com\n\n" | socat "${tmpdir}/h1/stats" -
 }
 
 haproxy h1 -cli {
@@ -56,7 +56,8 @@ haproxy h1 -cli {
 
 haproxy h1 -cli {
     send "show ssl crt-list ${testdir}/localhost.crt-list"
-    expect ~ ".*${testdir}/ecdsa.pem"
+    # check the options and the filters in any order
+    expect ~ ".*${testdir}/ecdsa.pem \\[(?=.*verify none)(?=.*allow-0rtt).*\\](?=.*!www.test1.com)(?=.*localhost).*"
 }
 
 shell {