mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-12-04 09:11:02 +01:00
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);
This commit is contained in:
Frederic Lecaille
parent
318a0aee44
commit
fcc73f8c73
8
reg-tests/quic/ssl_server_samples.vtc
Normal file
8
reg-tests/quic/ssl_server_samples.vtc
Normal file
@ -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
|
||||||
@ -2,77 +2,6 @@
|
|||||||
|
|
||||||
varnishtest "Test the ssl_s_* sample fetches"
|
varnishtest "Test the ssl_s_* sample fetches"
|
||||||
#REQUIRE_OPTIONS=OPENSSL
|
#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
|
||||||
|
|||||||
78
reg-tests/ssl/ssl_server_samples.vtci
Normal file
78
reg-tests/ssl/ssl_server_samples.vtci
Normal file
@ -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
|
||||||
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user