Skip to content

Commit d7cad95

Browse files
committed
Add needed newlines in test request body lines or adjust tests
1 parent a5a3db9 commit d7cad95

29 files changed

Lines changed: 1298 additions & 1300 deletions

test/test-cases/regression/action-tnf-base64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
]
3737
},
3838
"expected":{
39-
"debug_log": "t:base64encode: \"dmFsdWUyCg==\""
39+
"debug_log": "t:base64encode: \"dmFsdWUy\""
4040
},
4141
"rules":[
4242
"SecRuleEngine On",

test/test-cases/regression/auditlog.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@
640640
]
641641
},
642642
"expected": {
643-
"audit_log": "\"body\":\"\\\\\\\\xc2\\\\\\\\xad=\\\\\\\\xc2\\\\\\\\xad\\\\\\\\x0a",
643+
"audit_log": "\"body\":\"\\\\\\\\xc2\\\\\\\\xad=\\\\\\\\xc2\\\\\\\\xad",
644644
"debug_log": "",
645645
"error_log": "",
646646
"http_code": 403

test/test-cases/regression/config-body_limits.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -698,15 +698,15 @@
698698
"uri":"/",
699699
"method":"POST",
700700
"body": [
701-
"--0000",
702-
"Content-Disposition: form-data; name=\"a\"",
703-
"",
704-
"1",
705-
"--0000",
706-
"Content-Disposition: form-data; name=\"b\"; filename=\"c.txt\"",
707-
"",
708-
"2222222222222222222222222222222222222222222222222222222222222222222222",
709-
"--0000--"
701+
"--0000\n",
702+
"Content-Disposition: form-data; name=\"a\"\n",
703+
"\n",
704+
"1\n",
705+
"--0000\n",
706+
"Content-Disposition: form-data; name=\"b\"; filename=\"c.txt\"\n",
707+
"\n",
708+
"2222222222222222222222222222222222222222222222222222222222222222222222\n",
709+
"--0000--\n"
710710
]
711711
},
712712
"response":{
@@ -753,15 +753,15 @@
753753
"uri":"/",
754754
"method":"POST",
755755
"body": [
756-
"--0000",
757-
"Content-Disposition: form-data; name=\"a\"",
758-
"",
759-
"1",
760-
"--0000",
761-
"Content-Disposition: form-data; name=\"b\"; filename=\"c.txt\"",
762-
"",
763-
"2222222222222222222222222222222222222222222222222222222222222222222222",
764-
"--0000--"
756+
"--0000\n",
757+
"Content-Disposition: form-data; name=\"a\"\n",
758+
"\n",
759+
"1\n",
760+
"--0000\n",
761+
"Content-Disposition: form-data; name=\"b\"; filename=\"c.txt\"\n",
762+
"\n",
763+
"2222222222222222222222222222222222222222222222222222222222222222222222\n",
764+
"--0000--\n"
765765
]
766766
},
767767
"response":{

test/test-cases/regression/issue-1825.json

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
"uri":"/",
2424
"method":"POST",
2525
"body":[
26-
"----------------------------756b6d74fa1a8ee2",
27-
"Content-Disposition: form-data; name=\"name\"",
28-
"",
29-
"test",
30-
"----------------------------756b6d74fa1a8ee2",
31-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''03CB1664.txt",
32-
"Content-Type: text/plain",
33-
"",
34-
"This is a very small test file..",
35-
"----------------------------756b6d74fa1a8ee2--"
26+
"----------------------------756b6d74fa1a8ee2\n",
27+
"Content-Disposition: form-data; name=\"name\"\n",
28+
"\n",
29+
"test\n",
30+
"----------------------------756b6d74fa1a8ee2\n",
31+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''03CB1664.txt\n",
32+
"Content-Type: text/plain\n",
33+
"\n",
34+
"This is a very small test file..\n",
35+
"----------------------------756b6d74fa1a8ee2--\n"
3636
]
3737
},
3838
"response":{
@@ -71,16 +71,16 @@
7171
"uri":"/",
7272
"method":"POST",
7373
"body":[
74-
"----------------------------756b6d74fa1a8ee2",
75-
"Content-Disposition: form-data; name=\"name\"",
76-
"",
77-
"test",
78-
"----------------------------756b6d74fa1a8ee2",
79-
"Content-Disposition: form-data; name=\"filedata\"; filename*= ISO-8859-1''ab0-_xy.txt; filename=\"ab0-_xy.txt\"",
80-
"Content-Type: text/plain",
81-
"",
82-
"This is a very small test file..",
83-
"----------------------------756b6d74fa1a8ee2--"
74+
"----------------------------756b6d74fa1a8ee2\n",
75+
"Content-Disposition: form-data; name=\"name\"\n",
76+
"\n",
77+
"test\n",
78+
"----------------------------756b6d74fa1a8ee2\n",
79+
"Content-Disposition: form-data; name=\"filedata\"; filename*= ISO-8859-1''ab0-_xy.txt; filename=\"ab0-_xy.txt\"\n",
80+
"Content-Type: text/plain\n",
81+
"\n",
82+
"This is a very small test file..\n",
83+
"----------------------------756b6d74fa1a8ee2--\n"
8484
]
8585
},
8686
"response":{
@@ -119,17 +119,17 @@
119119
"uri":"/",
120120
"method":"POST",
121121
"body":[
122-
"----------------------------756b6d74fa1a8ee2",
123-
"Content-Disposition: form-data; name=\"name\"",
124-
"",
125-
"test",
126-
"----------------------------756b6d74fa1a8ee2",
127-
"Content-Disposition: form-data; name=\"filedata\"; filename*=utf-8''03CB1664.txt",
128-
"Content-Type: text/plain",
129-
"",
130-
"This is a very small test file..",
131-
"----------------------------756b6d74fa1a8ee2--\r"
132-
]
122+
"----------------------------756b6d74fa1a8ee2\n",
123+
"Content-Disposition: form-data; name=\"name\"\n",
124+
"\n",
125+
"test\n",
126+
"----------------------------756b6d74fa1a8ee2\n",
127+
"Content-Disposition: form-data; name=\"filedata\"; filename*=utf-8''03CB1664.txt\n",
128+
"Content-Type: text/plain\n",
129+
"\n",
130+
"This is a very small test file..\n",
131+
"----------------------------756b6d74fa1a8ee2--\r\n"
132+
]
133133
},
134134
"response":{
135135
"headers":"",
@@ -167,16 +167,16 @@
167167
"uri":"/",
168168
"method":"POST",
169169
"body":[
170-
"----------------------------756b6d74fa1a8ee2",
171-
"Content-Disposition: form-data; name=\"name\"",
172-
"",
173-
"test",
174-
"----------------------------756b6d74fa1a8ee2",
175-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=''03CB1664.txt",
176-
"Content-Type: text/plain",
177-
"",
178-
"This is a very small test file..",
179-
"----------------------------756b6d74fa1a8ee2--"
170+
"----------------------------756b6d74fa1a8ee2\n",
171+
"Content-Disposition: form-data; name=\"name\"\n",
172+
"\n",
173+
"test\n",
174+
"----------------------------756b6d74fa1a8ee2\n",
175+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=''03CB1664.txt\n",
176+
"Content-Type: text/plain\n",
177+
"\n",
178+
"This is a very small test file..\n",
179+
"----------------------------756b6d74fa1a8ee2--\n"
180180
]
181181
},
182182
"response":{
@@ -215,16 +215,16 @@
215215
"uri":"/",
216216
"method":"POST",
217217
"body":[
218-
"----------------------------756b6d74fa1a8ee2",
219-
"Content-Disposition: form-data; name=\"name\"",
220-
"",
221-
"test",
222-
"----------------------------756b6d74fa1a8ee2",
223-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=UTF-8'03CB1664.txt",
224-
"Content-Type: text/plain",
225-
"",
226-
"This is a very small test file..",
227-
"----------------------------756b6d74fa1a8ee2--"
218+
"----------------------------756b6d74fa1a8ee2\n",
219+
"Content-Disposition: form-data; name=\"name\"\n",
220+
"\n",
221+
"test\n",
222+
"----------------------------756b6d74fa1a8ee2\n",
223+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=UTF-8'03CB1664.txt\n",
224+
"Content-Type: text/plain\n",
225+
"\n",
226+
"This is a very small test file..\n",
227+
"----------------------------756b6d74fa1a8ee2--\n"
228228
]
229229
},
230230
"response":{
@@ -263,16 +263,16 @@
263263
"uri":"/",
264264
"method":"POST",
265265
"body":[
266-
"----------------------------756b6d74fa1a8ee2",
267-
"Content-Disposition: form-data; name=\"name\"",
268-
"",
269-
"test",
270-
"----------------------------756b6d74fa1a8ee2",
271-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''%61%4G.txt",
272-
"Content-Type: text/plain",
273-
"",
274-
"This is a very small test file..",
275-
"----------------------------756b6d74fa1a8ee2--"
266+
"----------------------------756b6d74fa1a8ee2\n",
267+
"Content-Disposition: form-data; name=\"name\"\n",
268+
"\n",
269+
"test\n",
270+
"----------------------------756b6d74fa1a8ee2\n",
271+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''%61%4G.txt\n",
272+
"Content-Type: text/plain\n",
273+
"\n",
274+
"This is a very small test file..\n",
275+
"----------------------------756b6d74fa1a8ee2--\n"
276276
]
277277
},
278278
"response":{
@@ -311,16 +311,16 @@
311311
"uri":"/",
312312
"method":"POST",
313313
"body":[
314-
"----------------------------756b6d74fa1a8ee2",
315-
"Content-Disposition: form-data; name=\"name\"",
316-
"",
317-
"test",
318-
"----------------------------756b6d74fa1a8ee2",
319-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''%61%62.txt",
320-
"Content-Type: text/plain",
321-
"",
322-
"This is a very small test file..",
323-
"----------------------------756b6d74fa1a8ee2--"
314+
"----------------------------756b6d74fa1a8ee2\n",
315+
"Content-Disposition: form-data; name=\"name\"\n",
316+
"\n",
317+
"test\n",
318+
"----------------------------756b6d74fa1a8ee2\n",
319+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''%61%62.txt\n",
320+
"Content-Type: text/plain\n",
321+
"\n",
322+
"This is a very small test file..\n",
323+
"----------------------------756b6d74fa1a8ee2--\n"
324324
]
325325
},
326326
"response":{

test/test-cases/regression/issue-2427.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@
2424
"uri":"/wheee/f%20i%20l%20e%20",
2525
"method":"POST",
2626
"body":[
27-
"----------------------------756b6d74fa1a8ee2",
28-
"Content-Disposition: form-data; name=\"name\"",
29-
"",
30-
"test",
31-
"----------------------------756b6d74fa1a8ee2",
32-
"Content-Disposition: form-data; name=\"name2\"",
33-
"",
34-
"test2",
35-
"----------------------------756b6d74fa1a8ee2",
36-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"",
37-
"Content-Type: text/plain",
38-
"",
39-
"This is a very small test file..",
40-
"----------------------------756b6d74fa1a8ee2",
41-
"Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"small2.txt\" ",
42-
"Content-Type: text/plain",
43-
"",
44-
"This is another very small test file that contains the search content abcdef..",
45-
"----------------------------756b6d74fa1a8ee2--"
27+
"----------------------------756b6d74fa1a8ee2\n",
28+
"Content-Disposition: form-data; name=\"name\"\n",
29+
"\n",
30+
"test\n",
31+
"----------------------------756b6d74fa1a8ee2\n",
32+
"Content-Disposition: form-data; name=\"name2\"\n",
33+
"\n",
34+
"test2\n",
35+
"----------------------------756b6d74fa1a8ee2\n",
36+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"\n",
37+
"Content-Type: text/plain\n",
38+
"\n",
39+
"This is a very small test file..\n",
40+
"----------------------------756b6d74fa1a8ee2\n",
41+
"Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"small2.txt\" \n",
42+
"Content-Type: text/plain\n",
43+
"\n",
44+
"This is another very small test file that contains the search content abcdef..\n",
45+
"----------------------------756b6d74fa1a8ee2--\n"
4646
]
4747
},
4848
"expected":{

0 commit comments

Comments
 (0)