Skip to content

Commit e9fb2a8

Browse files
spacewanderagentzh
spacewander
authored and
agentzh
committed
tests: removed invalid tailers from lua_package_path.
TEST_NGINX_LUA_PACKAGE_PATH already contains the '?.lua;;' file pattern part Signed-off-by: Yichun Zhang (agentzh) <[email protected]>
1 parent c15cfea commit e9fb2a8

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎t/ocsp.t‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ __DATA__
2525
2626
=== TEST 1: get OCSP responder (good case)
2727
--- http_config
28-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
28+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
2929
3030
server {
3131
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -112,7 +112,7 @@ OCSP url found: http://127.0.0.1:8888/ocsp?foo=1,
112112
113113
=== TEST 2: get OCSP responder (not found)
114114
--- http_config
115-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
115+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
116116
117117
server {
118118
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -203,7 +203,7 @@ OCSP responder not found
203203
204204
=== TEST 3: get OCSP responder (no issuer cert at all)
205205
--- http_config
206-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
206+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
207207
208208
server {
209209
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -293,7 +293,7 @@ failed to get OCSP responder: no issuer certificate in chain
293293
294294
=== TEST 4: get OCSP responder (issuer cert not next to the leaf cert)
295295
--- http_config
296-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
296+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
297297
298298
server {
299299
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -383,7 +383,7 @@ failed to get OCSP responder: issuer certificate not next to leaf
383383
384384
=== TEST 5: get OCSP responder (truncated)
385385
--- http_config
386-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
386+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
387387
388388
server {
389389
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -479,7 +479,7 @@ still get an error: truncated
479479
480480
=== TEST 6: create OCSP request (good)
481481
--- http_config
482-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
482+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
483483
484484
server {
485485
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -573,7 +573,7 @@ OCSP request created with length 68
573573
574574
=== TEST 7: create OCSP request (buffer too small)
575575
--- http_config
576-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
576+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
577577
578578
server {
579579
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -664,7 +664,7 @@ failed to create OCSP request: output buffer too small: 68 > 67
664664
665665
=== TEST 8: create OCSP request (empty string cert chain)
666666
--- http_config
667-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
667+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
668668
669669
server {
670670
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -746,7 +746,7 @@ failed to create OCSP request: d2i_X509_bio() failed
746746
747747
=== TEST 9: create OCSP request (no issuer cert in the chain)
748748
--- http_config
749-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
749+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
750750
751751
server {
752752
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -837,7 +837,7 @@ failed to create OCSP request: no issuer certificate in chain
837837
838838
=== TEST 10: validate good OCSP response
839839
--- http_config
840-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
840+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
841841
842842
server {
843843
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -928,7 +928,7 @@ OCSP response validation ok
928928
929929
=== TEST 11: fail to validate OCSP response - no issuer cert
930930
--- http_config
931-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
931+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
932932
933933
server {
934934
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1019,7 +1019,7 @@ OCSP response validation ok
10191019
10201020
=== TEST 12: validate good OCSP response - no certs in response
10211021
--- http_config
1022-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1022+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
10231023
10241024
server {
10251025
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1113,7 +1113,7 @@ OCSP response validation ok
11131113
FIXME: we should complain in this case.
11141114
11151115
--- http_config
1116-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1116+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
11171117
11181118
server {
11191119
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1205,7 +1205,7 @@ OCSP response validation ok
12051205
=== TEST 14: fail to validate OCSP response - OCSP response signed by an unknown cert and the OCSP response does not contain the unknown cert
12061206
12071207
--- http_config
1208-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1208+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
12091209
12101210
server {
12111211
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1296,7 +1296,7 @@ OCSP response validation ok
12961296
12971297
=== TEST 15: fail to validate OCSP response - OCSP response returns revoked status
12981298
--- http_config
1299-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1299+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
13001300
13011301
server {
13021302
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1388,7 +1388,7 @@ OCSP response validation ok
13881388
=== TEST 16: good status req from client
13891389
FIXME: check the OCSP staple actually received by the ssl client
13901390
--- http_config
1391-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1391+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
13921392
13931393
server {
13941394
listen 127.0.0.2:12345 ssl;
@@ -1470,7 +1470,7 @@ ocsp status resp set ok: nil,
14701470
14711471
=== TEST 17: no status req from client
14721472
--- http_config
1473-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1473+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
14741474
14751475
server {
14761476
listen 127.0.0.2:12345 ssl;

‎t/ssl-session-fetch.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ __DATA__
3333
3434
=== TEST 1: get resume session id serialized
3535
--- http_config
36-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
36+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
3737
ssl_session_fetch_by_lua_block {
3838
local ssl = require "ngx.ssl.session"
3939
local sid = ssl.get_session_id()
@@ -114,7 +114,7 @@ qr/ssl_session_fetch_by_lua_block:4: session id: [a-fA-f\d]+/s,
114114
115115
=== TEST 2: attempt to fetch new session in lua_ctx during resumption.
116116
--- http_config
117-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
117+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
118118
ssl_session_fetch_by_lua_block {
119119
local ssl = require "ngx.ssl.session"
120120
local sess, err = ssl.get_serialized_session()
@@ -205,7 +205,7 @@ qr/ssl_session_fetch_by_lua:\d: session size: [a-fA-f\d]+|get session error: bad
205205
Use a tmp file to store and resume session. This is for testing only.
206206
In practice, never store session in plaintext on persistent storage.
207207
--- http_config
208-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
208+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
209209
ssl_session_store_by_lua_block {
210210
local ssl = require "ngx.ssl.session"
211211
@@ -306,7 +306,7 @@ qr/ssl_session_fetch_by_lua_block:4: session id: [a-fA-F\d]+/s,
306306
Session resumption should fail, but the handshake should be
307307
able to carry on and negotiate a new session.
308308
--- http_config
309-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
309+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
310310
ssl_session_store_by_lua_block {
311311
local ssl = require "ngx.ssl.session"
312312

‎t/ssl-session-store.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ __DATA__
3030
3131
=== TEST 1: get new session serialized
3232
--- http_config
33-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
33+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
3434
ssl_session_store_by_lua_block {
3535
local ssl = require "ngx.ssl.session"
3636
local sess = ssl.get_serialized_session()
@@ -102,7 +102,7 @@ qr/ssl_session_store_by_lua_block:4: session size: \d+/s
102102
103103
=== TEST 2: get new session id serialized
104104
--- http_config
105-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
105+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
106106
ssl_session_store_by_lua_block {
107107
local ssl = require "ngx.ssl.session"
108108
local sid = ssl.get_session_id()
@@ -174,7 +174,7 @@ qr/ssl_session_store_by_lua_block:4: session id: [a-fA-f\d]+/s
174174
175175
=== TEST 3: store the session via timer to memcached
176176
--- http_config
177-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
177+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
178178
ssl_session_store_by_lua_block {
179179
local ssl = require "ngx.ssl.session"
180180
local function f(premature, key, value)

‎t/ssl.t‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ __DATA__
2727
2828
=== TEST 1: clear certs
2929
--- http_config
30-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
30+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
3131
3232
server {
3333
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -117,7 +117,7 @@ sslv3 alert handshake failure
117117
118118
=== TEST 2: set DER cert and private key
119119
--- http_config
120-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
120+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
121121
122122
server {
123123
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -237,7 +237,7 @@ lua ssl server name: "test.com"
237237
238238
=== TEST 3: read SNI name via ssl.server_name()
239239
--- http_config
240-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
240+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
241241
242242
server {
243243
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -336,7 +336,7 @@ read SNI name from Lua: test.com
336336
337337
=== TEST 4: read SNI name via ssl.server_name() when no SNI name specified
338338
--- http_config
339-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
339+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
340340
341341
server {
342342
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -436,7 +436,7 @@ read SNI name from Lua: nil, type: nil
436436
437437
=== TEST 5: read raw server addr via ssl.raw_server_addr() (unix domain socket)
438438
--- http_config
439-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
439+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
440440
441441
server {
442442
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -555,7 +555,7 @@ qr/Using unix socket file .*?nginx\.sock/
555555
556556
=== TEST 6: read raw server addr via ssl.raw_server_addr() (IPv4)
557557
--- http_config
558-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
558+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
559559
560560
server {
561561
listen 127.0.0.1:12345 ssl;
@@ -674,7 +674,7 @@ Using IPv4 address: 127.0.0.1
674674
675675
=== TEST 7: read raw server addr via ssl.raw_server_addr() (IPv6)
676676
--- http_config
677-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
677+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
678678
679679
server {
680680
listen [::1]:12345 ssl;
@@ -794,7 +794,7 @@ Using IPv6 address: 0.0.0.1
794794
795795
=== TEST 8: set DER cert chain
796796
--- http_config
797-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
797+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
798798
799799
server {
800800
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -915,7 +915,7 @@ lua ssl server name: "test.com"
915915
916916
=== TEST 9: read PEM cert chain but set DER cert chain
917917
--- http_config
918-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
918+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
919919
920920
server {
921921
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1042,7 +1042,7 @@ lua ssl server name: "test.com"
10421042
10431043
=== TEST 10: tls version - SSLv3
10441044
--- http_config
1045-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1045+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
10461046
10471047
server {
10481048
listen 127.0.0.2:12345 ssl;
@@ -1118,7 +1118,7 @@ got TLS1 version: SSLv3,
11181118
11191119
=== TEST 11: tls version - TLSv1
11201120
--- http_config
1121-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1121+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
11221122
11231123
server {
11241124
listen 127.0.0.2:12345 ssl;
@@ -1194,7 +1194,7 @@ got TLS1 version: TLSv1,
11941194
11951195
=== TEST 12: tls version - TLSv1.1
11961196
--- http_config
1197-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1197+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
11981198
11991199
server {
12001200
listen 127.0.0.2:12345 ssl;
@@ -1270,7 +1270,7 @@ got TLS1 version: TLSv1.1,
12701270
12711271
=== TEST 13: tls version - TLSv1.2
12721272
--- http_config
1273-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1273+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
12741274
12751275
server {
12761276
listen 127.0.0.2:12345 ssl;
@@ -1346,7 +1346,7 @@ got TLS1 version: TLSv1.2,
13461346
13471347
=== TEST 14: ngx.semaphore in ssl_certificate_by_lua*
13481348
--- http_config
1349-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1349+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
13501350
13511351
server {
13521352
listen 127.0.0.2:12345 ssl;
@@ -1435,7 +1435,7 @@ ssl cert by lua done
14351435
14361436
=== TEST 15: read PEM key chain but set DER key chain
14371437
--- http_config
1438-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1438+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
14391439
14401440
server {
14411441
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1567,7 +1567,7 @@ lua ssl server name: "test.com"
15671567
15681568
=== TEST 16: parse PEM cert and key to cdata
15691569
--- http_config
1570-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1570+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
15711571
15721572
server {
15731573
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1700,7 +1700,7 @@ lua ssl server name: "test.com"
17001700
17011701
=== TEST 17: parse PEM cert and key to cdata (bad cert 0 in the chain)
17021702
--- http_config
1703-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1703+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
17041704
17051705
server {
17061706
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1824,7 +1824,7 @@ qr/\[error\] .*? failed to parse pem cert: PEM_read_bio_X509_AUX\(\) failed/
18241824
18251825
=== TEST 18: parse PEM cert and key to cdata (bad cert 2 in the chain)
18261826
--- http_config
1827-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1827+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
18281828
18291829
server {
18301830
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1948,7 +1948,7 @@ qr/\[error\] .*? failed to parse pem cert: PEM_read_bio_X509\(\) failed/
19481948
19491949
=== TEST 19: parse PEM cert and key to cdata (bad priv key)
19501950
--- http_config
1951-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
1951+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
19521952
19531953
server {
19541954
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2072,7 +2072,7 @@ qr/\[error\] .*? failed to parse pem key: PEM_read_bio_PrivateKey\(\) failed/
20722072
20732073
=== TEST 20: read client addr via ssl.raw_client_addr()
20742074
--- http_config
2075-
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
2075+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
20762076
20772077
server {
20782078
listen 127.0.0.1:12345 ssl;

0 commit comments

Comments
 (0)