mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-21 03:00:35 +00:00
f673923629
With the CI occasionally slowing down, we're starting to see again some spurious failures despite the long 1-second timeouts. This reports false positives that are disturbing and doesn't provide as much value as this could. However at this delay it already becomes a pain for developers to wait for the tests to complete. This commit adds support for the new environment variable HAPROXY_TEST_TIMEOUT that will allow anyone to modify the connect, client and server timeouts. It was set to 5 seconds by default, which should be plenty for quite some time in the CI. All relevant values that were 200ms or above were replaced by this one. A few larger values were left as they are special. One test for the set-timeout action that used to rely on a fixed 1-sec value was extended to a fixed 5-sec, as the timeout is normally not reached, but it needs to be known to compare the old and new values.
70 lines
2.3 KiB
Plaintext
70 lines
2.3 KiB
Plaintext
#REGTEST_TYPE=devel
|
|
|
|
varnishtest "Test the ssl_f_* sample fetches"
|
|
#REQUIRE_OPTIONS=OPENSSL
|
|
feature ignore_unknown_macro
|
|
|
|
server s1 -repeat 3 {
|
|
rxreq
|
|
txresp
|
|
} -start
|
|
|
|
haproxy h1 -conf {
|
|
global
|
|
tune.ssl.default-dh-param 2048
|
|
tune.ssl.capture-buffer-size 1
|
|
crt-base ${testdir}
|
|
|
|
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
|
|
|
|
listen ssl-lst
|
|
mode http
|
|
|
|
http-response add-header x-ssl-der %[ssl_f_der,hex]
|
|
http-response add-header x-ssl-sha1 %[ssl_f_sha1,hex]
|
|
http-response add-header x-ssl-notafter %[ssl_f_notafter]
|
|
http-response add-header x-ssl-notbefore %[ssl_f_notbefore]
|
|
http-response add-header x-ssl-sig_alg %[ssl_f_sig_alg]
|
|
http-response add-header x-ssl-i_dn %[ssl_f_i_dn]
|
|
http-response add-header x-ssl-s_dn %[ssl_f_s_dn]
|
|
http-response add-header x-ssl-s_serial %[ssl_f_serial,hex]
|
|
http-response add-header x-ssl-key_alg %[ssl_f_key_alg]
|
|
http-response add-header x-ssl-version %[ssl_f_version]
|
|
|
|
bind "${tmpdir}/ssl.sock" ssl crt ${testdir}/common.pem
|
|
|
|
server s1 ${s1_addr}:${s1_port}
|
|
} -start
|
|
|
|
|
|
client c1 -connect ${h1_clearlst_sock} {
|
|
txreq
|
|
rxresp
|
|
expect resp.status == 200
|
|
expect resp.http.x-ssl-der ~ 3082067930820461A0030201020201.*207B5E3D4498BB847BC4DE093F9AD1AD3661C93EE43EB
|
|
expect resp.http.x-ssl-sha1 == "2195C9F0FD58470313013FC27C1B9CF9864BD1C6"
|
|
expect resp.http.x-ssl-notafter == "180116230238Z"
|
|
expect resp.http.x-ssl-notbefore == "160117230238Z"
|
|
expect resp.http.x-ssl-sig_alg == "RSA-SHA256"
|
|
expect resp.http.x-ssl-i_dn == "/C=FR/ST=Ile-de-France/L=Paris/O=ozon.io/CN=Ozon Test CA/emailAddress=support@ozon.io"
|
|
expect resp.http.x-ssl-s_dn == "/C=FR/ST=Ile-de-France/L=Neuilly-sur-Seine/O=TOAD Consulting/OU=eParapher Team/CN=www.test1.com/emailAddress=arnault.michel@toad-consulting.fr"
|
|
expect resp.http.x-ssl-s_serial == "02"
|
|
expect resp.http.x-ssl-key_alg == "rsaEncryption"
|
|
expect resp.http.x-ssl-version == "3"
|
|
} -run
|
|
|
|
|