mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-12-03 16:51:01 +01:00
REGTESTS: quic: set_ssl_bug_2265.vtc supported by QUIC
ssl/set_ssl_bug_2265.vtc was renamed to ssl/set_ssl_bug_2265.vtci
to produce a common part runnable both for QUIC and TCP listeners.
Then set_ssl_bug_2265.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
f8000838e6
commit
8dbecbce31
21
reg-tests/quic/set_ssl_bug_2265.vtc
Normal file
21
reg-tests/quic/set_ssl_bug_2265.vtc
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
#REGTEST_TYPE=devel
|
||||||
|
|
||||||
|
# This reg-test uses the "set ssl cert" command to update a certificate over the CLI.
|
||||||
|
# It requires socat to upload the certificate
|
||||||
|
#
|
||||||
|
# this check does 3 requests, the first one will use "www.test1.com" as SNI,
|
||||||
|
# the second one with the same but that must fail and the third one will use
|
||||||
|
# "localhost". Since vtest can't do SSL, we use haproxy as an SSL client with 2
|
||||||
|
# chained listen section.
|
||||||
|
#
|
||||||
|
# This is the same as "set_ssl_cert_noext.vtc" but the .crt contains both the certificate and the key.
|
||||||
|
#
|
||||||
|
# If this test does not work anymore:
|
||||||
|
# - Check that you have socat
|
||||||
|
|
||||||
|
varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
|
||||||
|
feature cmd "$HAPROXY_PROGRAM -cc 'feature(QUIC) && !feature(QUIC_OPENSSL_COMPAT) && !feature(OPENSSL_WOLFSSL)'"
|
||||||
|
feature cmd "command -v socat"
|
||||||
|
|
||||||
|
setenv VTC_SOCK_TYPE quic
|
||||||
|
include ${testdir}/../ssl/set_ssl_bug_2265.vtci
|
||||||
@ -16,80 +16,6 @@
|
|||||||
varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
|
varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
|
||||||
#REQUIRE_OPTIONS=OPENSSL
|
#REQUIRE_OPTIONS=OPENSSL
|
||||||
feature cmd "command -v socat"
|
feature cmd "command -v socat"
|
||||||
feature ignore_unknown_macro
|
|
||||||
|
|
||||||
server s1 -repeat 3 {
|
setenv VTC_SOCK_TYPE stream
|
||||||
rxreq
|
include ${testdir}/set_ssl_bug_2265.vtci
|
||||||
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
|
|
||||||
stats socket "${tmpdir}/h1/stats" level admin
|
|
||||||
|
|
||||||
defaults
|
|
||||||
mode http
|
|
||||||
option httplog
|
|
||||||
retries 0
|
|
||||||
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
|
|
||||||
retries 0 # 2nd SSL connection must fail so skip the retry
|
|
||||||
server s1 "${tmpdir}/ssl.sock" ssl verify none sni str(www.test1.com)
|
|
||||||
server s2 "${tmpdir}/ssl.sock" ssl verify none sni str(www.test1.com)
|
|
||||||
server s3 "${tmpdir}/ssl.sock" ssl verify none sni str(localhost)
|
|
||||||
|
|
||||||
listen ssl-lst
|
|
||||||
bind "${tmpdir}/ssl.sock" ssl crt ${testdir}/certs/bug-2265.crt strict-sni
|
|
||||||
|
|
||||||
server s1 ${s1_addr}:${s1_port}
|
|
||||||
} -start
|
|
||||||
|
|
||||||
|
|
||||||
haproxy h1 -cli {
|
|
||||||
send "show ssl cert ${testdir}/certs/bug-2265.crt"
|
|
||||||
expect ~ ".*SHA1 FingerPrint: DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
|
||||||
}
|
|
||||||
|
|
||||||
client c1 -connect ${h1_clearlst_sock} {
|
|
||||||
txreq
|
|
||||||
rxresp
|
|
||||||
expect resp.status == 200
|
|
||||||
} -run
|
|
||||||
|
|
||||||
shell {
|
|
||||||
printf "set ssl cert ${testdir}/certs/bug-2265.crt <<\n$(cat ${testdir}/certs/ecdsa.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
|
||||||
echo "commit ssl cert ${testdir}/certs/bug-2265.crt" | socat "${tmpdir}/h1/stats" -
|
|
||||||
}
|
|
||||||
|
|
||||||
haproxy h1 -cli {
|
|
||||||
send "show ssl cert ${testdir}/certs/bug-2265.crt"
|
|
||||||
expect ~ ".*SHA1 FingerPrint: A490D069DBAFBEE66DE434BEC34030ADE8BCCBF1"
|
|
||||||
}
|
|
||||||
|
|
||||||
# check that the "www.test1.com" SNI was removed
|
|
||||||
client c1 -connect ${h1_clearlst_sock} {
|
|
||||||
txreq
|
|
||||||
rxresp
|
|
||||||
expect resp.status == 503
|
|
||||||
} -run
|
|
||||||
|
|
||||||
client c1 -connect ${h1_clearlst_sock} {
|
|
||||||
txreq
|
|
||||||
rxresp
|
|
||||||
expect resp.status == 200
|
|
||||||
} -run
|
|
||||||
|
|||||||
81
reg-tests/ssl/set_ssl_bug_2265.vtci
Normal file
81
reg-tests/ssl/set_ssl_bug_2265.vtci
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
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
|
||||||
|
stats socket "${tmpdir}/h1/stats" level admin
|
||||||
|
|
||||||
|
defaults
|
||||||
|
mode http
|
||||||
|
option httplog
|
||||||
|
retries 0
|
||||||
|
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
|
||||||
|
retries 0 # 2nd SSL connection must fail so skip the retry
|
||||||
|
server s1 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(www.test1.com)
|
||||||
|
server s2 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(www.test1.com)
|
||||||
|
server s3 "${VTC_SOCK_TYPE}+${h1_ssl_sock}" ssl verify none sni str(localhost)
|
||||||
|
|
||||||
|
listen ssl-lst
|
||||||
|
bind "${VTC_SOCK_TYPE}+fd@${ssl}" ssl crt ${testdir}/certs/bug-2265.crt strict-sni
|
||||||
|
|
||||||
|
server s1 ${s1_addr}:${s1_port}
|
||||||
|
} -start
|
||||||
|
|
||||||
|
|
||||||
|
haproxy h1 -cli {
|
||||||
|
send "show ssl cert ${testdir}/certs/bug-2265.crt"
|
||||||
|
expect ~ ".*SHA1 FingerPrint: DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||||
|
}
|
||||||
|
|
||||||
|
client c1 -connect ${h1_clearlst_sock} {
|
||||||
|
txreq
|
||||||
|
rxresp
|
||||||
|
expect resp.status == 200
|
||||||
|
} -run
|
||||||
|
|
||||||
|
shell {
|
||||||
|
printf "set ssl cert ${testdir}/certs/bug-2265.crt <<\n$(cat ${testdir}/certs/ecdsa.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||||
|
echo "commit ssl cert ${testdir}/certs/bug-2265.crt" | socat "${tmpdir}/h1/stats" -
|
||||||
|
}
|
||||||
|
|
||||||
|
haproxy h1 -cli {
|
||||||
|
send "show ssl cert ${testdir}/certs/bug-2265.crt"
|
||||||
|
expect ~ ".*SHA1 FingerPrint: A490D069DBAFBEE66DE434BEC34030ADE8BCCBF1"
|
||||||
|
}
|
||||||
|
|
||||||
|
# check that the "www.test1.com" SNI was removed
|
||||||
|
client c1 -connect ${h1_clearlst_sock} {
|
||||||
|
txreq
|
||||||
|
rxresp
|
||||||
|
expect resp.status == 503
|
||||||
|
} -run
|
||||||
|
|
||||||
|
client c1 -connect ${h1_clearlst_sock} {
|
||||||
|
txreq
|
||||||
|
rxresp
|
||||||
|
expect resp.status == 200
|
||||||
|
} -run
|
||||||
Loading…
x
Reference in New Issue
Block a user