Skip to content

Commit 29dec04

Browse files
committed
tests: fixed a newly failing test due to changes in openresty.org accepted ciphers.
1 parent d987a0c commit 29dec04

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

t/129-ssl-socket.t

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,32 +1153,45 @@ SSL reused session
11531153
11541154
11551155
=== TEST 15: explicit cipher configuration
1156+
--- http_config
1157+
server {
1158+
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
1159+
server_name test.com;
1160+
ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
1161+
ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
1162+
ssl_protocols TLSv1;
1163+
1164+
location / {
1165+
content_by_lua_block {
1166+
ngx.exit(200)
1167+
}
1168+
}
1169+
}
11561170
--- stream_server_config
1157-
resolver $TEST_NGINX_RESOLVER ipv6=off;
11581171
lua_ssl_ciphers ECDHE-RSA-AES256-SHA;
11591172
11601173
content_by_lua_block {
11611174
local sock = ngx.socket.tcp()
11621175
sock:settimeout(2000)
11631176
11641177
do
1165-
local ok, err = sock:connect("openresty.org", 443)
1178+
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
11661179
if not ok then
11671180
ngx.say("failed to connect: ", err)
11681181
return
11691182
end
11701183
11711184
ngx.say("connected: ", ok)
11721185
1173-
local session, err = sock:sslhandshake(nil, "openresty.org")
1186+
local session, err = sock:sslhandshake(nil, "test.com")
11741187
if not session then
11751188
ngx.say("failed to do SSL handshake: ", err)
11761189
return
11771190
end
11781191
11791192
ngx.say("ssl handshake: ", type(session))
11801193
1181-
local req = "GET / HTTP/1.1\r\nHost: openresty.org\r\nConnection: close\r\n\r\n"
1194+
local req = "GET / HTTP/1.1\r\nHost: test.com\r\nConnection: close\r\n\r\n"
11821195
local bytes, err = sock:send(req)
11831196
if not bytes then
11841197
ngx.say("failed to send stream request: ", err)
@@ -1204,8 +1217,8 @@ SSL reused session
12041217
--- stream_response
12051218
connected: 1
12061219
ssl handshake: userdata
1207-
sent stream request: 58 bytes.
1208-
received: HTTP/1.1 302 Moved Temporarily
1220+
sent stream request: 53 bytes.
1221+
received: HTTP/1.1 200 OK
12091222
close: 1 nil
12101223
12111224
--- log_level: debug
@@ -1215,8 +1228,8 @@ qr/^lua ssl save session: ([0-9A-F]+)
12151228
lua ssl free session: ([0-9A-F]+)
12161229
$/
12171230
--- error_log eval
1218-
['lua ssl server name: "openresty.org"',
1219-
qr/SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA (SSLv3|TLSv1)/]
1231+
['lua ssl server name: "test.com"',
1232+
qr/SSL: TLSv\d(?:\.\d)?, cipher: "ECDHE-RSA-AES256-SHA (SSLv3|TLSv1)/]
12201233
--- no_error_log
12211234
SSL reused session
12221235
[error]

0 commit comments

Comments
 (0)