mirror of
https://github.com/haproxy/haproxy.git
synced 2026-02-03 20:39:41 -05:00
REGTESTS: quic: set_ssl_cert.vtc supported by QUIC
ssl/set_ssl_cert.vtc was renamed to ssl/set_ssl_cert.vtci
to produce a common part runnable both for QUIC and TCP listeners.
Then set_ssl_cert.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
cb1e9e3cd8
commit
83b3e2876e
3 changed files with 221 additions and 186 deletions
28
reg-tests/quic/set_ssl_cert.vtc
Normal file
28
reg-tests/quic/set_ssl_cert.vtc
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
#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 has two separate parts.
|
||||
# In the first part, there are 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.
|
||||
#
|
||||
# In the second part, we check the update of a default certificate in a crt-list.
|
||||
# This corresponds to a bug raised in https://github.com/haproxy/haproxy/issues/1143.
|
||||
# A certificate is used as default certificate as well as regular one, and during the update
|
||||
# the default certificate would not be properly updated if the default instance did not have
|
||||
# any SNI. The test consists in checking that the used certificate is the right one after
|
||||
# updating it via a "set ssl cert" call.
|
||||
#
|
||||
# If this test does not work anymore:
|
||||
# - Check that you have socat
|
||||
|
||||
varnishtest "Test the 'set ssl cert' feature of the CLI"
|
||||
# QUIC backend are not supported with USE_QUIC_OPENSSL_COMPAT
|
||||
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_cert.vtci
|
||||
|
|
@ -22,190 +22,6 @@
|
|||
varnishtest "Test the 'set ssl cert' feature of the CLI"
|
||||
#REQUIRE_OPTIONS=OPENSSL
|
||||
feature cmd "command -v socat"
|
||||
feature ignore_unknown_macro
|
||||
|
||||
server s1 -repeat 9 {
|
||||
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
|
||||
stats socket "${tmpdir}/h1/stats" level admin
|
||||
crt-base ${testdir}/certs
|
||||
|
||||
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
|
||||
|
||||
http-response set-header X-SSL-Server-SHA1 %[ssl_s_sha1,hex]
|
||||
|
||||
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)
|
||||
|
||||
server s4 "${tmpdir}/other-ssl.sock" ssl verify none sni str(www.test1.com)
|
||||
server s5 "${tmpdir}/other-ssl.sock" ssl verify none sni str(other.test1.com) # uses the default certificate
|
||||
server s6 "${tmpdir}/other-ssl.sock" ssl verify none sni str(www.test1.com)
|
||||
server s7 "${tmpdir}/other-ssl.sock" ssl verify none sni str(other.test1.com) # uses the default certificate
|
||||
|
||||
server s8 "${tmpdir}/other-ssl.sock" ssl verify none sni str(www.test1.com)
|
||||
server s9 "${tmpdir}/other-ssl.sock" ssl verify none sni str(other.test1.com) # uses the default certificate
|
||||
|
||||
listen ssl-lst
|
||||
bind "${tmpdir}/ssl.sock" ssl crt ${testdir}/certs/common.pem strict-sni
|
||||
server s1 ${s1_addr}:${s1_port}
|
||||
# dummy server used to test a change when the same crt is used as server and bind
|
||||
server s2 ${s1_addr}:${s1_port} ssl crt ${testdir}/certs/common.pem verify none weight 0
|
||||
|
||||
listen other-ssl-lst
|
||||
bind "${tmpdir}/other-ssl.sock" ssl crt-list ${testdir}/certs/set_default_cert.crt-list
|
||||
server s1 ${s1_addr}:${s1_port}
|
||||
|
||||
} -start
|
||||
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/common.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
}
|
||||
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/common.pem <<\n$(cat ${testdir}/certs/ecdsa.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
echo "commit ssl cert ${testdir}/certs/common.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/common.pem"
|
||||
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
|
||||
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/common.pem <<\n$(cat ${testdir}/certs/common.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
echo "abort ssl cert ${testdir}/certs/common.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/common.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: A490D069DBAFBEE66DE434BEC34030ADE8BCCBF1"
|
||||
}
|
||||
|
||||
|
||||
|
||||
# The following requests are aimed at a backend that uses the set_default_cert.crt-list file
|
||||
|
||||
# Uses the www.test1.com sni
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Uses the other.test1.com sni and the default line of the crt-list
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/set_default_cert.pem <<\n$(cat ${testdir}/certs/common.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
# Certificate should not have changed yet
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/set_default_cert.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: 9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
}
|
||||
|
||||
shell {
|
||||
echo "commit ssl cert ${testdir}/certs/set_default_cert.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/set_default_cert.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
}
|
||||
|
||||
# Uses the www.test1.com sni
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Uses the other.test1.com sni and the default line of the crt-list
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Restore original certificate
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/set_default_cert.pem <<\n$(cat ${testdir}/certs/set_default_cert.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
echo "commit ssl cert ${testdir}/certs/set_default_cert.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/set_default_cert.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: 9DC18799428875976DDE706E9956035EE88A4CB"
|
||||
}
|
||||
|
||||
# Uses the www.test1.com sni
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Uses the other.test1.com sni and the default line of the crt-list
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
setenv VTC_SOCK_TYPE stream
|
||||
include ${testdir}/set_ssl_cert.vtci
|
||||
|
|
|
|||
191
reg-tests/ssl/set_ssl_cert.vtci
Normal file
191
reg-tests/ssl/set_ssl_cert.vtci
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
feature ignore_unknown_macro
|
||||
|
||||
server s1 -repeat 9 {
|
||||
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
|
||||
crt-base ${testdir}/certs
|
||||
|
||||
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
|
||||
|
||||
http-response set-header X-SSL-Server-SHA1 %[ssl_s_sha1,hex]
|
||||
|
||||
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)
|
||||
|
||||
server s4 "${VTC_SOCK_TYPE}+${h1_other_ssl_sock}" ssl verify none sni str(www.test1.com)
|
||||
server s5 "${VTC_SOCK_TYPE}+${h1_other_ssl_sock}" ssl verify none sni str(other.test1.com) # uses the default certificate
|
||||
server s6 "${VTC_SOCK_TYPE}+${h1_other_ssl_sock}" ssl verify none sni str(www.test1.com)
|
||||
server s7 "${VTC_SOCK_TYPE}+${h1_other_ssl_sock}" ssl verify none sni str(other.test1.com) # uses the default certificate
|
||||
|
||||
server s8 "${VTC_SOCK_TYPE}+${h1_other_ssl_sock}" ssl verify none sni str(www.test1.com)
|
||||
server s9 "${VTC_SOCK_TYPE}+${h1_other_ssl_sock}" ssl verify none sni str(other.test1.com) # uses the default certificate
|
||||
|
||||
listen ssl-lst
|
||||
bind "${VTC_SOCK_TYPE}+fd@${ssl}" ssl crt ${testdir}/certs/common.pem strict-sni
|
||||
server s1 ${s1_addr}:${s1_port}
|
||||
# dummy server used to test a change when the same crt is used as server and bind
|
||||
server s2 ${s1_addr}:${s1_port} ssl crt ${testdir}/certs/common.pem verify none weight 0
|
||||
|
||||
listen other-ssl-lst
|
||||
bind "${VTC_SOCK_TYPE}+fd@${other_ssl}" ssl crt-list ${testdir}/certs/set_default_cert.crt-list
|
||||
server s1 ${s1_addr}:${s1_port}
|
||||
|
||||
} -start
|
||||
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/common.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
}
|
||||
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/common.pem <<\n$(cat ${testdir}/certs/ecdsa.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
echo "commit ssl cert ${testdir}/certs/common.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/common.pem"
|
||||
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
|
||||
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/common.pem <<\n$(cat ${testdir}/certs/common.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
echo "abort ssl cert ${testdir}/certs/common.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/common.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: A490D069DBAFBEE66DE434BEC34030ADE8BCCBF1"
|
||||
}
|
||||
|
||||
|
||||
|
||||
# The following requests are aimed at a backend that uses the set_default_cert.crt-list file
|
||||
|
||||
# Uses the www.test1.com sni
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Uses the other.test1.com sni and the default line of the crt-list
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/set_default_cert.pem <<\n$(cat ${testdir}/certs/common.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
# Certificate should not have changed yet
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/set_default_cert.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: 9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
}
|
||||
|
||||
shell {
|
||||
echo "commit ssl cert ${testdir}/certs/set_default_cert.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/set_default_cert.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
}
|
||||
|
||||
# Uses the www.test1.com sni
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Uses the other.test1.com sni and the default line of the crt-list
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "DF3B6E847A7BF83DFAAFCFEC65EE9BC36230D3EA"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Restore original certificate
|
||||
shell {
|
||||
printf "set ssl cert ${testdir}/certs/set_default_cert.pem <<\n$(cat ${testdir}/certs/set_default_cert.pem)\n\n" | socat "${tmpdir}/h1/stats" -
|
||||
echo "commit ssl cert ${testdir}/certs/set_default_cert.pem" | socat "${tmpdir}/h1/stats" -
|
||||
}
|
||||
|
||||
haproxy h1 -cli {
|
||||
send "show ssl cert ${testdir}/certs/set_default_cert.pem"
|
||||
expect ~ ".*SHA1 FingerPrint: 9DC18799428875976DDE706E9956035EE88A4CB"
|
||||
}
|
||||
|
||||
# Uses the www.test1.com sni
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
|
||||
# Uses the other.test1.com sni and the default line of the crt-list
|
||||
client c1 -connect ${h1_clearlst_sock} {
|
||||
txreq
|
||||
rxresp
|
||||
expect resp.http.X-SSL-Server-SHA1 == "9DC18799428875976DDE706E9956035EE88A4CB3"
|
||||
expect resp.status == 200
|
||||
} -run
|
||||
Loading…
Reference in a new issue