Mercurial > hg > nginx-tests
diff proxy_protocol.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 | cf14cfe9ec8c |
children | 64f19063adfe |
line wrap: on
line diff
--- a/proxy_protocol.t Tue Oct 22 21:05:51 2019 +0300 +++ b/proxy_protocol.t Thu Oct 24 15:00:27 2019 +0300 @@ -26,7 +26,7 @@ my $t = Test::Nginx->new()->has(qw/http access realip/); -$t->write_file_expand('nginx.conf', <<'EOF')->plan(18); +$t->write_file_expand('nginx.conf', <<'EOF')->plan(20); %%TEST_GLOBALS%% @@ -38,28 +38,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 / { } } } @@ -70,8 +74,8 @@ ############################################################################### -my $tcp4 = 'PROXY TCP4 192.0.2.1 192.0.2.2 1234 5678' . CRLF; -my $tcp6 = 'PROXY TCP6 2001:Db8::1 2001:Db8::2 1234 5678' . CRLF; +my $tcp4 = 'PROXY TCP4 192.0.2.1 192.0.2.2 123 5678' . CRLF; +my $tcp6 = 'PROXY TCP6 2001:Db8::1 2001:Db8::2 123 5678' . CRLF; my $unk1 = 'PROXY UNKNOWN' . CRLF; my $unk2 = 'PROXY UNKNOWN 1 2 3 4 5 6' . CRLF; my $r; @@ -80,28 +84,33 @@ $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'); -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 @@ -115,9 +124,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'); ###############################################################################