# HG changeset patch # User Sergey Kandaurov # Date 1429786882 -10800 # Node ID f3434de79a7f2fa86e4f8cebecc8b562b846ca0d # Parent 9208d82439261772637457f9984676686efd6823 Tests: upstream zone tests with ssl backend. diff --git a/lib/Test/Nginx.pm b/lib/Test/Nginx.pm --- a/lib/Test/Nginx.pm +++ b/lib/Test/Nginx.pm @@ -124,6 +124,8 @@ sub has_module($) { => '(?s)^(?!.*--without-http_upstream_least_conn_mod)', upstream_keepalive => '(?s)^(?!.*--without-http_upstream_keepalive_modu)', + upstream_zone + => '(?s)^(?!.*--without-http_upstream_zone_module)', http => '(?s)^(?!.*--without-http(?!\S))', cache => '(?s)^(?!.*--without-http-cache)', pop3 => '(?s)^(?!.*--without-mail_pop3_module)', @@ -135,6 +137,8 @@ sub has_module($) { stream => '--with-stream(?!\S)', stream_upstream_least_conn => '(?s)^(?!.*--without-stream_upstream_least_conn_m)', + stream_upstream_zone + => '(?s)^(?!.*--without-stream_upstream_zone_module)', ); my $re = $regex{$feature}; diff --git a/stream_upstream_zone_ssl.t b/stream_upstream_zone_ssl.t new file mode 100644 --- /dev/null +++ b/stream_upstream_zone_ssl.t @@ -0,0 +1,150 @@ +#!/usr/bin/perl + +# (C) Sergey Kandaurov +# (C) Nginx, Inc. + +# Stream tests for upstream zone with ssl backend. + +############################################################################### + +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/stream stream_ssl http http_ssl/) + ->has(qw/stream_upstream_zone/)->has_daemon('openssl')->plan(8); + +$t->write_file_expand('nginx.conf', <<'EOF'); + +%%TEST_GLOBALS%% + +daemon off; + +events { +} + +stream { + proxy_ssl on; + proxy_ssl_session_reuse on; + + upstream u { + zone u 32k; + server 127.0.0.1:8087; + } + + upstream u2 { + zone u; + server 127.0.0.1:8087 backup; + server 127.0.0.1:8088 down; + } + + server { + listen 127.0.0.1:8080; + proxy_pass u; + proxy_ssl_session_reuse off; + } + + server { + listen 127.0.0.1:8081; + proxy_pass u; + } + + server { + listen 127.0.0.1:8082; + proxy_pass u2; + proxy_ssl_session_reuse off; + } + + server { + listen 127.0.0.1:8083; + proxy_pass u2; + } +} + +http { + %%TEST_GLOBALS_HTTP%% + + server { + listen 127.0.0.1:8087 ssl; + + ssl_certificate_key localhost.key; + ssl_certificate localhost.crt; + ssl_session_cache builtin; + + location / { + add_header X-Session $ssl_session_reused; + } + } +} + +EOF + +$t->write_file('openssl.conf', <write_file('index.html', ''); + +my $d = $t->testdir(); + +foreach my $name ('localhost') { + system('openssl req -x509 -new ' + . "-config '$d/openssl.conf' -subj '/CN=$name/' " + . "-out '$d/$name.crt' -keyout '$d/$name.key' " + . ">>$d/openssl.out 2>&1") == 0 + or die "Can't create certificate for $name: $!\n"; +} + +$t->run(); + +############################################################################### + +like(http_get('/', socket => getconn('127.0.0.1:8080')), + qr/200 OK.*X-Session: \./s, 'ssl'); +like(http_get('/', socket => getconn('127.0.0.1:8081')), + qr/200 OK.*X-Session: \./s, 'ssl 2'); + +like(http_get('/', socket => getconn('127.0.0.1:8080')), + qr/200 OK.*X-Session: \./s, 'ssl reuse session'); +like(http_get('/', socket => getconn('127.0.0.1:8081')), + qr/200 OK.*X-Session: r/s, 'ssl reuse session 2'); + +like(http_get('/', socket => getconn('127.0.0.1:8082')), + qr/200 OK.*X-Session: \./s, 'ssl backup'); +like(http_get('/', socket => getconn('127.0.0.1:8083')), + qr/200 OK.*X-Session: \./s, 'ssl backup 2'); + +like(http_get('/', socket => getconn('127.0.0.1:8082')), + qr/200 OK.*X-Session: \./s, 'ssl reuse session backup'); +like(http_get('/', socket => getconn('127.0.0.1:8083')), + qr/200 OK.*X-Session: r/s, 'ssl reuse session backup 2'); + +############################################################################### + +sub getconn { + my $peer = shift; + my $s = IO::Socket::INET->new( + Proto => 'tcp', + PeerAddr => $peer || '127.0.0.1:8080' + ) + or die "Can't connect to nginx: $!\n"; + + return $s; +} + +############################################################################### diff --git a/upstream_zone_ssl.t b/upstream_zone_ssl.t new file mode 100644 --- /dev/null +++ b/upstream_zone_ssl.t @@ -0,0 +1,123 @@ +#!/usr/bin/perl + +# (C) Sergey Kandaurov +# (C) Nginx, Inc. + +# Tests for upstream zone with ssl backend. + +############################################################################### + +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 proxy http_ssl upstream_zone/) + ->has_daemon('openssl')->write_file_expand('nginx.conf', <<'EOF'); + +%%TEST_GLOBALS%% + +daemon off; + +events { +} + +http { + %%TEST_GLOBALS_HTTP%% + + upstream u { + zone u 32k; + server 127.0.0.1:8081; + } + + upstream u2 { + zone u; + server 127.0.0.1:8081 backup; + server 127.0.0.1:8082 down; + } + + server { + listen 127.0.0.1:8081 ssl; + + ssl_certificate_key localhost.key; + ssl_certificate localhost.crt; + ssl_session_cache builtin; + + location / { + add_header X-Session $ssl_session_reused; + } + } + + server { + listen 127.0.0.1:8080; + server_name localhost; + + proxy_ssl_session_reuse off; + + location /ssl_reuse { + proxy_pass https://u/; + proxy_ssl_session_reuse on; + } + + location /ssl { + proxy_pass https://u/; + } + + location /backup_reuse { + proxy_pass https://u2/; + proxy_ssl_session_reuse on; + } + + location /backup { + proxy_pass https://u2/; + } + } +} + +EOF + +$t->write_file('openssl.conf', <write_file('index.html', ''); + +my $d = $t->testdir(); + +foreach my $name ('localhost') { + system('openssl req -x509 -new ' + . "-config '$d/openssl.conf' -subj '/CN=$name/' " + . "-out '$d/$name.crt' -keyout '$d/$name.key' " + . ">>$d/openssl.out 2>&1") == 0 + or die "Can't create certificate for $name: $!\n"; +} + +$t->try_run('no upstream zone')->plan(8); + +############################################################################### + +like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl'); +like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2'); +like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: \./s, 'ssl reuse session'); +like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl reuse session 2'); + +like(http_get('/backup'), qr/200 OK.*X-Session: \./s, 'backup'); +like(http_get('/backup'), qr/200 OK.*X-Session: \./s, 'backup 2'); +like(http_get('/backup_reuse'), qr/200 OK.*X-Session: \./s, 'backup reuse'); +like(http_get('/backup_reuse'), qr/200 OK.*X-Session: r/s, 'backup reuse 2'); + +###############################################################################