Skip to content

Commit d475734

Browse files
spacewanderdndx
authored andcommitted
tests: corrected the No SNI, No verify case in 129-ssl-socket.t.
1 parent 00d5da3 commit d475734

File tree

1 file changed

+40
-18
lines changed

1 file changed

+40
-18
lines changed

t/129-ssl-socket.t

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ use Test::Nginx::Socket::Lua::Stream;
44

55
repeat_each(2);
66

7-
plan tests => repeat_each() * 215;
7+
plan tests => repeat_each() * 216;
88

99
$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
1010

1111
$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
1212
$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
13+
$ENV{TEST_NGINX_SERVER_SSL_PORT} ||= 12345;
1314

1415
#log_level 'warn';
1516
log_level 'debug';
@@ -119,15 +120,27 @@ SSL reused session
119120

120121

121122
=== TEST 2: no SNI, no verify
122-
--- stream_server_config
123-
resolver $TEST_NGINX_RESOLVER ipv6=off;
123+
--- stream_config
124+
server {
125+
listen $TEST_NGINX_SERVER_SSL_PORT ssl;
126+
ssl_certificate ../html/test.crt;
127+
ssl_certificate_key ../html/test.key;
124128

125-
content_by_lua_block {
126-
local sock = ngx.socket.tcp()
127-
sock:settimeout(2000)
129+
content_by_lua_block {
130+
local sock = assert(ngx.req.socket(true))
131+
local data = sock:receive()
132+
if data == "ping" then
133+
ngx.say("pong")
134+
end
135+
}
136+
}
128137

138+
--- stream_server_config
139+
content_by_lua_block {
129140
do
130-
local ok, err = sock:connect("openresty.org", 443)
141+
local sock = ngx.socket.tcp()
142+
sock:settimeout(2000)
143+
local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT)
131144
if not ok then
132145
ngx.say("failed to connect: ", err)
133146
return
@@ -143,18 +156,18 @@ SSL reused session
143156

144157
ngx.say("ssl handshake: ", type(session))
145158

146-
local req = "GET / HTTP/1.1\r\nHost: openresty.org\r\nConnection: close\r\n\r\n"
147-
local bytes, err = sock:send(req)
159+
local req = "ping"
160+
local bytes, err = sock:send(req .. '\n')
148161
if not bytes then
149-
ngx.say("failed to send stream request: ", err)
162+
ngx.say("failed to send request: ", err)
150163
return
151164
end
152165

153-
ngx.say("sent stream request: ", bytes, " bytes.")
166+
ngx.say("sent: ", req)
154167

155168
local line, err = sock:receive()
156169
if not line then
157-
ngx.say("failed to recieve response status line: ", err)
170+
ngx.say("failed to receive response: ", err)
158171
return
159172
end
160173

@@ -166,19 +179,28 @@ SSL reused session
166179
collectgarbage()
167180
}
168181

169-
--- config
170-
server_tokens off;
171-
172182
--- stream_response
173183
connected: 1
174-
failed to do SSL handshake: handshake failed
184+
ssl handshake: userdata
185+
sent: ping
186+
received: pong
187+
close: 1 nil
188+
189+
--- user_files eval
190+
">>> test.key
191+
$::TestCertificateKey
192+
>>> test.crt
193+
$::TestCertificate"
175194

176-
--- log_level: debug
177195
--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
178-
--- grep_error_log_out
196+
--- grep_error_log_out eval
197+
qr/^lua ssl save session: ([0-9A-F]+)
198+
lua ssl free session: ([0-9A-F]+)
199+
$/
179200
--- no_error_log
180201
lua ssl server name:
181202
SSL reused session
203+
[error]
182204
[alert]
183205
--- timeout: 5
184206

0 commit comments

Comments
 (0)