Mercurial > hg > nginx-tests
view config_dump.t @ 1965:84f4d4930835
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 | 9d579fc770a6 |
children |
line wrap: on
line source
#!/usr/bin/perl # (C) Sergey Kandaurov # (C) Nginx, Inc. # Tests for dumped nginx configuration (nginx -T). # Among other things, test that configuration blocks are properly processed. ############################################################################### use warnings; use strict; use Test::More; BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; use Test::Nginx; ############################################################################### select STDERR; $| = 1; select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http map/); $t->plan(13)->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% daemon off; include %%TESTDIR%%/inc.conf; include %%TESTDIR%%/inc.conf; events { } http { %%TEST_GLOBALS_HTTP%% map $args $x { default 0; foo bar; include map.conf; include map.conf; } upstream u { server 127.0.0.1:8081; } server { listen 127.0.0.1:8080; server_name localhost; location / { } } } EOF $t->write_file('inc.conf', 'include inc2.conf;'); $t->write_file('inc2.conf', '#inc2.conf'); $t->write_file('map.conf', '#map.conf;'); $t->run(); ############################################################################### my $d = $t->testdir; my $dump = $t->dump_config(); like($dump, qr!^# configuration file $d/nginx.conf:$!m, 'nginx.conf found'); like($dump, qr!^# configuration file $d/inc.conf:$!m, 'inc.conf found'); like($dump, qr!^# configuration file $d/inc2.conf:$!m, 'inc2.conf found'); like($dump, qr!^# configuration file $d/map.conf:$!m, 'map.conf found'); unlike($dump, qr!(# configuration file $d/inc.conf:).*\1!s, 'inc.conf uniq'); unlike($dump, qr!(# configuration file $d/inc2.conf:).*\1!s, 'inc2.conf uniq'); unlike($dump, qr!(# configuration file $d/map.conf:).*\1!s, 'map.conf uniq'); is(getconf($t, $dump, 'nginx.conf'), $t->read_file('nginx.conf'), 'content'); is(getconf($t, $dump, 'inc.conf'), $t->read_file('inc.conf'), 'content inc'); is(getconf($t, $dump, 'map.conf'), $t->read_file('map.conf'), 'content inc 2'); unlink($t->testdir . "/inc.conf"); unlink($t->testdir . "/map.conf"); $dump = $t->dump_config(); unlike($dump, qr!file $d/inc.conf!, 'missing inc.conf'); unlike($dump, qr!file $d/map.conf!, 'missing map.conf'); like($dump, qr!file $d/nginx.conf test failed!, 'test failed'); $t->write_file('inc.conf', 'include inc2.conf;'); $t->write_file('inc2.conf', '#inc2.conf'); $t->write_file('map.conf', '#map.conf;'); ############################################################################### sub getconf { my ($t, $string, $conf) = @_; my $prefix = "# configuration file $d/$conf:\n"; my $offset = index($string, $prefix) + length($prefix); my $len = length($t->read_file($conf)); my $s = substr($string, $offset, $len); $s =~ tr/\r//d; return $s; } ###############################################################################