Mercurial > hg > nginx-tests
annotate stream_access_log_escape.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 | f3ba4c74de31 |
children |
rev | line source |
---|---|
1097
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
1 #!/usr/bin/perl |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
2 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
3 # (C) Sergey Kandaurov |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
4 # (C) Nginx, Inc. |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
5 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
6 # Stream tests for access_log with escape parameter. |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
7 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
8 ############################################################################### |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
9 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
10 use warnings; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
11 use strict; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
12 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
13 use Test::More; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
14 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
15 BEGIN { use FindBin; chdir($FindBin::Bin); } |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
16 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
17 use lib 'lib'; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
18 use Test::Nginx; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
19 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
20 ############################################################################### |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
21 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
22 select STDERR; $| = 1; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
23 select STDOUT; $| = 1; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
24 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
25 my $t = Test::Nginx->new()->has(qw/stream stream_map stream_return/) |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
26 ->write_file_expand('nginx.conf', <<'EOF'); |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
27 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
28 %%TEST_GLOBALS%% |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
29 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
30 daemon off; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
31 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
32 events { |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
33 } |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
34 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
35 stream { |
1609
f3ba4c74de31
Tests: added TEST_GLOBALS_STREAM variable support.
Andrei Belov <defan@nginx.com>
parents:
1251
diff
changeset
|
36 %%TEST_GLOBALS_STREAM%% |
f3ba4c74de31
Tests: added TEST_GLOBALS_STREAM variable support.
Andrei Belov <defan@nginx.com>
parents:
1251
diff
changeset
|
37 |
1097
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
38 map $pid $a { |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
39 default '" \ "'; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
40 } |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
41 map $pid $b { |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
42 default "foo"; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
43 } |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
44 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
45 log_format json escape=json $a$b$upstream_addr; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
46 log_format default escape=default $a$b$upstream_addr; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
47 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
48 server { |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
49 listen 127.0.0.1:8080; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
50 return ok; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
51 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
52 access_log %%TESTDIR%%/json.log json; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
53 access_log %%TESTDIR%%/test.log default; |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
54 } |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
55 } |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
56 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
57 EOF |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
58 |
1251
766bcbb632ee
Tests: removed TODO and try_run() checks for legacy versions.
Sergey Kandaurov <pluknet@nginx.com>
parents:
1097
diff
changeset
|
59 $t->run()->plan(2); |
1097
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
60 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
61 ############################################################################### |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
62 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
63 http_get('/'); |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
64 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
65 $t->stop(); |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
66 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
67 is($t->read_file('json.log'), '\" \\\\ \"foo' . "\n", 'json'); |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
68 is($t->read_file('test.log'), '\x22 \x5C \x22foo-' . "\n", 'default'); |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
69 |
a5f9c878c3ab
Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff
changeset
|
70 ############################################################################### |