From 6abbb7e91e9dca5b429442e146bd94c062261813 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Wed, 11 Jan 2017 22:16:37 -0300 Subject: [PATCH] Fix regular expression test case and updates the test list Repoted on #1295 --- Makefile.am | 32 ++++++++++++------- ...llection-regular_expression_selection.json | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32eee0fa..bf8d5678 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,7 +91,9 @@ TESTS+=test/test-cases/regression/debug_log.json TESTS+=test/test-cases/regression/config-include.json TESTS+=test/test-cases/regression/variable-PATH_INFO.json TESTS+=test/test-cases/regression/action-xmlns.json +TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR_ERROR.json TESTS+=test/test-cases/regression/collection-tx.json +TESTS+=test/test-cases/regression/action-allow.json TESTS+=test/test-cases/regression/config-body_limits.json TESTS+=test/test-cases/regression/variable-RESPONSE_BODY.json TESTS+=test/test-cases/regression/action-ctl_request_body_processor.json @@ -103,22 +105,28 @@ TESTS+=test/test-cases/regression/variable-ARGS.json TESTS+=test/test-cases/regression/issue-394.json TESTS+=test/test-cases/regression/variable-TIME_MON.json TESTS+=test/test-cases/regression/misc.json +TESTS+=test/test-cases/regression/collection-regular_expression_selection.json TESTS+=test/test-cases/regression/variable-REQUEST_HEADERS.json +TESTS+=test/test-cases/regression/variable-RULE.json TESTS+=test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json TESTS+=test/test-cases/regression/variable-ARGS_NAMES.json +TESTS+=test/test-cases/regression/request-body-parser-json.json TESTS+=test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json +TESTS+=test/test-cases/regression/variable-SERVER_NAME.json TESTS+=test/test-cases/regression/variable-ARGS_GET_NAMES.json TESTS+=test/test-cases/regression/variable-REMOTE_USER.json TESTS+=test/test-cases/regression/action-msg.json TESTS+=test/test-cases/regression/variable-UNIQUE_ID.json TESTS+=test/test-cases/regression/variable-REQUEST_URI.json TESTS+=test/test-cases/regression/request-body-parser-xml.json +TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR.json TESTS+=test/test-cases/regression/secaction.json TESTS+=test/test-cases/regression/variable-TIME_WDAY.json TESTS+=test/test-cases/regression/issue-960.json TESTS+=test/test-cases/regression/request-body-parser-xml-validade-dtd.json TESTS+=test/test-cases/regression/variable-TIME_MIN.json TESTS+=test/test-cases/regression/action-setuid.json +TESTS+=test/test-cases/regression/issue-1152.json TESTS+=test/test-cases/regression/config-calling_phases_by_name.json TESTS+=test/test-cases/regression/variable-USERID.json TESTS+=test/test-cases/regression/request-body-parser-multipart.json @@ -126,12 +134,16 @@ TESTS+=test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json TESTS+=test/test-cases/regression/action-disruptive.json TESTS+=test/test-cases/regression/variable-REQUEST_BASENAME.json TESTS+=test/test-cases/regression/sec_component_signature.json +TESTS+=test/test-cases/regression/action-ctl_rule_remove_target_by_tag.json TESTS+=test/test-cases/regression/variable-REQUEST_METHOD.json TESTS+=test/test-cases/regression/action-initcol.json TESTS+=test/test-cases/regression/variable-FILES.json TESTS+=test/test-cases/regression/variable-REQUEST_BODY.json +TESTS+=test/test-cases/regression/collection-case-insensitive.json +TESTS+=test/test-cases/regression/config-remove_by_id.json TESTS+=test/test-cases/regression/request-body-parser-multipart-crlf.json TESTS+=test/test-cases/regression/variable-TIME_EPOCH.json +TESTS+=test/test-cases/regression/variable-WEBSERVER_ERROR_LOG.json TESTS+=test/test-cases/regression/variable-HIGHEST_SEVERITY.json TESTS+=test/test-cases/regression/variable-variation-exclusion.json TESTS+=test/test-cases/regression/variable-GEO.json @@ -162,6 +174,7 @@ TESTS+=test/test-cases/regression/variable-MODSEC_BUILD.json TESTS+=test/test-cases/regression/variable-ARGS_POST_NAMES.json TESTS+=test/test-cases/regression/variable-REMOTE_ADDR.json TESTS+=test/test-cases/regression/auditlog.json +TESTS+=test/test-cases/regression/action-ctl_request_body_access.json TESTS+=test/test-cases/regression/config-include-bad.json TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json TESTS+=test/test-cases/regression/config-xml_external_entity.json @@ -171,29 +184,36 @@ TESTS+=test/test-cases/regression/variable-TIME_HOUR.json TESTS+=test/test-cases/regression/variable-ARGS_POST.json TESTS+=test/test-cases/regression/variable-variation-count.json TESTS+=test/test-cases/regression/variable-REQUEST_URI_RAW.json +TESTS+=test/test-cases/regression/variable-RESPONSE_PROTOCOL.json TESTS+=test/test-cases/regression/variable-TIME_YEAR.json TESTS+=test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json +TESTS+=test/test-cases/regression/action-ctl_rule_remove_by_id.json TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json TESTS+=test/test-cases/regression/variable-ARGS_GET.json +TESTS+=test/test-cases/regression/action-skip.json TESTS+=test/test-cases/regression/transformations.json TESTS+=test/test-cases/regression/config-response_type.json TESTS+=test/test-cases/regression/variable-TIME.json TESTS+=test/test-cases/regression/variable-MATCHED_VARS_NAMES.json TESTS+=test/test-cases/regression/variable-REQUEST_COOKIES.json TESTS+=test/test-cases/regression/variable-REQUEST_FILENAME.json +TESTS+=test/test-cases/regression/action-ctl_rule_remove_target_by_id.json TESTS+=test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json TESTS+=test/test-cases/regression/variable-REMOTE_HOST.json TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json TESTS+=test/test-cases/regression/variable-SERVER_ADDR.json TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json +TESTS+=test/test-cases/regression/variable-URLENCODED_ERROR.json TESTS+=test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json +TESTS+=test/test-cases/regression/operator-UnconditionalMatch.json TESTS+=test/test-cases/regression/config-secdefaultaction.json TESTS+=test/test-cases/regression/variable-REQUEST_PROTOCOL.json TESTS+=test/test-cases/regression/variable-TIME_DAY.json TESTS+=test/test-cases/regression/transformation-none.json TESTS+=test/test-cases/regression/variable-TX.json TESTS+=test/test-cases/regression/variable-ENV.json +TESTS+=test/test-cases/regression/variable-STATUS.json TESTS+=test/test-cases/regression/action-tag.json TESTS+=test/test-cases/secrules-language-tests/transformations/base64Encode.json TESTS+=test/test-cases/secrules-language-tests/transformations/trimRight.json @@ -254,16 +274,4 @@ TESTS+=test/test-cases/secrules-language-tests/operators/ipMatch.json TESTS+=test/test-cases/secrules-language-tests/operators/strmatch.json TESTS+=test/test-cases/secrules-language-tests/operators/detectXSS.json TESTS+=test/test-cases/secrules-language-tests/operators/eq.json -TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR.json -TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR_ERROR.json -TESTS+=test/test-cases/regression/variable-URLENCODED_ERROR.json -TESTS+=test/test-cases/regression/variable-RULE.json -TESTS+=test/test-cases/regression/variable-STATUS.json -TESTS+=test/test-cases/regression/variable-RESPONSE_PROTOCOL.json -TESTS+=test/test-cases/regression/variable-SERVER_NAME.json -TESTS+=test/test-cases/regression/operator-UnconditionalMatch.json -TESTS+=test/test-cases/regression/request-body-parser-json.json -TESTS+=test/test-cases/regression/action-skip.json -TESTS+=test/test-cases/regression/action-allow.json -TESTS+=test/test-cases/regression/issue-1152.json diff --git a/test/test-cases/regression/collection-regular_expression_selection.json b/test/test-cases/regression/collection-regular_expression_selection.json index 97681cba..cde06ac7 100644 --- a/test/test-cases/regression/collection-regular_expression_selection.json +++ b/test/test-cases/regression/collection-regular_expression_selection.json @@ -48,7 +48,7 @@ }, "expected":{ "audit_log":"", - "debug_log":"T \\(1\\) t:lowercase: \"test2\"", + "debug_log":"T \\(0\\) t:lowercase: \"test2\"", "error_log":"" }, "rules":[