Mercurial > hg > nginx-tests
diff proxy_protocol2.t @ 1526:b3bbb59dc324
Tests: merged $proxy_protocol_port tests with the rest for brevity.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Thu, 24 Oct 2019 15:00:27 +0300 |
parents | 97c8280de681 |
children | 64f19063adfe |
line wrap: on
line diff
--- a/proxy_protocol2.t Tue Oct 22 21:05:51 2019 +0300 +++ b/proxy_protocol2.t Thu Oct 24 15:00:27 2019 +0300 @@ -24,7 +24,7 @@ my $t = Test::Nginx->new()->has(qw/http access realip/); -$t->write_file_expand('nginx.conf', <<'EOF')->plan(21); +$t->write_file_expand('nginx.conf', <<'EOF')->plan(23); %%TEST_GLOBALS%% @@ -36,28 +36,32 @@ http { %%TEST_GLOBALS_HTTP%% - log_format pp '$remote_addr $request'; + log_format pp $remote_addr:$remote_port; server { listen 127.0.0.1:8080 proxy_protocol; server_name localhost; set_real_ip_from 127.0.0.1/32; - add_header X-IP $remote_addr; - add_header X-PP $proxy_protocol_addr; + add_header X-IP $remote_addr!$remote_port; + add_header X-PP $proxy_protocol_addr!$proxy_protocol_port; location /pp { real_ip_header proxy_protocol; error_page 404 =200 /t1; - access_log %%TESTDIR%%/pp.log pp; location /pp_4 { deny 192.0.2.1/32; + access_log %%TESTDIR%%/pp4.log pp; } + location /pp_6 { deny 2001:DB8::1/128; + access_log %%TESTDIR%%/pp6.log pp; } } + + location / { } } } @@ -69,10 +73,10 @@ ############################################################################### my $p = pack("N3C", 0x0D0A0D0A, 0x000D0A51, 0x5549540A, 0x21); -my $tcp4 = $p . pack("CnN2n2", 0x11, 12, 0xc0000201, 0xc0000202, 1234, 5678); +my $tcp4 = $p . pack("CnN2n2", 0x11, 12, 0xc0000201, 0xc0000202, 123, 5678); my $tcp6 = $p . pack("CnNx8NNx8Nn2", 0x21, 36, - 0x20010db8, 0x00000001, 0x20010db8, 0x00000002, 1234, 5678); -my $tlv = $p . pack("CnN2n2x9", 0x11, 21, 0xc0000201, 0xc0000202, 1234, 5678); + 0x20010db8, 0x00000001, 0x20010db8, 0x00000002, 123, 5678); +my $tlv = $p . pack("CnN2n2x9", 0x11, 21, 0xc0000201, 0xc0000202, 123, 5678); my $unk1 = $p . pack("Cxx", 0x01); my $unk2 = $p . pack("CnC4", 0x41, 4, 1, 2, 3, 4); my $r; @@ -81,33 +85,38 @@ $r = pp_get('/t1', $tcp4); like($r, qr/SEE-THIS/, 'tcp4 request'); -like($r, qr/X-PP: 192.0.2.1/, 'tcp4 proxy'); -unlike($r, qr/X-IP: 192.0.2.1/, 'tcp4 client'); +like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tcp4 proxy'); +unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tcp4 client'); $r = pp_get('/t1', $tcp6); like($r, qr/SEE-THIS/, 'tcp6 request'); -like($r, qr/X-PP: 2001:DB8::1/i, 'tcp6 proxy'); -unlike($r, qr/X-IP: 2001:DB8::1/i, 'tcp6 client'); +like($r, qr/X-PP: 2001:DB8::1!123\x0d/i, 'tcp6 proxy'); +unlike($r, qr/X-IP: (2001:DB8::1|[^!]+!123\x0d)/i, 'tcp6 client'); $r = pp_get('/t1', $tlv); like($r, qr/SEE-THIS/, 'tlv request'); -like($r, qr/X-PP: 192.0.2.1/, 'tlv proxy'); -unlike($r, qr/X-IP: 192.0.2.1/, 'tlv client'); +like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tlv proxy'); +unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tlv client'); -like(pp_get('/t1', $unk1), qr/SEE-THIS/, 'unknown request 1'); -like(pp_get('/t1', $unk2), qr/SEE-THIS/, 'unknown request 2'); +$r = pp_get('/t1', $unk1); +like($r, qr/SEE-THIS/, 'unknown request 1'); +like($r, qr/X-PP: !\x0d/, 'unknown proxy 1'); + +$r = pp_get('/t1', $unk2); +like($r, qr/SEE-THIS/, 'unknown request 2'); +like($r, qr/X-PP: !\x0d/, 'unknown proxy 2'); # realip $r = pp_get('/pp', $tcp4); like($r, qr/SEE-THIS/, 'tcp4 request realip'); -like($r, qr/X-PP: 192.0.2.1/, 'tcp4 proxy realip'); -like($r, qr/X-IP: 192.0.2.1/, 'tcp4 client realip'); +like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tcp4 proxy realip'); +like($r, qr/X-IP: 192.0.2.1!123\x0d/, 'tcp4 client realip'); $r = pp_get('/pp', $tcp6); like($r, qr/SEE-THIS/, 'tcp6 request realip'); -like($r, qr/X-PP: 2001:DB8::1/i, 'tcp6 proxy realip'); -like($r, qr/X-IP: 2001:DB8::1/i, 'tcp6 client realip'); +like($r, qr/X-PP: 2001:DB8::1!123\x0d/i, 'tcp6 proxy realip'); +like($r, qr/X-IP: 2001:DB8::1!123\x0d/i, 'tcp6 client realip'); # access @@ -121,9 +130,8 @@ $t->stop(); -my $log = $t->read_file('pp.log'); -like($log, qr!^192\.0\.2\.1 GET /pp_4!m, 'tcp4 access log'); -like($log, qr!^2001:DB8::1 GET /pp_6!mi, 'tcp6 access log'); +is($t->read_file('pp4.log'), "192.0.2.1:123\n", 'tcp4 log'); +is($t->read_file('pp6.log'), "2001:db8::1:123\n", 'tcp6 log'); ###############################################################################