Mercurial > hg > nginx-tests
diff mail_imap_ssl.t @ 1858:cdcd75657e52
Tests: added has_feature() tests for IO::Socket::SSL.
The following distinct features supported:
- "socket_ssl", which requires IO::Socket::SSL and also implies
existance of the IO::Socket::SSL::SSL_VERIFY_NONE() symbol.
It is used by most of the tests.
- "socket_ssl_sni", which requires IO::Socket::SSL with the can_client_sni()
function (1.84), and SNI support available in Net::SSLeay and the OpenSSL
library being used. Used by ssl_sni.t, ssl_sni_sessions.t,
stream_ssl_preread.t. Additional Net::SSLeay testing is believed to be
unneeded and was removed.
- "socket_ssl_alpn", which requires IO::Socket::SSL with ALPN support (2.009),
and ALPN support in Net::SSLeay and the OpenSSL library being used.
Used by h2_ssl.t, h2_ssl_verify_client.t, stream_ssl_alpn.t,
stream_ssl_preread_alpn.t.
- "socket_ssl_sslversion", which requires IO::Socket::SSL with
the get_sslversion() and get_sslversion_int() methods (1.964).
Used by mail_imap_ssl.t.
- "socket_ssl_reused", which requires IO::Socket::SSL with
the get_session_reused() method (2.057). To be used in the following
patches.
This makes it possible to simplify and unify various SSL tests.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 18 May 2023 18:07:02 +0300 |
parents | 1522ab9d37b4 |
children | 7681a970f6bd |
line wrap: on
line diff
--- a/mail_imap_ssl.t +++ b/mail_imap_ssl.t @@ -26,14 +26,10 @@ use Test::Nginx::IMAP; select STDERR; $| = 1; select STDOUT; $| = 1; -eval { require IO::Socket::SSL; }; -plan(skip_all => 'IO::Socket::SSL not installed') if $@; -eval { IO::Socket::SSL::SSL_VERIFY_NONE(); }; -plan(skip_all => 'IO::Socket::SSL too old') if $@; - local $SIG{PIPE} = 'IGNORE'; -my $t = Test::Nginx->new()->has(qw/mail mail_ssl imap http rewrite/) +my $t = Test::Nginx->new() + ->has(qw/mail mail_ssl imap http rewrite socket_ssl_sslversion/) ->has_daemon('openssl')->plan(13) ->write_file_expand('nginx.conf', <<'EOF'); @@ -215,12 +211,10 @@ my $s = Test::Nginx::IMAP->new(PeerAddr my ($cipher, $sslversion); -if ($IO::Socket::SSL::VERSION >= 1.964) { - $s = get_ssl_socket(8143); - $cipher = $s->get_cipher(); - $sslversion = $s->get_sslversion(); - $sslversion =~ s/_/./; -} +$s = get_ssl_socket(8143); +$cipher = $s->get_cipher(); +$sslversion = $s->get_sslversion(); +$sslversion =~ s/_/./; undef $s; @@ -239,10 +233,6 @@ like($f, qr!^on:SUCCESS:(/?CN=2.example. like($f, qr!^on:SUCCESS:(/?CN=3.example.com):\1:\w+:\w+:[^:]+:s5$!m, 'log - trusted cert'); -SKIP: { -skip 'IO::Socket::SSL version >= 1.964 required', 1 - if $IO::Socket::SSL::VERSION < 1.964; - TODO: { local $TODO = 'not yet' unless $t->has_version('1.21.2'); @@ -251,8 +241,6 @@ like($f, qr|^$cipher:$sslversion$|m, 'lo } -} - ############################################################################### sub get_ssl_socket {