Mercurial > hg > nginx-tests

comparison mail_imap_ssl.t @ 1965:84f4d4930835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: relaxed mail_imap_ssl.t cipher matching. Previously, exact match between cipher name in the log and the one from IO::Socket:SSL was needed, which might not be the case if nginx and Net::SSLeay are compiled with different SSL libraries, notably LibreSSL (which uses names like AEAD-AES256-GCM-SHA384 till 3.5.0), and OpenSSL or BoringSSL (which use TLS_AES_256_GCM_SHA384). In particular, this affects macOS, where Net::SSLeay compiled with LibreSSL 3.3.6 is shipped with the OS, while nginx is likely to be compiled with OpenSSL. Fix is to not require exact match but instead accept properly looking names as checked by a regular expression, similarly to how it is already tested in ssl.t and stream_ssl_variables.t.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 06 May 2024 00:01:40 +0300
parents 2a0a6035a1af
children
comparison
equal deleted inserted replaced
1964:3cae7b54841e 1965:84f4d4930835
27 select STDOUT; $| = 1; 27 select STDOUT; $| = 1;
28 28
29 local $SIG{PIPE} = 'IGNORE'; 29 local $SIG{PIPE} = 'IGNORE';
30 30
31 my $t = Test::Nginx->new() 31 my $t = Test::Nginx->new()
32 ->has(qw/mail mail_ssl imap http rewrite socket_ssl_sslversion/) 32 ->has(qw/mail mail_ssl imap http rewrite socket_ssl/)
33 ->has_daemon('openssl')->plan(13) 33 ->has_daemon('openssl')->plan(13)
34 ->write_file_expand('nginx.conf', <<'EOF'); 34 ->write_file_expand('nginx.conf', <<'EOF');
35 35
36 %%TEST_GLOBALS%% 36 %%TEST_GLOBALS%%
37 37
199 SSL_key_file => "$d/3.example.com.key" 199 SSL_key_file => "$d/3.example.com.key"
200 ); 200 );
201 $s->ok('trusted cert'); 201 $s->ok('trusted cert');
202 $s->send('1 AUTHENTICATE PLAIN ' . $cred->("s5")); 202 $s->send('1 AUTHENTICATE PLAIN ' . $cred->("s5"));
203 $s->read(); 203 $s->read();
204
205 # Auth-SSL-Protocol and Auth-SSL-Cipher headers
206
207 my ($cipher, $sslversion);
208
209 $s = Test::Nginx::IMAP->new(SSL => 1);
210 $cipher = $s->socket()->get_cipher();
211 $sslversion = $s->socket()->get_sslversion();
212 $sslversion =~ s/_/./;
213 204
214 undef $s; 205 undef $s;
215 206
216 # test auth_http request header fields with access_log 207 # test auth_http request header fields with access_log
217 208
227 'log - good cert'); 218 'log - good cert');
228 like($f, qr!^on:SUCCESS:(/?CN=3.example.com):\1:\w+:\w+:[^:]+:s5$!m, 219 like($f, qr!^on:SUCCESS:(/?CN=3.example.com):\1:\w+:\w+:[^:]+:s5$!m,
229 'log - trusted cert'); 220 'log - trusted cert');
230 221
231 $f = $t->read_file('auth2.log'); 222 $f = $t->read_file('auth2.log');
232 like($f, qr|^$cipher:$sslversion$|m, 'log - cipher sslversion'); 223 like($f, qr/^[\w-]+:(TLS|SSL)v[\d.]+$/m, 'log - cipher sslversion');
233 224
234 ############################################################################### 225 ###############################################################################