Welcome! Log In Create A New Profile

Advanced

Re: [PATCH 5 of 6] Tests: added missing socket_ssl_alpn guard in mail_ssl.t

Sergey Kandaurov
May 23, 2023 08:56AM
> On 23 May 2023, at 06:17, Maxim Dounin <mdounin@mdounin.ru> wrote:
>
> Hello!
>
> On Mon, May 22, 2023 at 11:52:17PM +0400, Sergey Kandaurov wrote:
>
>> # HG changeset patch
>> # User Sergey Kandaurov <pluknet@nginx.com>
>> # Date 1684784660 -14400
>> # Mon May 22 23:44:20 2023 +0400
>> # Node ID 633613b924b957fc18dde972ff346fe92b9e823e
>> # Parent 42066e126d2ca0f6d5095d818910559adf5d4bdc
>> Tests: added missing socket_ssl_alpn guard in mail_ssl.t.
>>
>> diff --git a/mail_ssl.t b/mail_ssl.t
>> --- a/mail_ssl.t
>> +++ b/mail_ssl.t
>> @@ -164,6 +164,10 @@ like($s->socket()->dump_peer_certificate
>>
>> # alpn
>>
>> +TODO: {
>> +local $TODO = 'no ALPN support in IO::Socket::SSL'
>> + unless $t->has_feature('socket_ssl_alpn');
>> +
>> $s = Test::Nginx::IMAP->new(
>> PeerAddr => '127.0.0.1:' . port(8148),
>> SSL => 1,
>> @@ -171,6 +175,8 @@ like($s->socket()->dump_peer_certificate
>> );
>> $s->ok('alpn');
>>
>> +}
>> +
>
> This will unexpectedly succeed if IO::Socket:SSL do not have ALPN
> support at all (and will simply ignore SSL_alpn_protocols).
>
> Probably skipping ALPN tests if there is no socket_ssl_alpn is the
> way to go:

Indeed. Applied, thanks.

>
> diff -r a797d7428fa5 mail_ssl.t
> --- a/mail_ssl.t Thu May 18 18:07:19 2023 +0300
> +++ b/mail_ssl.t Tue May 23 02:17:06 2023 +0000
> @@ -164,6 +164,17 @@
>
> # alpn
>
> +
> +SKIP: {
> +skip 'LibreSSL too old', 2
> + if $t->has_module('LibreSSL')
> + and not $t->has_feature('libressl:3.4.0');
> +skip 'OpenSSL too old', 2
> + if $t->has_module('OpenSSL')
> + and not $t->has_feature('openssl:1.1.0');
> +skip 'no ALPN support in IO::Socket::SSL', 2
> + unless $t->has_feature('socket_ssl_alpn');
> +
> $s = Test::Nginx::IMAP->new(
> PeerAddr => '127.0.0.1:' . port(8148),
> SSL => 1,
> @@ -171,18 +182,8 @@
> );
> $s->ok('alpn');
>
> -SKIP: {
> -skip 'LibreSSL too old', 1
> - if $t->has_module('LibreSSL')
> - and not $t->has_feature('libressl:3.4.0');
> -skip 'OpenSSL too old', 1
> - if $t->has_module('OpenSSL')
> - and not $t->has_feature('openssl:1.1.0');
> -
> TODO: {
> local $TODO = 'not yet' unless $t->has_version('1.21.4');
> -local $TODO = 'no ALPN support in IO::Socket::SSL'
> - unless $t->has_feature('socket_ssl_alpn');
>
> $s = Test::Nginx::IMAP->new(
> PeerAddr => '127.0.0.1:' . port(8148),
>

--
Sergey Kandaurov
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[PATCH 00 of 11] SSL tests simplified

Maxim Dounin 698 April 16, 2023 11:46PM

[PATCH 01 of 11] Tests: SIGPIPE handling in mail tests

Maxim Dounin 158 April 16, 2023 11:46PM

[PATCH 03 of 11] Tests: added has_feature() tests for IO::Socket::SSL

Maxim Dounin 156 April 16, 2023 11:46PM

Re: [PATCH 03 of 11] Tests: added has_feature() tests for IO::Socket::SSL

Sergey Kandaurov 161 May 03, 2023 12:22PM

Re: [PATCH 03 of 11] Tests: added has_feature() tests for IO::Socket::SSL

Maxim Dounin 167 May 03, 2023 11:58PM

[PATCH 04 of 11] Tests: fixed server_tokens tests for build names with spaces

Maxim Dounin 226 April 16, 2023 11:46PM

Re: [PATCH 04 of 11] Tests: fixed server_tokens tests for build names with spaces

Sergey Kandaurov 134 May 11, 2023 07:50AM

Re: [PATCH 04 of 11] Tests: fixed server_tokens tests for build names with spaces

Maxim Dounin 156 May 14, 2023 02:54PM

[PATCH 05 of 11] Tests: added has_feature() test for SSL libraries

Maxim Dounin 156 April 16, 2023 11:46PM

[PATCH 09 of 11] Tests: simplified stream SSL tests with IO::Socket::SSL

Maxim Dounin 163 April 16, 2023 11:46PM

[PATCH 06 of 11] Tests: reworked mail SSL tests to use IO::Socket::SSL

Maxim Dounin 178 April 16, 2023 11:46PM

Re: [PATCH 06 of 11] Tests: reworked mail SSL tests to use IO::Socket::SSL

Sergey Kandaurov 257 May 11, 2023 10:40AM

Re: [PATCH 06 of 11] Tests: reworked mail SSL tests to use IO::Socket::SSL

Maxim Dounin 144 May 14, 2023 05:12PM

[PATCH 08 of 11] Tests: reworked stream SSL tests to use IO::Socket::SSL

Maxim Dounin 159 April 16, 2023 11:46PM

[PATCH 07 of 11] Tests: simplified mail_imap_ssl.t

Maxim Dounin 161 April 16, 2023 11:46PM

[PATCH 10 of 11] Tests: reworked http SSL tests to use IO::Socket::SSL

Maxim Dounin 163 April 16, 2023 11:46PM

Re: [PATCH 10 of 11] Tests: reworked http SSL tests to use IO::Socket::SSL

Sergey Kandaurov 149 May 11, 2023 10:28AM

Re: [PATCH 10 of 11] Tests: reworked http SSL tests to use IO::Socket::SSL

Maxim Dounin 180 May 18, 2023 11:18AM

[PATCH 11 of 11] Tests: simplified http SSL tests with IO::Socket::SSL

Maxim Dounin 157 April 16, 2023 11:46PM

[PATCH 0 of 6] SSL tests refactoring fixes

Sergey Kandaurov 135 May 22, 2023 03:58PM

[PATCH 1 of 6] Tests: unbreak ssl_stapling.t after IO::Socket::SSL refactoring

Sergey Kandaurov 144 May 22, 2023 03:58PM

Re: [PATCH 1 of 6] Tests: unbreak ssl_stapling.t after IO::Socket::SSL refactoring

Maxim Dounin 170 May 22, 2023 04:38PM

[PATCH 2 of 6] Tests: unbreak tests with IO::Socket:SSL lacking SSL_session_key

Sergey Kandaurov 139 May 22, 2023 03:58PM

Re: [PATCH 2 of 6] Tests: unbreak tests with IO::Socket:SSL lacking SSL_session_key

Maxim Dounin 132 May 22, 2023 07:44PM

Re: [PATCH 2 of 6] Tests: unbreak tests with IO::Socket:SSL lacking SSL_session_key

Sergey Kandaurov 147 May 23, 2023 06:36AM

Re: [PATCH 2 of 6] Tests: unbreak tests with IO::Socket:SSL lacking SSL_session_key

Maxim Dounin 195 May 23, 2023 09:32AM

[PATCH 3 of 6] Tests: unbreak stream_ssl_variables.t with old IO::Socket::SSL

Sergey Kandaurov 135 May 22, 2023 04:00PM

Re: [PATCH 3 of 6] Tests: unbreak stream_ssl_variables.t with old IO::Socket::SSL

Maxim Dounin 131 May 22, 2023 07:52PM

[PATCH 4 of 6] Tests: avoid specifying PSS in sigalgs unless in TLSv1.3

Sergey Kandaurov 138 May 22, 2023 04:00PM

Re: [PATCH 4 of 6] Tests: avoid specifying PSS in sigalgs unless in TLSv1.3

Maxim Dounin 136 May 22, 2023 09:08PM

Re: [PATCH 4 of 6] Tests: avoid specifying PSS in sigalgs unless in TLSv1.3

Sergey Kandaurov 271 May 23, 2023 08:24AM

[PATCH 5 of 6] Tests: added missing socket_ssl_alpn guard in mail_ssl.t

Sergey Kandaurov 133 May 22, 2023 04:00PM

Re: [PATCH 5 of 6] Tests: added missing socket_ssl_alpn guard in mail_ssl.t

Maxim Dounin 130 May 22, 2023 10:18PM

Re: [PATCH 5 of 6] Tests: added missing socket_ssl_alpn guard in mail_ssl.t

Sergey Kandaurov 226 May 23, 2023 08:56AM

[PATCH 6 of 6] Tests: added missing socket_ssl_reused prerequisites

Sergey Kandaurov 130 May 22, 2023 04:00PM

Re: [PATCH 6 of 6] Tests: added missing socket_ssl_reused prerequisites

Maxim Dounin 117 May 22, 2023 10:40PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 129
Record Number of Users: 8 on April 13, 2023
Record Number of Guests: 500 on July 15, 2024
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready