From fcc73f8c7307f12c40efe20f9855e501c9ff1765 Mon Sep 17 00:00:00 2001 From: Frederic Lecaille Date: Tue, 2 Dec 2025 08:00:53 +0100 Subject: [PATCH] REGTESTS: quic: ssl_server_samples.vtc supported by QUIC ssl/ssl_server_samples.vtc was renamed to ssl/ssl_server_samples.vtci to produce a common part runnable both for QUIC and TCP listeners. Then ssl_server_samples.vtc files were created both under ssl and quic directories to call this .vtci file with correct VTC_SOCK_TYPE environment values ("quic" for QUIC listeners and "stream" for TCP listeners); --- reg-tests/quic/ssl_server_samples.vtc | 8 +++ reg-tests/ssl/ssl_server_samples.vtc | 75 +------------------------- reg-tests/ssl/ssl_server_samples.vtci | 78 +++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 73 deletions(-) create mode 100644 reg-tests/quic/ssl_server_samples.vtc create mode 100644 reg-tests/ssl/ssl_server_samples.vtci diff --git a/reg-tests/quic/ssl_server_samples.vtc b/reg-tests/quic/ssl_server_samples.vtc new file mode 100644 index 000000000..419674647 --- /dev/null +++ b/reg-tests/quic/ssl_server_samples.vtc @@ -0,0 +1,8 @@ +#REGTEST_TYPE=devel + +varnishtest "Test the ssl_s_* sample fetches" +# QUIC backend are not supported with USE_QUIC_OPENSSL_COMPAT +feature cmd "$HAPROXY_PROGRAM -cc 'feature(QUIC) && !feature(QUIC_OPENSSL_COMPAT) && !feature(OPENSSL_WOLFSSL)'" + +setenv VTC_SOCK_TYPE quic +include ${testdir}/../ssl/ssl_server_samples.vtci diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc index 9e1fe9268..39ed4f9d2 100644 --- a/reg-tests/ssl/ssl_server_samples.vtc +++ b/reg-tests/ssl/ssl_server_samples.vtc @@ -2,77 +2,6 @@ varnishtest "Test the ssl_s_* sample fetches" #REQUIRE_OPTIONS=OPENSSL -feature ignore_unknown_macro - -server s1 -repeat 3 { - rxreq - txresp -} -start - -haproxy h1 -conf { - global - .if feature(THREAD) - thread-groups 1 - .endif - - .if !ssllib_name_startswith(AWS-LC) - tune.ssl.default-dh-param 2048 - .endif - tune.ssl.capture-buffer-size 1 - crt-base ${testdir}/certs - stats socket "${tmpdir}/h1/stats" level admin - - defaults - mode http - option httplog - log stderr local0 debug err - option logasap - timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" - timeout client "${HAPROXY_TEST_TIMEOUT-5s}" - timeout server "${HAPROXY_TEST_TIMEOUT-5s}" - - - listen clear-lst - bind "fd@${clearlst}" - balance roundrobin - http-response add-header x-ssl-sha1 %[ssl_s_sha1,hex] - http-response add-header x-ssl-notafter %[ssl_s_notafter] - http-response add-header x-ssl-notbefore %[ssl_s_notbefore] - http-response add-header x-ssl-sig_alg %[ssl_s_sig_alg] - http-response add-header x-ssl-i_dn %[ssl_s_i_dn] - http-response add-header x-ssl-s_dn %[ssl_s_s_dn] - http-response add-header x-ssl-s_serial %[ssl_s_serial,hex] - http-response add-header x-ssl-key_alg %[ssl_s_key_alg] - http-response add-header x-ssl-der %[ssl_s_der,hex] - http-response add-header x-ssl-chain-der %[ssl_s_chain_der,hex] - http-response add-header x-ssl-version %[ssl_s_version] - - server s1 "${tmpdir}/ssl.sock" ssl verify none sni str(www.test1.com) - - listen ssl-lst - mode http - - bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list ${testdir}/certs/localhost.crt-list - - server s1 ${s1_addr}:${s1_port} -} -start - - -client c1 -connect ${h1_clearlst_sock} { - txreq - rxresp - expect resp.status == 200 - expect resp.http.x-ssl-sha1 == "DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA" - expect resp.http.x-ssl-notafter == "330917162600Z" - expect resp.http.x-ssl-notbefore == "230920162600Z" - expect resp.http.x-ssl-sig_alg == "RSA-SHA256" - expect resp.http.x-ssl-i_dn == "/C=FR/L=Paris/O=HAProxy Technologies/CN=HAProxy Test Intermediate CA" - expect resp.http.x-ssl-s_dn == "/C=FR/L=Paris/O=test1/CN=www.test1.com" - expect resp.http.x-ssl-s_serial == "45B6C777A017159A19126340C1053521B91E123B" - expect resp.http.x-ssl-key_alg == "rsaEncryption" - expect resp.http.x-ssl-version == "3" - expect resp.http.x-ssl-der ~ 308203C7308202AFA003020102021445B6C777.*65AD7F4469DB9C8581EE260ABCB727AEF8A7C3ADA - expect resp.http.x-ssl-chain-der ~ 308203C7308202AFA003020102021445B6C777.*D457A8C66AECA6408FF5C1A3EDBFF2888D7CED -} -run - +setenv VTC_SOCK_TYPE stream +include ${testdir}/ssl_server_samples.vtci diff --git a/reg-tests/ssl/ssl_server_samples.vtci b/reg-tests/ssl/ssl_server_samples.vtci new file mode 100644 index 000000000..b6d4cabed --- /dev/null +++ b/reg-tests/ssl/ssl_server_samples.vtci @@ -0,0 +1,78 @@ +feature ignore_unknown_macro + +server s1 -repeat 3 { + rxreq + txresp +} -start + +haproxy h1 -conf { + global + .if streq("$VTC_SOCK_TYPE",quic) + # required for backend connections + expose-experimental-directives + .endif + .if feature(THREAD) + thread-groups 1 + .endif + + .if !ssllib_name_startswith(AWS-LC) + tune.ssl.default-dh-param 2048 + .endif + tune.ssl.capture-buffer-size 1 + crt-base ${testdir}/certs + stats socket "${tmpdir}/h1/stats" level admin + + defaults + mode http + option httplog + log stderr local0 debug err + option logasap + timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" + timeout client "${HAPROXY_TEST_TIMEOUT-5s}" + timeout server "${HAPROXY_TEST_TIMEOUT-5s}" + + + listen clear-lst + bind "fd@${clearlst}" + balance roundrobin + http-response add-header x-ssl-sha1 %[ssl_s_sha1,hex] + http-response add-header x-ssl-notafter %[ssl_s_notafter] + http-response add-header x-ssl-notbefore %[ssl_s_notbefore] + http-response add-header x-ssl-sig_alg %[ssl_s_sig_alg] + http-response add-header x-ssl-i_dn %[ssl_s_i_dn] + http-response add-header x-ssl-s_dn %[ssl_s_s_dn] + http-response add-header x-ssl-s_serial %[ssl_s_serial,hex] + http-response add-header x-ssl-key_alg %[ssl_s_key_alg] + http-response add-header x-ssl-der %[ssl_s_der,hex] + http-response add-header x-ssl-chain-der %[ssl_s_chain_der,hex] + http-response add-header x-ssl-version %[ssl_s_version] + + server s1 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(www.test1.com) + + listen ssl-lst + mode http + + bind "${VTC_SOCK_TYPE}+fd@${ssl}" ssl strict-sni crt-list ${testdir}/certs/localhost.crt-list + + server s1 ${s1_addr}:${s1_port} +} -start + + +client c1 -connect ${h1_clearlst_sock} { + txreq + rxresp + expect resp.status == 200 + expect resp.http.x-ssl-sha1 == "DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA" + expect resp.http.x-ssl-notafter == "330917162600Z" + expect resp.http.x-ssl-notbefore == "230920162600Z" + expect resp.http.x-ssl-sig_alg == "RSA-SHA256" + expect resp.http.x-ssl-i_dn == "/C=FR/L=Paris/O=HAProxy Technologies/CN=HAProxy Test Intermediate CA" + expect resp.http.x-ssl-s_dn == "/C=FR/L=Paris/O=test1/CN=www.test1.com" + expect resp.http.x-ssl-s_serial == "45B6C777A017159A19126340C1053521B91E123B" + expect resp.http.x-ssl-key_alg == "rsaEncryption" + expect resp.http.x-ssl-version == "3" + expect resp.http.x-ssl-der ~ 308203C7308202AFA003020102021445B6C777.*65AD7F4469DB9C8581EE260ABCB727AEF8A7C3ADA + expect resp.http.x-ssl-chain-der ~ 308203C7308202AFA003020102021445B6C777.*D457A8C66AECA6408FF5C1A3EDBFF2888D7CED +} -run + +