From 0b0e01f1531b6cc509bf5bbe31c72a710a912902 Mon Sep 17 00:00:00 2001 From: Frederic Lecaille Date: Mon, 1 Dec 2025 18:50:36 +0100 Subject: [PATCH] REGTESTS: quic: ssl_client_samples.vtc supported by QUIC ssl/ssl_client_samples.vtc was renamed to ssl/ssl_client_samples.vtci to produce a common part runnable both for QUIC and TCP listeners. Then ssl_client_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_client_samples.vtc | 10 ++++ reg-tests/ssl/ssl_client_samples.vtc | 76 +----------------------- reg-tests/ssl/ssl_client_samples.vtci | 84 +++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 74 deletions(-) create mode 100644 reg-tests/quic/ssl_client_samples.vtc create mode 100644 reg-tests/ssl/ssl_client_samples.vtci diff --git a/reg-tests/quic/ssl_client_samples.vtc b/reg-tests/quic/ssl_client_samples.vtc new file mode 100644 index 000000000..8001d60be --- /dev/null +++ b/reg-tests/quic/ssl_client_samples.vtc @@ -0,0 +1,10 @@ +#REGTEST_TYPE=devel + +varnishtest "Test the ssl_c_* sample fetches" +feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.8-dev11)'" + +# 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_client_samples.vtci diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc index fc5e77a70..1ef4bd277 100644 --- a/reg-tests/ssl/ssl_client_samples.vtc +++ b/reg-tests/ssl/ssl_client_samples.vtc @@ -3,78 +3,6 @@ varnishtest "Test the ssl_c_* sample fetches" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.8-dev11)'" feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && openssl_version_atleast(1.1.1)'" -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} - - 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 - server s1 "${tmpdir}/ssl.sock" ssl verify none crt ${testdir}/certs/client1.pem - - listen ssl-lst - mode http - - http-response add-header x-ssl-der %[ssl_c_der,hex] - http-response add-header x-ssl-chain-der %[ssl_c_chain_der,hex] - http-response add-header x-ssl-sha1 %[ssl_c_sha1,hex] - http-response add-header x-ssl-notafter %[ssl_c_notafter] - http-response add-header x-ssl-notbefore %[ssl_c_notbefore] - http-response add-header x-ssl-sig_alg %[ssl_c_sig_alg] - http-response add-header x-ssl-i_dn %[ssl_c_i_dn] - http-response add-header x-ssl-s_dn %[ssl_c_s_dn] - http-response add-header x-ssl-r_dn %[ssl_c_r_dn] - http-response add-header x-ssl-s_serial %[ssl_c_serial,hex] - http-response add-header x-ssl-key_alg %[ssl_c_key_alg] - http-response add-header x-ssl-version %[ssl_c_version] - - bind "${tmpdir}/ssl.sock" ssl crt ${testdir}/certs/common.pem ca-file ${testdir}/certs/ca-auth.crt verify optional crt-ignore-err all crl-file ${testdir}/certs/crl-auth.pem - - server s1 ${s1_addr}:${s1_port} -} -start - - -client c1 -connect ${h1_clearlst_sock} { - txreq - rxresp - expect resp.status == 200 - expect resp.http.x-ssl-der ~ 3082052D30820315020102300D0.*995ED3BE2BFB923A3EB71FA07002E - expect resp.http.x-ssl-chain-der ~ 3082096B30820553A0030201020.*0237D08F425C8414A23D436415502 - expect resp.http.x-ssl-sha1 == "D9C3BAE37EA5A7EDB7B3C9BDD4DCB2FE58A412E4" - expect resp.http.x-ssl-notafter == "500421185942Z" - expect resp.http.x-ssl-notbefore == "200428185942Z" - expect resp.http.x-ssl-sig_alg == "RSA-SHA256" - expect resp.http.x-ssl-i_dn == "/C=FR/ST=Some-State/O=HAProxy Technologies/CN=HAProxy Technologies CA Test Client Auth" - expect resp.http.x-ssl-s_dn == "/C=FR/O=HAProxy Technologies Test/CN=client1" - expect resp.http.x-ssl-r_dn == "/C=FR/ST=Some-State/O=HAProxy Technologies/CN=HAProxy Technologies CA Test Client Auth" - expect resp.http.x-ssl-s_serial == "02" - expect resp.http.x-ssl-key_alg == "rsaEncryption" - expect resp.http.x-ssl-version == "1" -} -run - +setenv VTC_SOCK_TYPE stream +include ${testdir}/ssl_client_samples.vtci diff --git a/reg-tests/ssl/ssl_client_samples.vtci b/reg-tests/ssl/ssl_client_samples.vtci new file mode 100644 index 000000000..e8c58a634 --- /dev/null +++ b/reg-tests/ssl/ssl_client_samples.vtci @@ -0,0 +1,84 @@ +#REGTEST_TYPE=devel + +varnishtest "Test the ssl_c_* sample fetches" +feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.8-dev11)'" +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && openssl_version_atleast(1.1.1)'" +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} + + 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 + server s1 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none crt ${testdir}/certs/client1.pem + + listen ssl-lst + mode http + + http-response add-header x-ssl-der %[ssl_c_der,hex] + http-response add-header x-ssl-chain-der %[ssl_c_chain_der,hex] + http-response add-header x-ssl-sha1 %[ssl_c_sha1,hex] + http-response add-header x-ssl-notafter %[ssl_c_notafter] + http-response add-header x-ssl-notbefore %[ssl_c_notbefore] + http-response add-header x-ssl-sig_alg %[ssl_c_sig_alg] + http-response add-header x-ssl-i_dn %[ssl_c_i_dn] + http-response add-header x-ssl-s_dn %[ssl_c_s_dn] + http-response add-header x-ssl-r_dn %[ssl_c_r_dn] + http-response add-header x-ssl-s_serial %[ssl_c_serial,hex] + http-response add-header x-ssl-key_alg %[ssl_c_key_alg] + http-response add-header x-ssl-version %[ssl_c_version] + + bind "${VTC_SOCK_TYPE}+fd@${ssl}" ssl crt ${testdir}/certs/common.pem ca-file ${testdir}/certs/ca-auth.crt verify optional crt-ignore-err all crl-file ${testdir}/certs/crl-auth.pem + + server s1 ${s1_addr}:${s1_port} +} -start + + +client c1 -connect ${h1_clearlst_sock} { + txreq + rxresp + expect resp.status == 200 + expect resp.http.x-ssl-der ~ 3082052D30820315020102300D0.*995ED3BE2BFB923A3EB71FA07002E + expect resp.http.x-ssl-chain-der ~ 3082096B30820553A0030201020.*0237D08F425C8414A23D436415502 + expect resp.http.x-ssl-sha1 == "D9C3BAE37EA5A7EDB7B3C9BDD4DCB2FE58A412E4" + expect resp.http.x-ssl-notafter == "500421185942Z" + expect resp.http.x-ssl-notbefore == "200428185942Z" + expect resp.http.x-ssl-sig_alg == "RSA-SHA256" + expect resp.http.x-ssl-i_dn == "/C=FR/ST=Some-State/O=HAProxy Technologies/CN=HAProxy Technologies CA Test Client Auth" + expect resp.http.x-ssl-s_dn == "/C=FR/O=HAProxy Technologies Test/CN=client1" + expect resp.http.x-ssl-r_dn == "/C=FR/ST=Some-State/O=HAProxy Technologies/CN=HAProxy Technologies CA Test Client Auth" + expect resp.http.x-ssl-s_serial == "02" + expect resp.http.x-ssl-key_alg == "rsaEncryption" + expect resp.http.x-ssl-version == "1" +} -run + +