Skip to content

Commit 93c5b8c

Browse files
author
Felipe Zimmerle
committed
Merge branch 'regression'
2 parents 0ddd2b4 + 0ad390d commit 93c5b8c

File tree

9 files changed

+81
-93
lines changed

9 files changed

+81
-93
lines changed

‎tests/regression/action/10-logging.t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
SecAction "phase:1,pass,nolog,id:500007"
3838
),
3939
match_log => {
40-
-error => [ qr/ModSecurity: /, 1 ],
40+
-error => [ qr/500007/, 1 ],
4141
-audit => [ qr/./, 1 ],
4242
},
4343
match_response => {
@@ -85,7 +85,7 @@
8585
SecAction "phase:1,deny,status:403,nolog,id:500009"
8686
),
8787
match_log => {
88-
-error => [ qr/ModSecurity: /, 1 ],
88+
-error => [ qr/500009/, 1 ],
8989
-audit => [ qr/./, 1 ],
9090
},
9191
match_response => {
@@ -274,7 +274,7 @@
274274
SecAction "phase:1,pass,nolog,noauditlog,id:500017"
275275
),
276276
match_log => {
277-
-error => [ qr/ModSecurity: /, 1 ],
277+
-error => [ qr/500017/, 1 ],
278278
-audit => [ qr/./, 1 ],
279279
},
280280
match_response => {
@@ -320,7 +320,7 @@
320320
SecAction "phase:1,pass,auditlog,nolog,id:500019"
321321
),
322322
match_log => {
323-
-error => [ qr/ModSecurity: /, 1 ],
323+
-error => [ qr/500019/, 1 ],
324324
-audit => [ qr/./, 1 ],
325325
},
326326
match_response => {
@@ -366,7 +366,7 @@
366366
SecAction "phase:1,pass,noauditlog,nolog,id:500021"
367367
),
368368
match_log => {
369-
-error => [ qr/ModSecurity: /, 1 ],
369+
-error => [ qr/500021/, 1 ],
370370
-audit => [ qr/./, 1 ],
371371
},
372372
match_response => {
@@ -460,7 +460,7 @@
460460
SecAction "phase:1,deny,status:403,nolog,noauditlog,id:500025"
461461
),
462462
match_log => {
463-
-error => [ qr/ModSecurity: /, 1 ],
463+
-error => [ qr/500025/, 1 ],
464464
-audit => [ qr/./, 1 ],
465465
},
466466
match_response => {
@@ -506,7 +506,7 @@
506506
SecAction "phase:1,deny,status:403,auditlog,nolog,id:500027"
507507
),
508508
match_log => {
509-
-error => [ qr/ModSecurity: /, 1 ],
509+
-error => [ qr/500027/, 1 ],
510510
-audit => [ qr/./, 1 ],
511511
},
512512
match_response => {
@@ -552,7 +552,7 @@
552552
SecAction "phase:1,deny,status:403,noauditlog,nolog,id:500029"
553553
),
554554
match_log => {
555-
-error => [ qr/ModSecurity: /, 1 ],
555+
-error => [ qr/500029/, 1 ],
556556
-audit => [ qr/./, 1 ],
557557
},
558558
match_response => {

‎tests/regression/config/10-misc-directives.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
conf => qq(
1414
SecRuleEngine on
1515
SecDefaultAction "phase:1,deny,status:500"
16-
SecRule REQUEST_URI "test.txt,id:500240"
16+
SecRule REQUEST_URI "test.txt" "id:500241"
1717
),
1818
match_log => {
1919
error => [ qr/ModSecurity: Access denied with code 500 \(phase 1\)/, 1 ],

‎tests/regression/config/10-request-directives.t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
SecRuleEngine On
99
SecArgumentSeparator ";"
1010
SecRule ARGS:a "@streq 1" "phase:1,deny,chain,id:500215"
11-
SecRule ARGS:b "@streq 2,id:500216"
11+
SecRule ARGS:b "@streq 2" ""
1212
),
1313
match_log => {
1414
error => [ qr/Access denied with code 403 \(phase 1\)\. String match "2" at ARGS:b\./, 1 ],
@@ -26,7 +26,7 @@
2626
conf => q(
2727
SecRuleEngine On
2828
SecRule ARGS:a "@streq 1" "phase:1,deny,chain,id:500217"
29-
SecRule ARGS:b "@streq 2,id:500218"
29+
SecRule ARGS:b "@streq 2" ""
3030
),
3131
match_log => {
3232
-error => [ qr/Access denied/, 1 ],
@@ -46,7 +46,7 @@
4646
SecRequestBodyAccess On
4747
SecArgumentSeparator ";"
4848
SecRule ARGS:a "@streq 1" "phase:2,deny,chain,id:500219"
49-
SecRule ARGS:b "@streq 2,id:500220"
49+
SecRule ARGS:b "@streq 2" ""
5050
),
5151
match_log => {
5252
error => [ qr/Access denied with code 403 \(phase 2\)\. String match "2" at ARGS:b\./, 1 ],
@@ -94,7 +94,7 @@
9494
SecRuleEngine On
9595
SecRequestBodyAccess On
9696
SecRule ARGS:a "\@streq 1" "phase:2,deny,chain,id:500223"
97-
SecRule ARGS:b "\@streq 2,id:500224"
97+
SecRule ARGS:b "\@streq 2" ""
9898
),
9999
match_log => {
100100
error => [ qr/Access denied with code 403 \(phase 2\)\. String match "2" at ARGS:b\./, 1 ],
@@ -500,8 +500,8 @@
500500
SecDebugLogLevel 5
501501
SecCookieFormat 1
502502
SecRule REQUEST_COOKIES_NAMES "\@streq SESSIONID" "phase:1,deny,chain,id:500231"
503-
SecRule REQUEST_COOKIES:\$SESSIONID_PATH "\@streq /" "chain,id:500232"
504-
SecRule REQUEST_COOKIES:SESSIONID "\@streq cookieval,id:500233"
503+
SecRule REQUEST_COOKIES:\$SESSIONID_PATH "\@streq /" "chain"
504+
SecRule REQUEST_COOKIES:SESSIONID "\@streq cookieval"
505505
),
506506
match_log => {
507507
error => [ qr/Access denied with code 403 \(phase 1\)\. String match "cookieval" at REQUEST_COOKIES:SESSIONID\./, 1 ],
@@ -527,8 +527,8 @@
527527
SecDebugLogLevel 5
528528
SecCookieFormat 0
529529
SecRule REQUEST_COOKIES_NAMES "\@streq SESSIONID" "phase:1,deny,chain,id:500234"
530-
SecRule REQUEST_COOKIES:\$SESSIONID_PATH "\@streq /" "chain,id:500235"
531-
SecRule REQUEST_COOKIES:SESSIONID "\@streq cookieval,id:500236"
530+
SecRule REQUEST_COOKIES:\$SESSIONID_PATH "\@streq /" "chain"
531+
SecRule REQUEST_COOKIES:SESSIONID "\@streq cookieval"
532532
),
533533
match_log => {
534534
-error => [ qr/Access denied/, 1 ],

‎tests/regression/misc/00-multipart-parser.t

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,7 @@
267267
SecAuditEngine RelevantOnly
268268
),
269269
match_log => {
270-
audit => [ qr/Final boundary missing/, 1 ],
271270
debug => [ qr/Final boundary missing/, 1 ],
272-
273271
},
274272
match_response => {
275273
status => qr/^200$/,

‎tests/regression/misc/10-tfn-cache.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126

127127
# This should see cached versions of *both* ARGS_GET
128128
SecRule ARGS:test "queryval" "phase:2,t:none,t:removeWhiteSpace,t:lowercase,deny,chain,id:500046"
129-
SecRule ARGS:test "firstval" "t:none,t:removeWhiteSpace,t:lowercase,chain,id:500047"
130-
SecRule ARGS:test "secondval" "t:none,t:removeWhiteSpace,t:lowercase,id:500017"
129+
SecRule ARGS:test "firstval" "t:none,t:removeWhiteSpace,t:lowercase,chain"
130+
SecRule ARGS:test "secondval" "t:none,t:removeWhiteSpace,t:lowercase"
131131
),
132132
match_log => {
133133
debug => [ qr/removeWhiteSpace,lowercase: "queryval" .*removeWhiteSpace,lowercase: "firstval" .*cached.*removeWhiteSpace,lowercase: "secondval" .*cached/s, 1 ],

‎tests/regression/rule/00-basics.t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
SecAction "nolog,id:500001"
1212
),
1313
match_log => {
14-
-error => [ qr/ModSecurity: /, 1 ],
14+
-error => [ qr/500001/, 1 ],
1515
-audit => [ qr/./, 1 ],
1616
debug => [ qr/Warning\. Unconditional match in SecAction\./, 1 ],
1717
},
@@ -32,11 +32,11 @@
3232
SecDebugLog $ENV{DEBUG_LOG}
3333
SecDebugLogLevel 5
3434
SecDefaultAction "phase:2,deny,status:403"
35-
SecRule ARGS:test "value,id:500032"
35+
SecRule ARGS:test "value" "id:500032"
3636
),
3737
match_log => {
38-
error => [ qr/ModSecurity: /, 1 ],
39-
debug => [ qr/Rule [0-9a-f]+: SecRule "ARGS:test" "\@rx value" "phase:2,deny,status:403"$/m, 1 ],
38+
error => [ qr/500032/, 1 ],
39+
debug => [ qr/Rule [0-9a-f]+: SecRule "ARGS:test" "\@rx value" "phase:2,deny,status:403,id:500032"$/m, 1 ],
4040
},
4141
match_response => {
4242
status => qr/^403$/,
@@ -57,7 +57,7 @@
5757
),
5858
match_log => {
5959
error => [ qr/ModSecurity: /, 1 ],
60-
debug => [ qr/Rule [0-9a-f]+: SecRule "ARGS:test" "\@rx value" "phase:2,deny,status:403"$/m, 1 ],
60+
debug => [ qr/Rule [0-9a-f]+: SecRule "ARGS:test" "\@rx value" "phase:2,deny,status:403,id:500033"$/m, 1 ],
6161
},
6262
match_response => {
6363
status => qr/^403$/,
@@ -75,12 +75,12 @@
7575
SecDebugLogLevel 5
7676
SecDefaultAction "phase:2,log,noauditlog,pass,tag:foo"
7777
SecRule ARGS:test "value" "chain,phase:2,deny,status:403,id:500034"
78-
SecRule &ARGS "\@eq 1" "chain,setenv:tx.foo=bar,id:500035"
79-
SecRule REQUEST_METHOD "\@streq GET,id:500036"
78+
SecRule &ARGS "\@eq 1" "chain,setenv:tx.foo=bar"
79+
SecRule REQUEST_METHOD "\@streq GET"
8080
),
8181
match_log => {
8282
error => [ qr/ModSecurity: /, 1 ],
83-
debug => [ qr/Rule [0-9a-f]+: SecRule "ARGS:test" "\@rx value" "phase:2,log,noauditlog,tag:foo,chain,deny,status:403"\r?\n.*Rule [0-9a-f]+: SecRule "&ARGS" "\@eq 1" "chain,setenv:tx.foo=bar"\r?\n.*Rule [0-9a-f]+: SecRule "REQUEST_METHOD" "\@streq GET"\r?\n/s, 1 ],
83+
debug => [ qr/Rule [0-9a-f]+: SecRule "ARGS:test" "\@rx value" "phase:2,log,noauditlog,tag:foo,chain,deny,status:403,id:500034"\r?\n.*Rule [0-9a-f]+: SecRule "&ARGS" "\@eq 1" "chain,setenv:tx.foo=bar"\r?\n.*Rule [0-9a-f]+: SecRule "REQUEST_METHOD" "\@streq GET"\r?\n/s, 1 ],
8484
},
8585
match_response => {
8686
status => qr/^403$/,

‎tests/regression/rule/10-xml.t

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
conf => qq(
99
SecRuleEngine On
1010
SecRequestBodyAccess On
11+
SecXmlExternalEntity On
1112
SecDebugLog $ENV{DEBUG_LOG}
1213
SecDebugLogLevel 9
1314
SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500005, \\
@@ -55,6 +56,7 @@
5556
conf => qq(
5657
SecRuleEngine On
5758
SecRequestBodyAccess On
59+
SecXmlExternalEntity On
5860
SecDebugLog $ENV{DEBUG_LOG}
5961
SecDebugLogLevel 9
6062
SecAuditEngine RelevantOnly
@@ -104,6 +106,7 @@
104106
conf => qq(
105107
SecRuleEngine On
106108
SecRequestBodyAccess On
109+
SecXmlExternalEntity On
107110
SecDebugLog $ENV{DEBUG_LOG}
108111
SecDebugLogLevel 9
109112
SecAuditEngine RelevantOnly
@@ -154,6 +157,7 @@
154157
conf => qq(
155158
SecRuleEngine On
156159
SecRequestBodyAccess On
160+
SecXmlExternalEntity On
157161
SecDebugLog $ENV{DEBUG_LOG}
158162
SecDebugLogLevel 9
159163
SecAuditEngine RelevantOnly
@@ -204,6 +208,7 @@
204208
conf => qq(
205209
SecRuleEngine On
206210
SecRequestBodyAccess On
211+
SecXmlExternalEntity On
207212
SecDebugLog $ENV{DEBUG_LOG}
208213
SecDebugLogLevel 9
209214
SecAuditEngine RelevantOnly
@@ -254,6 +259,7 @@
254259
conf => qq(
255260
SecRuleEngine On
256261
SecRequestBodyAccess On
262+
SecXmlExternalEntity On
257263
SecDebugLog $ENV{DEBUG_LOG}
258264
SecDebugLogLevel 9
259265
SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500020, \\
@@ -297,6 +303,7 @@
297303
conf => qq(
298304
SecRuleEngine On
299305
SecRequestBodyAccess On
306+
SecXmlExternalEntity On
300307
SecDebugLog $ENV{DEBUG_LOG}
301308
SecDebugLogLevel 9
302309
SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500023, \\
@@ -340,6 +347,7 @@
340347
conf => qq(
341348
SecRuleEngine On
342349
SecRequestBodyAccess On
350+
SecXmlExternalEntity On
343351
SecDebugLog $ENV{DEBUG_LOG}
344352
SecDebugLogLevel 9
345353
SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500026, \\
@@ -383,6 +391,7 @@
383391
conf => qq(
384392
SecRuleEngine On
385393
SecRequestBodyAccess On
394+
SecXmlExternalEntity On
386395
SecDebugLog $ENV{DEBUG_LOG}
387396
SecDebugLogLevel 9
388397
SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500029, \\

0 commit comments

Comments
 (0)