REGTESTS: quic: ssl_simple_crt-list.vtc supported by QUIC

ssl/ssl_simple_crt-list.vtc was renamed to ssl/ssl_simple_crt-list.vtci
to produce a common part runnable both for QUIC and TCP listeners.
Then ssl_simple_crt-list.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);
This commit is contained in:
Frederic Lecaille 2025-12-02 09:44:00 +01:00
parent 63c92936df
commit 3df87376e3
3 changed files with 65 additions and 49 deletions

View File

@ -0,0 +1,9 @@
#REGTEST_TYPE=bug
varnishtest "Test for the bug #940"
# Test that the SNI are correctly inserted with the same file multiple times.
# 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_simple_crt-list.vtci

View File

@ -3,53 +3,6 @@ varnishtest "Test for the bug #940"
# Test that the SNI are correctly inserted with the same file multiple times.
#REQUIRE_OPTIONS=OPENSSL
feature ignore_unknown_macro
server s1 -repeat 4 {
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
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
server s1 "${tmpdir}/ssl.sock" ssl verify none sni str(record1.bug940.domain.tld)
server s2 "${tmpdir}/ssl.sock" ssl verify none sni str(record2.bug940.domain.tld)
server s3 "${tmpdir}/ssl.sock" ssl verify none sni str(record3.bug940.domain.tld)
server s4 "${tmpdir}/ssl.sock" ssl verify none sni str(record4.bug940.domain.tld)
listen ssl-lst
mode http
bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list ${testdir}/certs/simple.crt-list
server s1 ${s1_addr}:${s1_port}
} -start
client c1 -repeat 4 -connect ${h1_clearlst_sock} {
txreq
rxresp
expect resp.status == 200
} -run
setenv VTC_SOCK_TYPE stream
include ${testdir}/ssl_simple_crt-list.vtci

View File

@ -0,0 +1,54 @@
feature ignore_unknown_macro
server s1 -repeat 4 {
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
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
server s1 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(record1.bug940.domain.tld)
server s2 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(record2.bug940.domain.tld)
server s3 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(record3.bug940.domain.tld)
server s4 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(record4.bug940.domain.tld)
listen ssl-lst
mode http
bind "${VTC_SOCK_TYPE}+fd@${ssl}" ssl strict-sni crt-list ${testdir}/certs/simple.crt-list
server s1 ${s1_addr}:${s1_port}
} -start
client c1 -repeat 4 -connect ${h1_clearlst_sock} {
txreq
rxresp
expect resp.status == 200
} -run