annotate stream_access_log_escape.t @ 1477:8b122b35703b

Tests: fixed session reuse tests in ssl_certificate.t with TLSv1.3. Previously, session data was retrieved too early, before server passed application data, which usually means NewSessionTicket is not yet sent. The fix is to ask server for application data, then retrieve a session.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 20 May 2019 16:00:40 +0300
parents 766bcbb632ee
children f3ba4c74de31
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 {
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
36 map $pid $a {
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
37 default '" \ "';
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
38 }
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
39 map $pid $b {
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
40 default "foo";
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
41 }
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
42
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
43 log_format json escape=json $a$b$upstream_addr;
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
44 log_format default escape=default $a$b$upstream_addr;
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
45
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
46 server {
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
47 listen 127.0.0.1:8080;
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
48 return ok;
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
49
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
50 access_log %%TESTDIR%%/json.log json;
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
51 access_log %%TESTDIR%%/test.log default;
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
52 }
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
53 }
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 EOF
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
56
1251
766bcbb632ee Tests: removed TODO and try_run() checks for legacy versions.
Sergey Kandaurov <pluknet@nginx.com>
parents: 1097
diff changeset
57 $t->run()->plan(2);
1097
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
58
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
59 ###############################################################################
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 http_get('/');
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 $t->stop();
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 is($t->read_file('json.log'), '\" \\\\ \"foo' . "\n", 'json');
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
66 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
67
a5f9c878c3ab Tests: basic access_log escape tests.
Sergey Kandaurov <pluknet@nginx.com>
parents:
diff changeset
68 ###############################################################################