]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTEST: quic: add dynamic_server_ssl.vtc new QUIC test
authorFrederic Lecaille <flecaille@haproxy.com>
Thu, 30 Oct 2025 14:11:11 +0000 (15:11 +0100)
committerFrederic Lecaille <flecaille@haproxy.com>
Tue, 4 Nov 2025 09:23:56 +0000 (10:23 +0100)
This new reg test calls reg-test/ssl/dynamic_server_ssl.vtc to run exactly the
same test but with QUIC connections.

reg-tests/quic/client1.pem [new symlink]
reg-tests/quic/client2_expired.pem [new symlink]
reg-tests/quic/dynamic_server_ssl.vtc [new file with mode: 0644]
reg-tests/ssl/dynamic_server_ssl.vtc

diff --git a/reg-tests/quic/client1.pem b/reg-tests/quic/client1.pem
new file mode 120000 (symlink)
index 0000000..c4d14f0
--- /dev/null
@@ -0,0 +1 @@
+../ssl/client1.pem
\ No newline at end of file
diff --git a/reg-tests/quic/client2_expired.pem b/reg-tests/quic/client2_expired.pem
new file mode 120000 (symlink)
index 0000000..668c525
--- /dev/null
@@ -0,0 +1 @@
+../ssl/client2_expired.pem
\ No newline at end of file
diff --git a/reg-tests/quic/dynamic_server_ssl.vtc b/reg-tests/quic/dynamic_server_ssl.vtc
new file mode 100644 (file)
index 0000000..944c731
--- /dev/null
@@ -0,0 +1,10 @@
+#REGTEST_TYPE=devel
+
+# Same test as ssl/dynamic_server_ssl.vtc, but with QUIC connections where applicable (only for TLSv3)
+
+varnishtest "Delete server via cli and update certificates"
+
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(QUIC) && !feature(QUIC_OPENSSL_COMPAT) && !feature(OPENSSL_WOLFSSL)'"
+
+setenv VTC_SOCK_TYPE quic
+include ${testdir}/../ssl/dynamic_server_ssl.vtc
index 2529e9450fde5e1a9d510322406f9a96c5cb9ceb..2d6f7bacdd9094d88920a00975b8669802128737 100644 (file)
@@ -16,8 +16,14 @@ server s1 -repeat 3 {
          -body "resp from s1"
 } -start
 
+setenv -ifunset VTC_SOCK_TYPE stream
+
 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
@@ -36,13 +42,13 @@ haproxy h1 -conf {
                default_backend test
 
        backend test
-               server s1 "${tmpdir}/ssl.sock" ssl verify none crt "${testdir}/client1.pem"
-               server s2 "${tmpdir}/ssl.sock" ssl verify none crt "${testdir}/client1.pem"
-               server s3 "${tmpdir}/ssl.sock" ssl verify none crt "${testdir}/client1.pem"
+               server s1 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none crt "${testdir}/client1.pem"
+               server s2 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none crt "${testdir}/client1.pem"
+               server s3 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none crt "${testdir}/client1.pem"
 
 
        listen ssl-lst
-               bind "${tmpdir}/ssl.sock" ssl crt "${testdir}/common.pem"
+               bind "${VTC_SOCK_TYPE}+fd@${ssl}" ssl crt "${testdir}/common.pem"
                server s1 ${s1_addr}:${s1_port}
 
 } -start
@@ -98,7 +104,7 @@ haproxy h1 -cli {
 }
 
 haproxy h1 -cli {
-       send "add server test/s1 ${tmpdir}/ssl.sock ssl verify none crt ${testdir}/client1.pem"
+       send "add server test/s1 ${VTC_SOCK_TYPE}+${h1_ssl_sock} ssl verify none crt ${testdir}/client1.pem"
        expect ~ "New server registered."
        send "enable server test/s1"
        expect ~ ".*"