From 4ced1d18e0d7ab07cc753e5c96f879781bc325a7 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Fri, 4 Nov 2016 14:08:58 -0300 Subject: [PATCH] Using full path in the header inclusion --- examples/simple_example_using_c/test.c | 4 +- src/actions/accuracy.cc | 4 +- src/actions/accuracy.h | 2 +- src/actions/action.cc | 26 +-- src/actions/allow.cc | 4 +- src/actions/allow.h | 2 +- src/actions/audit_log.cc | 2 +- src/actions/audit_log.h | 2 +- src/actions/block.cc | 2 +- src/actions/block.h | 2 +- src/actions/capture.cc | 12 +- src/actions/capture.h | 2 +- src/actions/chain.cc | 2 +- src/actions/chain.h | 2 +- src/actions/ctl/audit_log_parts.cc | 2 +- src/actions/ctl/audit_log_parts.h | 2 +- src/actions/ctl/request_body_access.cc | 2 +- src/actions/ctl/request_body_access.h | 2 +- .../ctl/request_body_processor_json.cc | 2 +- src/actions/ctl/request_body_processor_json.h | 2 +- src/actions/ctl/request_body_processor_xml.cc | 2 +- src/actions/ctl/request_body_processor_xml.h | 2 +- src/actions/ctl/rule_remove_by_id.cc | 2 +- src/actions/ctl/rule_remove_by_id.h | 2 +- src/actions/ctl/rule_remove_target_by_id.cc | 4 +- src/actions/ctl/rule_remove_target_by_id.h | 2 +- src/actions/ctl/rule_remove_target_by_tag.cc | 4 +- src/actions/ctl/rule_remove_target_by_tag.h | 2 +- src/actions/deny.cc | 2 +- src/actions/deny.h | 2 +- src/actions/init_col.cc | 4 +- src/actions/init_col.h | 2 +- src/actions/log.cc | 6 +- src/actions/log.h | 2 +- src/actions/log_data.cc | 4 +- src/actions/log_data.h | 2 +- src/actions/maturity.cc | 4 +- src/actions/maturity.h | 2 +- src/actions/msg.cc | 4 +- src/actions/msg.h | 2 +- src/actions/no_audit_log.cc | 2 +- src/actions/no_audit_log.h | 2 +- src/actions/no_log.cc | 6 +- src/actions/no_log.h | 2 +- src/actions/pass.cc | 2 +- src/actions/pass.h | 2 +- src/actions/phase.cc | 4 +- src/actions/phase.h | 2 +- src/actions/redirect.cc | 2 +- src/actions/redirect.h | 2 +- src/actions/rev.cc | 4 +- src/actions/rev.h | 2 +- src/actions/rule_id.cc | 2 +- src/actions/rule_id.h | 2 +- src/actions/set_sid.cc | 2 +- src/actions/set_sid.h | 2 +- src/actions/set_uid.cc | 2 +- src/actions/set_uid.h | 2 +- src/actions/set_var.cc | 4 +- src/actions/set_var.h | 2 +- src/actions/severity.cc | 6 +- src/actions/severity.h | 2 +- src/actions/skip.cc | 4 +- src/actions/skip.h | 2 +- src/actions/skip_after.cc | 4 +- src/actions/skip_after.h | 2 +- src/actions/status.cc | 2 +- src/actions/status.h | 2 +- src/actions/tag.cc | 4 +- src/actions/tag.h | 2 +- src/actions/transformations/base64_decode.cc | 6 +- src/actions/transformations/base64_decode.h | 4 +- .../transformations/base64_decode_ext.cc | 6 +- .../transformations/base64_decode_ext.h | 4 +- src/actions/transformations/base64_encode.cc | 6 +- src/actions/transformations/base64_encode.h | 4 +- src/actions/transformations/cmd_line.cc | 4 +- src/actions/transformations/cmd_line.h | 4 +- .../transformations/compress_whitespace.cc | 4 +- .../transformations/compress_whitespace.h | 4 +- src/actions/transformations/css_decode.cc | 4 +- src/actions/transformations/css_decode.h | 4 +- .../transformations/escape_seq_decode.cc | 4 +- .../transformations/escape_seq_decode.h | 4 +- src/actions/transformations/hex_decode.cc | 4 +- src/actions/transformations/hex_decode.h | 4 +- src/actions/transformations/hex_encode.cc | 4 +- src/actions/transformations/hex_encode.h | 4 +- .../transformations/html_entity_decode.cc | 4 +- .../transformations/html_entity_decode.h | 6 +- src/actions/transformations/js_decode.cc | 4 +- src/actions/transformations/js_decode.h | 4 +- src/actions/transformations/length.cc | 4 +- src/actions/transformations/length.h | 4 +- src/actions/transformations/lower_case.cc | 6 +- src/actions/transformations/lower_case.h | 4 +- src/actions/transformations/md5.cc | 4 +- src/actions/transformations/md5.h | 4 +- src/actions/transformations/none.cc | 4 +- src/actions/transformations/none.h | 4 +- src/actions/transformations/normalise_path.cc | 4 +- src/actions/transformations/normalise_path.h | 4 +- .../transformations/normalise_path_win.cc | 6 +- .../transformations/normalise_path_win.h | 4 +- .../transformations/parity_even_7bit.cc | 4 +- .../transformations/parity_even_7bit.h | 4 +- .../transformations/parity_odd_7bit.cc | 4 +- src/actions/transformations/parity_odd_7bit.h | 4 +- .../transformations/parity_zero_7bit.cc | 4 +- .../transformations/parity_zero_7bit.h | 4 +- .../transformations/remove_comments.cc | 4 +- src/actions/transformations/remove_comments.h | 4 +- .../transformations/remove_comments_char.cc | 4 +- .../transformations/remove_comments_char.h | 4 +- src/actions/transformations/remove_nulls.cc | 4 +- src/actions/transformations/remove_nulls.h | 4 +- .../transformations/remove_whitespace.cc | 4 +- .../transformations/remove_whitespace.h | 4 +- .../transformations/replace_comments.cc | 4 +- .../transformations/replace_comments.h | 4 +- src/actions/transformations/replace_nulls.cc | 4 +- src/actions/transformations/replace_nulls.h | 4 +- src/actions/transformations/sha1.cc | 6 +- src/actions/transformations/sha1.h | 4 +- src/actions/transformations/sql_hex_decode.cc | 4 +- src/actions/transformations/sql_hex_decode.h | 4 +- src/actions/transformations/transformation.cc | 74 ++++----- src/actions/transformations/transformation.h | 2 +- src/actions/transformations/trim.cc | 6 +- src/actions/transformations/trim.h | 4 +- src/actions/transformations/trim_left.cc | 8 +- src/actions/transformations/trim_left.h | 6 +- src/actions/transformations/trim_right.cc | 6 +- src/actions/transformations/trim_right.h | 6 +- src/actions/transformations/url_decode.cc | 4 +- src/actions/transformations/url_decode.h | 4 +- src/actions/transformations/url_decode_uni.cc | 4 +- src/actions/transformations/url_decode_uni.h | 4 +- src/actions/transformations/url_encode.cc | 4 +- src/actions/transformations/url_encode.h | 4 +- .../transformations/utf8_to_unicode.cc | 4 +- src/actions/transformations/utf8_to_unicode.h | 4 +- src/actions/ver.cc | 4 +- src/actions/ver.h | 2 +- src/actions/xmlns.cc | 4 +- src/actions/xmlns.h | 2 +- src/audit_log/audit_log.cc | 10 +- src/audit_log/audit_log.h | 2 +- src/audit_log/writer.cc | 4 +- src/audit_log/writer/https.cc | 8 +- src/audit_log/writer/https.h | 2 +- src/audit_log/writer/parallel.cc | 6 +- src/audit_log/writer/parallel.h | 2 +- src/audit_log/writer/serial.cc | 4 +- src/audit_log/writer/serial.h | 2 +- .../backend/in_memory-per_process.cc | 2 +- src/collection/collections.cc | 2 +- src/macro_expansion.cc | 2 +- src/modsecurity.cc | 2 +- src/operators/begins_with.cc | 4 +- src/operators/begins_with.h | 2 +- src/operators/contains.cc | 2 +- src/operators/contains.h | 2 +- src/operators/contains_word.cc | 4 +- src/operators/contains_word.h | 2 +- src/operators/detect_sqli.cc | 4 +- src/operators/detect_sqli.h | 2 +- src/operators/detect_xss.cc | 4 +- src/operators/detect_xss.h | 2 +- src/operators/ends_with.cc | 4 +- src/operators/ends_with.h | 2 +- src/operators/eq.cc | 4 +- src/operators/eq.h | 2 +- src/operators/fuzzy_hash.cc | 4 +- src/operators/fuzzy_hash.h | 2 +- src/operators/ge.cc | 4 +- src/operators/ge.h | 2 +- src/operators/geo_lookup.cc | 6 +- src/operators/geo_lookup.h | 2 +- src/operators/gsblookup.cc | 4 +- src/operators/gsblookup.h | 2 +- src/operators/gt.cc | 4 +- src/operators/gt.h | 2 +- src/operators/inspect_file.cc | 4 +- src/operators/inspect_file.h | 2 +- src/operators/ip_match.cc | 6 +- src/operators/ip_match.h | 4 +- src/operators/ip_match_f.cc | 4 +- src/operators/ip_match_f.h | 2 +- src/operators/ip_match_from_file.cc | 4 +- src/operators/ip_match_from_file.h | 2 +- src/operators/le.cc | 4 +- src/operators/le.h | 2 +- src/operators/lt.cc | 4 +- src/operators/lt.h | 2 +- src/operators/no_match.cc | 2 +- src/operators/no_match.h | 2 +- src/operators/operator.cc | 78 ++++----- src/operators/pm.cc | 6 +- src/operators/pm.h | 4 +- src/operators/pm_f.cc | 4 +- src/operators/pm_f.h | 2 +- src/operators/pm_from_file.cc | 6 +- src/operators/pm_from_file.h | 2 +- src/operators/rbl.cc | 4 +- src/operators/rbl.h | 2 +- src/operators/rsub.cc | 4 +- src/operators/rsub.h | 2 +- src/operators/rx.cc | 4 +- src/operators/rx.h | 4 +- src/operators/str_eq.cc | 2 +- src/operators/str_eq.h | 2 +- src/operators/str_match.cc | 4 +- src/operators/str_match.h | 2 +- src/operators/unconditional_match.cc | 2 +- src/operators/unconditional_match.h | 2 +- src/operators/validate_byte_range.cc | 4 +- src/operators/validate_byte_range.h | 2 +- src/operators/validate_dtd.cc | 6 +- src/operators/validate_dtd.h | 2 +- src/operators/validate_hash.cc | 4 +- src/operators/validate_hash.h | 2 +- src/operators/validate_schema.cc | 6 +- src/operators/validate_schema.h | 2 +- src/operators/validate_url_encoding.cc | 4 +- src/operators/validate_url_encoding.h | 2 +- src/operators/validate_utf8_encoding.cc | 4 +- src/operators/validate_utf8_encoding.h | 2 +- src/operators/verify_cc.cc | 4 +- src/operators/verify_cc.h | 2 +- src/operators/verify_cpf.cc | 4 +- src/operators/verify_cpf.h | 2 +- src/operators/verify_ssn.cc | 4 +- src/operators/verify_ssn.h | 2 +- src/operators/within.cc | 4 +- src/operators/within.h | 2 +- src/parser/driver.cc | 6 +- src/parser/driver.h | 4 +- src/parser/seclang-parser.yy | 108 ++++++------- src/parser/seclang-scanner.ll | 8 +- src/request_body_processor/json.cc | 2 +- src/request_body_processor/multipart.cc | 4 +- src/request_body_processor/xml.cc | 2 +- src/rule.cc | 12 +- src/rules.cc | 4 +- src/rules_exceptions.cc | 2 +- src/transaction.cc | 20 +-- src/utils/acmp.cc | 2 +- src/utils/base64.cc | 2 +- src/utils/decode.cc | 4 +- src/utils/geo_lookup.cc | 2 +- src/utils/https_client.cc | 2 +- src/utils/ip_tree.cc | 6 +- src/utils/ip_tree.h | 2 +- src/utils/md5.h | 4 +- src/utils/msc_string.cc | 2 +- src/utils/msc_tree.cc | 2 +- src/utils/regex.cc | 4 +- src/variables/duration.cc | 2 +- src/variables/duration.h | 2 +- src/variables/env.cc | 2 +- src/variables/env.h | 2 +- src/variables/highest_severity.cc | 2 +- src/variables/highest_severity.h | 2 +- src/variables/modsec_build.cc | 2 +- src/variables/modsec_build.h | 2 +- src/variables/remote_user.cc | 4 +- src/variables/remote_user.h | 2 +- src/variables/rule.cc | 4 +- src/variables/rule.h | 2 +- src/variables/time.cc | 2 +- src/variables/time.h | 2 +- src/variables/time_day.cc | 2 +- src/variables/time_day.h | 2 +- src/variables/time_epoch.cc | 2 +- src/variables/time_epoch.h | 2 +- src/variables/time_hour.cc | 2 +- src/variables/time_hour.h | 2 +- src/variables/time_min.cc | 2 +- src/variables/time_min.h | 2 +- src/variables/time_mon.cc | 2 +- src/variables/time_mon.h | 2 +- src/variables/time_sec.cc | 2 +- src/variables/time_sec.h | 2 +- src/variables/time_wday.cc | 2 +- src/variables/time_wday.h | 2 +- src/variables/time_year.cc | 2 +- src/variables/time_year.h | 2 +- src/variables/tx.cc | 2 +- src/variables/tx.h | 2 +- src/variables/variable.cc | 6 +- src/variables/variations/count.cc | 2 +- src/variables/variations/count.h | 2 +- src/variables/variations/exclusion.cc | 2 +- src/variables/variations/exclusion.h | 2 +- src/variables/xml.cc | 2 +- src/variables/xml.h | 2 +- test/common/modsecurity_test.cc | 2 +- test/fuzzer/afl_fuzzer.cc | 148 +++++++++--------- test/optimization/optimization.cc | 4 +- test/regression/custom_debug_log.cc | 4 +- test/regression/regression.cc | 12 +- test/regression/regression_test.cc | 2 +- test/unit/unit.cc | 14 +- test/unit/unit_test.cc | 6 +- 305 files changed, 728 insertions(+), 728 deletions(-) diff --git a/examples/simple_example_using_c/test.c b/examples/simple_example_using_c/test.c index 0299d81d..e7fd7e8b 100644 --- a/examples/simple_example_using_c/test.c +++ b/examples/simple_example_using_c/test.c @@ -14,8 +14,8 @@ */ #include -#include "stdio.h" -#include "stdlib.h" +#include +#include #include "modsecurity/modsecurity.h" #include "modsecurity/rules.h" diff --git a/src/actions/accuracy.cc b/src/actions/accuracy.cc index 72a49eae..b4b552f5 100644 --- a/src/actions/accuracy.cc +++ b/src/actions/accuracy.cc @@ -13,12 +13,12 @@ * */ -#include "actions/accuracy.h" +#include "src/actions/accuracy.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" diff --git a/src/actions/accuracy.h b/src/actions/accuracy.h index bfd704f8..05638b66 100644 --- a/src/actions/accuracy.h +++ b/src/actions/accuracy.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_ACCURACY_H_ #define SRC_ACTIONS_ACCURACY_H_ diff --git a/src/actions/action.cc b/src/actions/action.cc index ae5f47a6..a63abc62 100644 --- a/src/actions/action.cc +++ b/src/actions/action.cc @@ -13,7 +13,7 @@ * */ -#include "actions/action.h" +#include "src/actions/action.h" #include #include @@ -21,18 +21,18 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "actions/block.h" -#include "actions/chain.h" -#include "actions/deny.h" -#include "actions/redirect.h" -#include "actions/status.h" -#include "actions/rule_id.h" -#include "actions/phase.h" -#include "actions/severity.h" -#include "actions/capture.h" -#include "actions/pass.h" -#include "actions/log.h" -#include "actions/no_log.h" +#include "src/actions/block.h" +#include "src/actions/chain.h" +#include "src/actions/deny.h" +#include "src/actions/redirect.h" +#include "src/actions/status.h" +#include "src/actions/rule_id.h" +#include "src/actions/phase.h" +#include "src/actions/severity.h" +#include "src/actions/capture.h" +#include "src/actions/pass.h" +#include "src/actions/log.h" +#include "src/actions/no_log.h" diff --git a/src/actions/allow.cc b/src/actions/allow.cc index fca6f267..f858d6e2 100644 --- a/src/actions/allow.cc +++ b/src/actions/allow.cc @@ -13,14 +13,14 @@ * */ -#include "actions/allow.h" +#include "src/actions/allow.h" #include #include #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" #include "modsecurity/modsecurity.h" diff --git a/src/actions/allow.h b/src/actions/allow.h index 6cbb8e89..bf9b98ac 100644 --- a/src/actions/allow.h +++ b/src/actions/allow.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_ALLOW_H_ #define SRC_ACTIONS_ALLOW_H_ diff --git a/src/actions/audit_log.cc b/src/actions/audit_log.cc index da7fee4a..836ffd11 100644 --- a/src/actions/audit_log.cc +++ b/src/actions/audit_log.cc @@ -13,7 +13,7 @@ * */ -#include "actions/audit_log.h" +#include "src/actions/audit_log.h" #include #include diff --git a/src/actions/audit_log.h b/src/actions/audit_log.h index 4c2ae9a8..cd4c6e6f 100644 --- a/src/actions/audit_log.h +++ b/src/actions/audit_log.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_AUDIT_LOG_H_ #define SRC_ACTIONS_AUDIT_LOG_H_ diff --git a/src/actions/block.cc b/src/actions/block.cc index 8ed148f4..97466dd9 100644 --- a/src/actions/block.cc +++ b/src/actions/block.cc @@ -13,7 +13,7 @@ * */ -#include "actions/block.h" +#include "src/actions/block.h" #include #include diff --git a/src/actions/block.h b/src/actions/block.h index 36362893..34b9c64e 100644 --- a/src/actions/block.h +++ b/src/actions/block.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_BLOCK_H_ #define SRC_ACTIONS_BLOCK_H_ diff --git a/src/actions/capture.cc b/src/actions/capture.cc index c6747fa6..3ca91a2e 100644 --- a/src/actions/capture.cc +++ b/src/actions/capture.cc @@ -13,7 +13,7 @@ * */ -#include "actions/capture.h" +#include "src/actions/capture.h" #include #include @@ -22,11 +22,11 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "operators/operator.h" -#include "operators/pm.h" -#include "operators/rx.h" -#include "operators/contains.h" -#include "operators/detect_sqli.h" +#include "src/operators/operator.h" +#include "src/operators/pm.h" +#include "src/operators/rx.h" +#include "src/operators/contains.h" +#include "src/operators/detect_sqli.h" namespace modsecurity { namespace actions { diff --git a/src/actions/capture.h b/src/actions/capture.h index d67194f5..01a51bcb 100644 --- a/src/actions/capture.h +++ b/src/actions/capture.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_CAPTURE_H_ #define SRC_ACTIONS_CAPTURE_H_ diff --git a/src/actions/chain.cc b/src/actions/chain.cc index 86b54dcc..3455ffbf 100644 --- a/src/actions/chain.cc +++ b/src/actions/chain.cc @@ -13,7 +13,7 @@ * */ -#include "actions/chain.h" +#include "src/actions/chain.h" #include #include diff --git a/src/actions/chain.h b/src/actions/chain.h index 59da460e..6ce82b6f 100644 --- a/src/actions/chain.h +++ b/src/actions/chain.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_CHAIN_H_ #define SRC_ACTIONS_CHAIN_H_ diff --git a/src/actions/ctl/audit_log_parts.cc b/src/actions/ctl/audit_log_parts.cc index d4150a00..2148eb3f 100644 --- a/src/actions/ctl/audit_log_parts.cc +++ b/src/actions/ctl/audit_log_parts.cc @@ -13,7 +13,7 @@ * */ -#include "actions/ctl/audit_log_parts.h" +#include "src/actions/ctl/audit_log_parts.h" #include #include diff --git a/src/actions/ctl/audit_log_parts.h b/src/actions/ctl/audit_log_parts.h index 21bb5fe8..93916e2b 100644 --- a/src/actions/ctl/audit_log_parts.h +++ b/src/actions/ctl/audit_log_parts.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #ifndef SRC_ACTIONS_CTL_AUDIT_LOG_PARTS_H_ diff --git a/src/actions/ctl/request_body_access.cc b/src/actions/ctl/request_body_access.cc index ca6775c9..f811e941 100644 --- a/src/actions/ctl/request_body_access.cc +++ b/src/actions/ctl/request_body_access.cc @@ -13,7 +13,7 @@ * */ -#include "actions/ctl/request_body_access.h" +#include "src/actions/ctl/request_body_access.h" #include #include diff --git a/src/actions/ctl/request_body_access.h b/src/actions/ctl/request_body_access.h index 722227f4..59a20cf0 100644 --- a/src/actions/ctl/request_body_access.h +++ b/src/actions/ctl/request_body_access.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" diff --git a/src/actions/ctl/request_body_processor_json.cc b/src/actions/ctl/request_body_processor_json.cc index 8da95875..f17b5a26 100644 --- a/src/actions/ctl/request_body_processor_json.cc +++ b/src/actions/ctl/request_body_processor_json.cc @@ -13,7 +13,7 @@ * */ -#include "actions/ctl/request_body_processor_json.h" +#include "src/actions/ctl/request_body_processor_json.h" #include #include diff --git a/src/actions/ctl/request_body_processor_json.h b/src/actions/ctl/request_body_processor_json.h index 8b309b08..0f4fe60b 100644 --- a/src/actions/ctl/request_body_processor_json.h +++ b/src/actions/ctl/request_body_processor_json.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_JSON_H_ diff --git a/src/actions/ctl/request_body_processor_xml.cc b/src/actions/ctl/request_body_processor_xml.cc index 83e57f13..94cdd6eb 100644 --- a/src/actions/ctl/request_body_processor_xml.cc +++ b/src/actions/ctl/request_body_processor_xml.cc @@ -13,7 +13,7 @@ * */ -#include "actions/ctl/request_body_processor_xml.h" +#include "src/actions/ctl/request_body_processor_xml.h" #include #include diff --git a/src/actions/ctl/request_body_processor_xml.h b/src/actions/ctl/request_body_processor_xml.h index 2ad5cd72..e782b430 100644 --- a/src/actions/ctl/request_body_processor_xml.h +++ b/src/actions/ctl/request_body_processor_xml.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_XML_H_ diff --git a/src/actions/ctl/rule_remove_by_id.cc b/src/actions/ctl/rule_remove_by_id.cc index 65c5003d..4dab37ab 100644 --- a/src/actions/ctl/rule_remove_by_id.cc +++ b/src/actions/ctl/rule_remove_by_id.cc @@ -13,7 +13,7 @@ * */ -#include "actions/ctl/rule_remove_by_id.h" +#include "src/actions/ctl/rule_remove_by_id.h" #include #include diff --git a/src/actions/ctl/rule_remove_by_id.h b/src/actions/ctl/rule_remove_by_id.h index 2fa270f0..b7e8bbb6 100644 --- a/src/actions/ctl/rule_remove_by_id.h +++ b/src/actions/ctl/rule_remove_by_id.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" diff --git a/src/actions/ctl/rule_remove_target_by_id.cc b/src/actions/ctl/rule_remove_target_by_id.cc index 28746ba8..e3003bf5 100644 --- a/src/actions/ctl/rule_remove_target_by_id.cc +++ b/src/actions/ctl/rule_remove_target_by_id.cc @@ -13,14 +13,14 @@ * */ -#include "actions/ctl/rule_remove_target_by_id.h" +#include "src/actions/ctl/rule_remove_target_by_id.h" #include #include #include #include "modsecurity/transaction.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/actions/ctl/rule_remove_target_by_id.h b/src/actions/ctl/rule_remove_target_by_id.h index 2420e8f5..b25ced8b 100644 --- a/src/actions/ctl/rule_remove_target_by_id.h +++ b/src/actions/ctl/rule_remove_target_by_id.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" diff --git a/src/actions/ctl/rule_remove_target_by_tag.cc b/src/actions/ctl/rule_remove_target_by_tag.cc index 693303d7..18009320 100644 --- a/src/actions/ctl/rule_remove_target_by_tag.cc +++ b/src/actions/ctl/rule_remove_target_by_tag.cc @@ -13,14 +13,14 @@ * */ -#include "actions/ctl/rule_remove_target_by_tag.h" +#include "src/actions/ctl/rule_remove_target_by_tag.h" #include #include #include #include "modsecurity/transaction.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/actions/ctl/rule_remove_target_by_tag.h b/src/actions/ctl/rule_remove_target_by_tag.h index 8c3b8849..f5a90bef 100644 --- a/src/actions/ctl/rule_remove_target_by_tag.h +++ b/src/actions/ctl/rule_remove_target_by_tag.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" diff --git a/src/actions/deny.cc b/src/actions/deny.cc index 00b193fd..8a29f80e 100644 --- a/src/actions/deny.cc +++ b/src/actions/deny.cc @@ -13,7 +13,7 @@ * */ -#include "actions/deny.h" +#include "src/actions/deny.h" #include #include diff --git a/src/actions/deny.h b/src/actions/deny.h index f326a72a..8b784c1f 100644 --- a/src/actions/deny.h +++ b/src/actions/deny.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #ifndef SRC_ACTIONS_DENY_H_ diff --git a/src/actions/init_col.cc b/src/actions/init_col.cc index 78c637c7..de34f22d 100644 --- a/src/actions/init_col.cc +++ b/src/actions/init_col.cc @@ -13,12 +13,12 @@ * */ -#include "actions/init_col.h" +#include "src/actions/init_col.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" diff --git a/src/actions/init_col.h b/src/actions/init_col.h index 2469ef5d..5cbfb3d9 100644 --- a/src/actions/init_col.h +++ b/src/actions/init_col.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_INIT_COL_H_ #define SRC_ACTIONS_INIT_COL_H_ diff --git a/src/actions/log.cc b/src/actions/log.cc index e066d4f4..6953e045 100644 --- a/src/actions/log.cc +++ b/src/actions/log.cc @@ -13,14 +13,14 @@ * */ -#include "actions/log.h" +#include "src/actions/log.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" -#include "operators/operator.h" +#include "src/operators/operator.h" #include "modsecurity/rule_message.h" namespace modsecurity { diff --git a/src/actions/log.h b/src/actions/log.h index e111543e..540fce48 100644 --- a/src/actions/log.h +++ b/src/actions/log.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_LOG_H_ #define SRC_ACTIONS_LOG_H_ diff --git a/src/actions/log_data.cc b/src/actions/log_data.cc index 0edc9b59..b6e6d16e 100644 --- a/src/actions/log_data.cc +++ b/src/actions/log_data.cc @@ -13,12 +13,12 @@ * */ -#include "actions/log_data.h" +#include "src/actions/log_data.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "src/macro_expansion.h" #include "modsecurity/rule.h" diff --git a/src/actions/log_data.h b/src/actions/log_data.h index d6af3aff..9887856f 100644 --- a/src/actions/log_data.h +++ b/src/actions/log_data.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_LOG_DATA_H_ #define SRC_ACTIONS_LOG_DATA_H_ diff --git a/src/actions/maturity.cc b/src/actions/maturity.cc index 9e9435fd..bcfbd5f4 100644 --- a/src/actions/maturity.cc +++ b/src/actions/maturity.cc @@ -13,12 +13,12 @@ * */ -#include "actions/maturity.h" +#include "src/actions/maturity.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" diff --git a/src/actions/maturity.h b/src/actions/maturity.h index 98e0ba2a..3a06685d 100644 --- a/src/actions/maturity.h +++ b/src/actions/maturity.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_MATURITY_H_ #define SRC_ACTIONS_MATURITY_H_ diff --git a/src/actions/msg.cc b/src/actions/msg.cc index 96a9cd64..dee9126d 100644 --- a/src/actions/msg.cc +++ b/src/actions/msg.cc @@ -13,12 +13,12 @@ * */ -#include "actions/msg.h" +#include "src/actions/msg.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "src/macro_expansion.h" #include "modsecurity/rule.h" diff --git a/src/actions/msg.h b/src/actions/msg.h index b9517877..076d5ade 100644 --- a/src/actions/msg.h +++ b/src/actions/msg.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_MSG_H_ #define SRC_ACTIONS_MSG_H_ diff --git a/src/actions/no_audit_log.cc b/src/actions/no_audit_log.cc index 2de9170a..329ffb26 100644 --- a/src/actions/no_audit_log.cc +++ b/src/actions/no_audit_log.cc @@ -13,7 +13,7 @@ * */ -#include "actions/no_audit_log.h" +#include "src/actions/no_audit_log.h" #include #include diff --git a/src/actions/no_audit_log.h b/src/actions/no_audit_log.h index 33741ce2..895bae2f 100644 --- a/src/actions/no_audit_log.h +++ b/src/actions/no_audit_log.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_NO_AUDIT_LOG_H_ #define SRC_ACTIONS_NO_AUDIT_LOG_H_ diff --git a/src/actions/no_log.cc b/src/actions/no_log.cc index b68f25e5..50fb94cd 100644 --- a/src/actions/no_log.cc +++ b/src/actions/no_log.cc @@ -13,14 +13,14 @@ * */ -#include "actions/no_log.h" +#include "src/actions/no_log.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" -#include "operators/operator.h" +#include "src/operators/operator.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/no_log.h b/src/actions/no_log.h index d6498d08..99d3a4d7 100644 --- a/src/actions/no_log.h +++ b/src/actions/no_log.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_NO_LOG_H_ #define SRC_ACTIONS_NO_LOG_H_ diff --git a/src/actions/pass.cc b/src/actions/pass.cc index d75bf810..edc1ac92 100644 --- a/src/actions/pass.cc +++ b/src/actions/pass.cc @@ -13,7 +13,7 @@ * */ -#include "actions/pass.h" +#include "src/actions/pass.h" #include #include diff --git a/src/actions/pass.h b/src/actions/pass.h index 96595e0c..5995a729 100644 --- a/src/actions/pass.h +++ b/src/actions/pass.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #ifndef SRC_ACTIONS_PASS_H_ diff --git a/src/actions/phase.cc b/src/actions/phase.cc index c0c3c1ba..5507646f 100644 --- a/src/actions/phase.cc +++ b/src/actions/phase.cc @@ -13,7 +13,7 @@ * */ -#include "actions/phase.h" +#include "src/actions/phase.h" #include #include @@ -21,7 +21,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "modsecurity/modsecurity.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/actions/phase.h b/src/actions/phase.h index cfdda664..a4a46c02 100644 --- a/src/actions/phase.h +++ b/src/actions/phase.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_PHASE_H_ #define SRC_ACTIONS_PHASE_H_ diff --git a/src/actions/redirect.cc b/src/actions/redirect.cc index ec73e7b0..1d40daed 100644 --- a/src/actions/redirect.cc +++ b/src/actions/redirect.cc @@ -13,7 +13,7 @@ * */ -#include "actions/redirect.h" +#include "src/actions/redirect.h" #include #include diff --git a/src/actions/redirect.h b/src/actions/redirect.h index e0a133bd..15c74781 100644 --- a/src/actions/redirect.h +++ b/src/actions/redirect.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_REDIRECT_H_ #define SRC_ACTIONS_REDIRECT_H_ diff --git a/src/actions/rev.cc b/src/actions/rev.cc index d2f1fc8f..2ded5134 100644 --- a/src/actions/rev.cc +++ b/src/actions/rev.cc @@ -13,12 +13,12 @@ * */ -#include "actions/rev.h" +#include "src/actions/rev.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" diff --git a/src/actions/rev.h b/src/actions/rev.h index 7eaec02d..7df724fa 100644 --- a/src/actions/rev.h +++ b/src/actions/rev.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_REV_H_ #define SRC_ACTIONS_REV_H_ diff --git a/src/actions/rule_id.cc b/src/actions/rule_id.cc index 557dee10..90aa4508 100644 --- a/src/actions/rule_id.cc +++ b/src/actions/rule_id.cc @@ -13,7 +13,7 @@ * */ -#include "actions/rule_id.h" +#include "src/actions/rule_id.h" #include #include diff --git a/src/actions/rule_id.h b/src/actions/rule_id.h index d9e4c5e3..b4addb7c 100644 --- a/src/actions/rule_id.h +++ b/src/actions/rule_id.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_RULE_ID_H_ #define SRC_ACTIONS_RULE_ID_H_ diff --git a/src/actions/set_sid.cc b/src/actions/set_sid.cc index f22a2718..ae4d8d72 100644 --- a/src/actions/set_sid.cc +++ b/src/actions/set_sid.cc @@ -13,7 +13,7 @@ * */ -#include "actions/set_sid.h" +#include "src/actions/set_sid.h" #include #include diff --git a/src/actions/set_sid.h b/src/actions/set_sid.h index d552aeb3..11a21cf1 100644 --- a/src/actions/set_sid.h +++ b/src/actions/set_sid.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_SET_SID_H_ #define SRC_ACTIONS_SET_SID_H_ diff --git a/src/actions/set_uid.cc b/src/actions/set_uid.cc index 71ca1ffd..24bd89d9 100644 --- a/src/actions/set_uid.cc +++ b/src/actions/set_uid.cc @@ -13,7 +13,7 @@ * */ -#include "actions/set_uid.h" +#include "src/actions/set_uid.h" #include #include diff --git a/src/actions/set_uid.h b/src/actions/set_uid.h index 7b11f0c8..a7f39a5c 100644 --- a/src/actions/set_uid.h +++ b/src/actions/set_uid.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_SET_UID_H_ #define SRC_ACTIONS_SET_UID_H_ diff --git a/src/actions/set_var.cc b/src/actions/set_var.cc index 089b0124..4420aaa4 100644 --- a/src/actions/set_var.cc +++ b/src/actions/set_var.cc @@ -13,7 +13,7 @@ * */ -#include "actions/set_var.h" +#include "src/actions/set_var.h" #include #include @@ -21,7 +21,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/actions/set_var.h b/src/actions/set_var.h index 44cb4064..84562e4c 100644 --- a/src/actions/set_var.h +++ b/src/actions/set_var.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_SET_VAR_H_ #define SRC_ACTIONS_SET_VAR_H_ diff --git a/src/actions/severity.cc b/src/actions/severity.cc index 34cb4a1f..2ec199e8 100644 --- a/src/actions/severity.cc +++ b/src/actions/severity.cc @@ -13,15 +13,15 @@ * */ -#include "actions/severity.h" +#include "src/actions/severity.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/severity.h b/src/actions/severity.h index 26f1a8b4..dd7dd3bb 100644 --- a/src/actions/severity.h +++ b/src/actions/severity.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_SEVERITY_H_ #define SRC_ACTIONS_SEVERITY_H_ diff --git a/src/actions/skip.cc b/src/actions/skip.cc index b7c535c5..fc0b45e2 100644 --- a/src/actions/skip.cc +++ b/src/actions/skip.cc @@ -13,12 +13,12 @@ * */ -#include "actions/skip.h" +#include "src/actions/skip.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" diff --git a/src/actions/skip.h b/src/actions/skip.h index 1c5597dd..70a8961f 100644 --- a/src/actions/skip.h +++ b/src/actions/skip.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_SKIP_H_ #define SRC_ACTIONS_SKIP_H_ diff --git a/src/actions/skip_after.cc b/src/actions/skip_after.cc index 1c2fc721..a56684bc 100644 --- a/src/actions/skip_after.cc +++ b/src/actions/skip_after.cc @@ -13,12 +13,12 @@ * */ -#include "actions/skip_after.h" +#include "src/actions/skip_after.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" diff --git a/src/actions/skip_after.h b/src/actions/skip_after.h index 36b690b6..682c3f1c 100644 --- a/src/actions/skip_after.h +++ b/src/actions/skip_after.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_SKIP_AFTER_H_ #define SRC_ACTIONS_SKIP_AFTER_H_ diff --git a/src/actions/status.cc b/src/actions/status.cc index bd8b5427..1ab77013 100644 --- a/src/actions/status.cc +++ b/src/actions/status.cc @@ -13,7 +13,7 @@ * */ -#include "actions/status.h" +#include "src/actions/status.h" #include #include diff --git a/src/actions/status.h b/src/actions/status.h index c7d9c0bc..b5ed0997 100644 --- a/src/actions/status.h +++ b/src/actions/status.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_STATUS_H_ #define SRC_ACTIONS_STATUS_H_ diff --git a/src/actions/tag.cc b/src/actions/tag.cc index e557b6e3..f07b3ef9 100644 --- a/src/actions/tag.cc +++ b/src/actions/tag.cc @@ -13,12 +13,12 @@ * */ -#include "actions/tag.h" +#include "src/actions/tag.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "src/macro_expansion.h" #include "modsecurity/rule.h" diff --git a/src/actions/tag.h b/src/actions/tag.h index 75194235..063bd19b 100644 --- a/src/actions/tag.h +++ b/src/actions/tag.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_TAG_H_ #define SRC_ACTIONS_TAG_H_ diff --git a/src/actions/transformations/base64_decode.cc b/src/actions/transformations/base64_decode.cc index cbb3c7f9..cc118967 100644 --- a/src/actions/transformations/base64_decode.cc +++ b/src/actions/transformations/base64_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/base64_decode.h" +#include "src/actions/transformations/base64_decode.h" #include #include @@ -23,8 +23,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "utils/base64.h" +#include "src/actions/transformations/transformation.h" +#include "src/utils/base64.h" namespace modsecurity { diff --git a/src/actions/transformations/base64_decode.h b/src/actions/transformations/base64_decode.h index 002b6cc2..d1402555 100644 --- a/src/actions/transformations/base64_decode.h +++ b/src/actions/transformations/base64_decode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_ diff --git a/src/actions/transformations/base64_decode_ext.cc b/src/actions/transformations/base64_decode_ext.cc index f823b297..23d2ad3d 100644 --- a/src/actions/transformations/base64_decode_ext.cc +++ b/src/actions/transformations/base64_decode_ext.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/base64_decode_ext.h" +#include "src/actions/transformations/base64_decode_ext.h" #include #include @@ -23,8 +23,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "utils/base64.h" +#include "src/actions/transformations/transformation.h" +#include "src/utils/base64.h" namespace modsecurity { diff --git a/src/actions/transformations/base64_decode_ext.h b/src/actions/transformations/base64_decode_ext.h index 8f673334..805eec4a 100644 --- a/src/actions/transformations/base64_decode_ext.h +++ b/src/actions/transformations/base64_decode_ext.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_ #define SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_ diff --git a/src/actions/transformations/base64_encode.cc b/src/actions/transformations/base64_encode.cc index 8440fcbd..a7671c3d 100644 --- a/src/actions/transformations/base64_encode.cc +++ b/src/actions/transformations/base64_encode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/base64_encode.h" +#include "src/actions/transformations/base64_encode.h" #include #include @@ -23,8 +23,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "utils/base64.h" +#include "src/actions/transformations/transformation.h" +#include "src/utils/base64.h" namespace modsecurity { diff --git a/src/actions/transformations/base64_encode.h b/src/actions/transformations/base64_encode.h index 41c93f4b..c896db23 100644 --- a/src/actions/transformations/base64_encode.h +++ b/src/actions/transformations/base64_encode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_ diff --git a/src/actions/transformations/cmd_line.cc b/src/actions/transformations/cmd_line.cc index 38f3105d..3042262d 100644 --- a/src/actions/transformations/cmd_line.cc +++ b/src/actions/transformations/cmd_line.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/cmd_line.h" +#include "src/actions/transformations/cmd_line.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/cmd_line.h b/src/actions/transformations/cmd_line.h index a38685ed..a7eb836c 100644 --- a/src/actions/transformations/cmd_line.h +++ b/src/actions/transformations/cmd_line.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_ diff --git a/src/actions/transformations/compress_whitespace.cc b/src/actions/transformations/compress_whitespace.cc index 1291cc6e..b51654aa 100644 --- a/src/actions/transformations/compress_whitespace.cc +++ b/src/actions/transformations/compress_whitespace.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/compress_whitespace.h" +#include "src/actions/transformations/compress_whitespace.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/compress_whitespace.h b/src/actions/transformations/compress_whitespace.h index e297f761..13859fdd 100644 --- a/src/actions/transformations/compress_whitespace.h +++ b/src/actions/transformations/compress_whitespace.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_ diff --git a/src/actions/transformations/css_decode.cc b/src/actions/transformations/css_decode.cc index 314a0a65..eac6f485 100644 --- a/src/actions/transformations/css_decode.cc +++ b/src/actions/transformations/css_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/css_decode.h" +#include "src/actions/transformations/css_decode.h" #include @@ -25,7 +25,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" diff --git a/src/actions/transformations/css_decode.h b/src/actions/transformations/css_decode.h index 3b69732b..65c4f9d6 100644 --- a/src/actions/transformations/css_decode.h +++ b/src/actions/transformations/css_decode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_ diff --git a/src/actions/transformations/escape_seq_decode.cc b/src/actions/transformations/escape_seq_decode.cc index 5a342366..6d4db1f3 100644 --- a/src/actions/transformations/escape_seq_decode.cc +++ b/src/actions/transformations/escape_seq_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/escape_seq_decode.h" +#include "src/actions/transformations/escape_seq_decode.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" namespace modsecurity { diff --git a/src/actions/transformations/escape_seq_decode.h b/src/actions/transformations/escape_seq_decode.h index 137b2ebf..c7708f02 100644 --- a/src/actions/transformations/escape_seq_decode.h +++ b/src/actions/transformations/escape_seq_decode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_ diff --git a/src/actions/transformations/hex_decode.cc b/src/actions/transformations/hex_decode.cc index 8b04136a..f7bbba7d 100644 --- a/src/actions/transformations/hex_decode.cc +++ b/src/actions/transformations/hex_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/hex_decode.h" +#include "src/actions/transformations/hex_decode.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" namespace modsecurity { diff --git a/src/actions/transformations/hex_decode.h b/src/actions/transformations/hex_decode.h index c7aa8ad0..687aa502 100644 --- a/src/actions/transformations/hex_decode.h +++ b/src/actions/transformations/hex_decode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_ diff --git a/src/actions/transformations/hex_encode.cc b/src/actions/transformations/hex_encode.cc index d9efa0ed..51f30995 100644 --- a/src/actions/transformations/hex_encode.cc +++ b/src/actions/transformations/hex_encode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/hex_encode.h" +#include "src/actions/transformations/hex_encode.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/hex_encode.h b/src/actions/transformations/hex_encode.h index e07c0618..7066d485 100644 --- a/src/actions/transformations/hex_encode.h +++ b/src/actions/transformations/hex_encode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_ diff --git a/src/actions/transformations/html_entity_decode.cc b/src/actions/transformations/html_entity_decode.cc index 2853594c..2c593599 100644 --- a/src/actions/transformations/html_entity_decode.cc +++ b/src/actions/transformations/html_entity_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/html_entity_decode.h" +#include "src/actions/transformations/html_entity_decode.h" #include @@ -25,7 +25,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/html_entity_decode.h b/src/actions/transformations/html_entity_decode.h index 63c3f345..75c20e04 100644 --- a/src/actions/transformations/html_entity_decode.h +++ b/src/actions/transformations/html_entity_decode.h @@ -16,9 +16,9 @@ #include #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" -#include "utils/msc_string.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/utils/msc_string.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_ diff --git a/src/actions/transformations/js_decode.cc b/src/actions/transformations/js_decode.cc index 891d8282..aaa8aee0 100644 --- a/src/actions/transformations/js_decode.cc +++ b/src/actions/transformations/js_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/js_decode.h" +#include "src/actions/transformations/js_decode.h" #include @@ -25,7 +25,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" diff --git a/src/actions/transformations/js_decode.h b/src/actions/transformations/js_decode.h index df36c6e8..f195d829 100644 --- a/src/actions/transformations/js_decode.h +++ b/src/actions/transformations/js_decode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_ diff --git a/src/actions/transformations/length.cc b/src/actions/transformations/length.cc index 1c7a1e37..7c32f80f 100644 --- a/src/actions/transformations/length.cc +++ b/src/actions/transformations/length.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/length.h" +#include "src/actions/transformations/length.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/length.h b/src/actions/transformations/length.h index dfe00002..f1839d50 100644 --- a/src/actions/transformations/length.h +++ b/src/actions/transformations/length.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_ #define SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_ diff --git a/src/actions/transformations/lower_case.cc b/src/actions/transformations/lower_case.cc index 223c8282..4885ff7f 100644 --- a/src/actions/transformations/lower_case.cc +++ b/src/actions/transformations/lower_case.cc @@ -13,14 +13,14 @@ * */ -#include "actions/transformations/lower_case.h" +#include "src/actions/transformations/lower_case.h" #include #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/action.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/lower_case.h b/src/actions/transformations/lower_case.h index 932c99fa..3633ea36 100644 --- a/src/actions/transformations/lower_case.h +++ b/src/actions/transformations/lower_case.h @@ -16,8 +16,8 @@ #include #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_ diff --git a/src/actions/transformations/md5.cc b/src/actions/transformations/md5.cc index a3b95189..6453972d 100644 --- a/src/actions/transformations/md5.cc +++ b/src/actions/transformations/md5.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/md5.h" +#include "src/actions/transformations/md5.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/md5.h" namespace modsecurity { diff --git a/src/actions/transformations/md5.h b/src/actions/transformations/md5.h index 4a1e3935..410d4533 100644 --- a/src/actions/transformations/md5.h +++ b/src/actions/transformations/md5.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_MD5_H_ #define SRC_ACTIONS_TRANSFORMATIONS_MD5_H_ diff --git a/src/actions/transformations/none.cc b/src/actions/transformations/none.cc index 2e397493..880292fa 100644 --- a/src/actions/transformations/none.cc +++ b/src/actions/transformations/none.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/none.h" +#include "src/actions/transformations/none.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/none.h b/src/actions/transformations/none.h index 36141fa9..6e9cce1c 100644 --- a/src/actions/transformations/none.h +++ b/src/actions/transformations/none.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_NONE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_NONE_H_ diff --git a/src/actions/transformations/normalise_path.cc b/src/actions/transformations/normalise_path.cc index 4207b4ab..5d17e0ed 100644 --- a/src/actions/transformations/normalise_path.cc +++ b/src/actions/transformations/normalise_path.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/normalise_path.h" +#include "src/actions/transformations/normalise_path.h" #include @@ -25,7 +25,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/normalise_path.h b/src/actions/transformations/normalise_path.h index 6fafa209..84a4dc51 100644 --- a/src/actions/transformations/normalise_path.h +++ b/src/actions/transformations/normalise_path.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_ #define SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_ diff --git a/src/actions/transformations/normalise_path_win.cc b/src/actions/transformations/normalise_path_win.cc index 78fd78d5..16aa673c 100644 --- a/src/actions/transformations/normalise_path_win.cc +++ b/src/actions/transformations/normalise_path_win.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/normalise_path_win.h" +#include "src/actions/transformations/normalise_path_win.h" #include @@ -25,8 +25,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "actions/transformations/normalise_path.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/transformations/normalise_path.h" namespace modsecurity { diff --git a/src/actions/transformations/normalise_path_win.h b/src/actions/transformations/normalise_path_win.h index 425df7db..9066a1f6 100644 --- a/src/actions/transformations/normalise_path_win.h +++ b/src/actions/transformations/normalise_path_win.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_ #define SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_ diff --git a/src/actions/transformations/parity_even_7bit.cc b/src/actions/transformations/parity_even_7bit.cc index dfacd819..03412334 100644 --- a/src/actions/transformations/parity_even_7bit.cc +++ b/src/actions/transformations/parity_even_7bit.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/parity_even_7bit.h" +#include "src/actions/transformations/parity_even_7bit.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/parity_even_7bit.h b/src/actions/transformations/parity_even_7bit.h index c914d70f..24c20ba4 100644 --- a/src/actions/transformations/parity_even_7bit.h +++ b/src/actions/transformations/parity_even_7bit.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_ #define SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_ diff --git a/src/actions/transformations/parity_odd_7bit.cc b/src/actions/transformations/parity_odd_7bit.cc index bc2d24c2..856b6b7e 100644 --- a/src/actions/transformations/parity_odd_7bit.cc +++ b/src/actions/transformations/parity_odd_7bit.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/parity_odd_7bit.h" +#include "src/actions/transformations/parity_odd_7bit.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/parity_odd_7bit.h b/src/actions/transformations/parity_odd_7bit.h index 2ebdac75..57cbe3ec 100644 --- a/src/actions/transformations/parity_odd_7bit.h +++ b/src/actions/transformations/parity_odd_7bit.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_ #define SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_ diff --git a/src/actions/transformations/parity_zero_7bit.cc b/src/actions/transformations/parity_zero_7bit.cc index 890acf6e..151c73fa 100644 --- a/src/actions/transformations/parity_zero_7bit.cc +++ b/src/actions/transformations/parity_zero_7bit.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/parity_zero_7bit.h" +#include "src/actions/transformations/parity_zero_7bit.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/parity_zero_7bit.h b/src/actions/transformations/parity_zero_7bit.h index e69e5312..563a4917 100644 --- a/src/actions/transformations/parity_zero_7bit.h +++ b/src/actions/transformations/parity_zero_7bit.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_ #define SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_ diff --git a/src/actions/transformations/remove_comments.cc b/src/actions/transformations/remove_comments.cc index c4e05208..9a9dc129 100644 --- a/src/actions/transformations/remove_comments.cc +++ b/src/actions/transformations/remove_comments.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/remove_comments.h" +#include "src/actions/transformations/remove_comments.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/remove_comments.h b/src/actions/transformations/remove_comments.h index e8f526dd..a224c94b 100644 --- a/src/actions/transformations/remove_comments.h +++ b/src/actions/transformations/remove_comments.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_ #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_ diff --git a/src/actions/transformations/remove_comments_char.cc b/src/actions/transformations/remove_comments_char.cc index 1a267029..150235ba 100644 --- a/src/actions/transformations/remove_comments_char.cc +++ b/src/actions/transformations/remove_comments_char.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/remove_comments_char.h" +#include "src/actions/transformations/remove_comments_char.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/remove_comments_char.h b/src/actions/transformations/remove_comments_char.h index b0ee297d..7be2ba30 100644 --- a/src/actions/transformations/remove_comments_char.h +++ b/src/actions/transformations/remove_comments_char.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_ #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_ diff --git a/src/actions/transformations/remove_nulls.cc b/src/actions/transformations/remove_nulls.cc index 18a9f305..652d3774 100644 --- a/src/actions/transformations/remove_nulls.cc +++ b/src/actions/transformations/remove_nulls.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/remove_nulls.h" +#include "src/actions/transformations/remove_nulls.h" #include @@ -25,7 +25,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/remove_nulls.h b/src/actions/transformations/remove_nulls.h index 8542102d..3ddf048a 100644 --- a/src/actions/transformations/remove_nulls.h +++ b/src/actions/transformations/remove_nulls.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_ #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_ diff --git a/src/actions/transformations/remove_whitespace.cc b/src/actions/transformations/remove_whitespace.cc index a76ff135..4297a3ee 100644 --- a/src/actions/transformations/remove_whitespace.cc +++ b/src/actions/transformations/remove_whitespace.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/remove_whitespace.h" +#include "src/actions/transformations/remove_whitespace.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #define NBSP 160 // non breaking space char diff --git a/src/actions/transformations/remove_whitespace.h b/src/actions/transformations/remove_whitespace.h index 6d720c02..1e2ff874 100644 --- a/src/actions/transformations/remove_whitespace.h +++ b/src/actions/transformations/remove_whitespace.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_ diff --git a/src/actions/transformations/replace_comments.cc b/src/actions/transformations/replace_comments.cc index 52411096..b2c61086 100644 --- a/src/actions/transformations/replace_comments.cc +++ b/src/actions/transformations/replace_comments.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/replace_comments.h" +#include "src/actions/transformations/replace_comments.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/replace_comments.h b/src/actions/transformations/replace_comments.h index baa6ed8c..f49b7fb5 100644 --- a/src/actions/transformations/replace_comments.h +++ b/src/actions/transformations/replace_comments.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_ #define SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_ diff --git a/src/actions/transformations/replace_nulls.cc b/src/actions/transformations/replace_nulls.cc index a39b2120..01996cc3 100644 --- a/src/actions/transformations/replace_nulls.cc +++ b/src/actions/transformations/replace_nulls.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/replace_nulls.h" +#include "src/actions/transformations/replace_nulls.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" namespace modsecurity { diff --git a/src/actions/transformations/replace_nulls.h b/src/actions/transformations/replace_nulls.h index ac9bb6fa..87c07c10 100644 --- a/src/actions/transformations/replace_nulls.h +++ b/src/actions/transformations/replace_nulls.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_ #define SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_ diff --git a/src/actions/transformations/sha1.cc b/src/actions/transformations/sha1.cc index 34c5c156..0e1f8bb2 100644 --- a/src/actions/transformations/sha1.cc +++ b/src/actions/transformations/sha1.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/sha1.h" +#include "src/actions/transformations/sha1.h" #include #include @@ -23,8 +23,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "utils/sha1.h" +#include "src/actions/transformations/transformation.h" +#include "src/utils/sha1.h" namespace modsecurity { diff --git a/src/actions/transformations/sha1.h b/src/actions/transformations/sha1.h index fcd88469..802f4d0b 100644 --- a/src/actions/transformations/sha1.h +++ b/src/actions/transformations/sha1.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_SHA1_H_ #define SRC_ACTIONS_TRANSFORMATIONS_SHA1_H_ diff --git a/src/actions/transformations/sql_hex_decode.cc b/src/actions/transformations/sql_hex_decode.cc index ed637e4e..194c977f 100644 --- a/src/actions/transformations/sql_hex_decode.cc +++ b/src/actions/transformations/sql_hex_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/sql_hex_decode.h" +#include "src/actions/transformations/sql_hex_decode.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" diff --git a/src/actions/transformations/sql_hex_decode.h b/src/actions/transformations/sql_hex_decode.h index 3284dcc6..331ad9bd 100644 --- a/src/actions/transformations/sql_hex_decode.h +++ b/src/actions/transformations/sql_hex_decode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_SQL_HEX_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_SQL_HEX_DECODE_H_ diff --git a/src/actions/transformations/transformation.cc b/src/actions/transformations/transformation.cc index 3faaaea3..271573aa 100644 --- a/src/actions/transformations/transformation.cc +++ b/src/actions/transformations/transformation.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include @@ -21,42 +21,42 @@ #include #include "modsecurity/transaction.h" -#include "actions/action.h" -#include "actions/transformations/base64_decode_ext.h" -#include "actions/transformations/base64_decode.h" -#include "actions/transformations/base64_encode.h" -#include "actions/transformations/cmd_line.h" -#include "actions/transformations/compress_whitespace.h" -#include "actions/transformations/css_decode.h" -#include "actions/transformations/escape_seq_decode.h" -#include "actions/transformations/hex_decode.h" -#include "actions/transformations/hex_encode.h" -#include "actions/transformations/html_entity_decode.h" -#include "actions/transformations/js_decode.h" -#include "actions/transformations/length.h" -#include "actions/transformations/lower_case.h" -#include "actions/transformations/md5.h" -#include "actions/transformations/none.h" -#include "actions/transformations/normalise_path.h" -#include "actions/transformations/normalise_path_win.h" -#include "actions/transformations/parity_even_7bit.h" -#include "actions/transformations/parity_odd_7bit.h" -#include "actions/transformations/parity_zero_7bit.h" -#include "actions/transformations/remove_comments_char.h" -#include "actions/transformations/remove_comments.h" -#include "actions/transformations/remove_nulls.h" -#include "actions/transformations/remove_whitespace.h" -#include "actions/transformations/replace_comments.h" -#include "actions/transformations/replace_nulls.h" -#include "actions/transformations/sha1.h" -#include "actions/transformations/sql_hex_decode.h" -#include "actions/transformations/trim.h" -#include "actions/transformations/trim_left.h" -#include "actions/transformations/trim_right.h" -#include "actions/transformations/url_decode.h" -#include "actions/transformations/url_decode_uni.h" -#include "actions/transformations/url_encode.h" -#include "actions/transformations/utf8_to_unicode.h" +#include "src/actions/action.h" +#include "src/actions/transformations/base64_decode_ext.h" +#include "src/actions/transformations/base64_decode.h" +#include "src/actions/transformations/base64_encode.h" +#include "src/actions/transformations/cmd_line.h" +#include "src/actions/transformations/compress_whitespace.h" +#include "src/actions/transformations/css_decode.h" +#include "src/actions/transformations/escape_seq_decode.h" +#include "src/actions/transformations/hex_decode.h" +#include "src/actions/transformations/hex_encode.h" +#include "src/actions/transformations/html_entity_decode.h" +#include "src/actions/transformations/js_decode.h" +#include "src/actions/transformations/length.h" +#include "src/actions/transformations/lower_case.h" +#include "src/actions/transformations/md5.h" +#include "src/actions/transformations/none.h" +#include "src/actions/transformations/normalise_path.h" +#include "src/actions/transformations/normalise_path_win.h" +#include "src/actions/transformations/parity_even_7bit.h" +#include "src/actions/transformations/parity_odd_7bit.h" +#include "src/actions/transformations/parity_zero_7bit.h" +#include "src/actions/transformations/remove_comments_char.h" +#include "src/actions/transformations/remove_comments.h" +#include "src/actions/transformations/remove_nulls.h" +#include "src/actions/transformations/remove_whitespace.h" +#include "src/actions/transformations/replace_comments.h" +#include "src/actions/transformations/replace_nulls.h" +#include "src/actions/transformations/sha1.h" +#include "src/actions/transformations/sql_hex_decode.h" +#include "src/actions/transformations/trim.h" +#include "src/actions/transformations/trim_left.h" +#include "src/actions/transformations/trim_right.h" +#include "src/actions/transformations/url_decode.h" +#include "src/actions/transformations/url_decode_uni.h" +#include "src/actions/transformations/url_encode.h" +#include "src/actions/transformations/utf8_to_unicode.h" #define IF_MATCH(b) \ if (a.compare(2, std::strlen(#b), #b) == 0) diff --git a/src/actions/transformations/transformation.h b/src/actions/transformations/transformation.h index 37042c85..b8161b12 100644 --- a/src/actions/transformations/transformation.h +++ b/src/actions/transformations/transformation.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_TRANSFORMATION_H_ #define SRC_ACTIONS_TRANSFORMATIONS_TRANSFORMATION_H_ diff --git a/src/actions/transformations/trim.cc b/src/actions/transformations/trim.cc index 817b5edd..9cea05cd 100644 --- a/src/actions/transformations/trim.cc +++ b/src/actions/transformations/trim.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/trim.h" +#include "src/actions/transformations/trim.h" #include #include @@ -23,8 +23,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/action.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/trim.h b/src/actions/transformations/trim.h index fb21981b..bfcafccb 100644 --- a/src/actions/transformations/trim.h +++ b/src/actions/transformations/trim.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_TRIM_H_ #define SRC_ACTIONS_TRANSFORMATIONS_TRIM_H_ diff --git a/src/actions/transformations/trim_left.cc b/src/actions/transformations/trim_left.cc index 4922807d..e23bed7c 100644 --- a/src/actions/transformations/trim_left.cc +++ b/src/actions/transformations/trim_left.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/trim_left.h" +#include "src/actions/transformations/trim_left.h" #include #include @@ -23,9 +23,9 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "actions/transformations/trim.h" -#include "actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/transformations/trim.h" +#include "src/actions/action.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/trim_left.h b/src/actions/transformations/trim_left.h index 973a7b64..36456d6c 100644 --- a/src/actions/transformations/trim_left.h +++ b/src/actions/transformations/trim_left.h @@ -15,9 +15,9 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" -#include "actions/transformations/trim.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/transformations/trim.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_TRIM_LEFT_H_ #define SRC_ACTIONS_TRANSFORMATIONS_TRIM_LEFT_H_ diff --git a/src/actions/transformations/trim_right.cc b/src/actions/transformations/trim_right.cc index 0a865455..6b4be975 100644 --- a/src/actions/transformations/trim_right.cc +++ b/src/actions/transformations/trim_right.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/trim_right.h" +#include "src/actions/transformations/trim_right.h" #include #include @@ -23,8 +23,8 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" -#include "actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/action.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/trim_right.h b/src/actions/transformations/trim_right.h index ac8ec649..2ff4ef3d 100644 --- a/src/actions/transformations/trim_right.h +++ b/src/actions/transformations/trim_right.h @@ -15,9 +15,9 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" -#include "actions/transformations/trim.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/transformations/trim.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_TRIM_RIGHT_H_ #define SRC_ACTIONS_TRANSFORMATIONS_TRIM_RIGHT_H_ diff --git a/src/actions/transformations/url_decode.cc b/src/actions/transformations/url_decode.cc index 1ac75286..8ed788a2 100644 --- a/src/actions/transformations/url_decode.cc +++ b/src/actions/transformations/url_decode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/url_decode.h" +#include "src/actions/transformations/url_decode.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/decode.h" namespace modsecurity { diff --git a/src/actions/transformations/url_decode.h b/src/actions/transformations/url_decode.h index 66477fde..25057ed6 100644 --- a/src/actions/transformations/url_decode.h +++ b/src/actions/transformations/url_decode.h @@ -16,8 +16,8 @@ #include #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_H_ diff --git a/src/actions/transformations/url_decode_uni.cc b/src/actions/transformations/url_decode_uni.cc index b0abfe62..9d842137 100644 --- a/src/actions/transformations/url_decode_uni.cc +++ b/src/actions/transformations/url_decode_uni.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/url_decode_uni.h" +#include "src/actions/transformations/url_decode_uni.h" #include @@ -26,7 +26,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" #include "modsecurity/rules.h" diff --git a/src/actions/transformations/url_decode_uni.h b/src/actions/transformations/url_decode_uni.h index 09010d35..2bd59cac 100644 --- a/src/actions/transformations/url_decode_uni.h +++ b/src/actions/transformations/url_decode_uni.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_UNI_H_ #define SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_UNI_H_ diff --git a/src/actions/transformations/url_encode.cc b/src/actions/transformations/url_encode.cc index ad6863d7..d15e5f27 100644 --- a/src/actions/transformations/url_encode.cc +++ b/src/actions/transformations/url_encode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/url_encode.h" +#include "src/actions/transformations/url_encode.h" #include #include @@ -23,7 +23,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" namespace modsecurity { diff --git a/src/actions/transformations/url_encode.h b/src/actions/transformations/url_encode.h index 5d3e82b8..099eeb8d 100644 --- a/src/actions/transformations/url_encode.h +++ b/src/actions/transformations/url_encode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_ENCODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_URL_ENCODE_H_ diff --git a/src/actions/transformations/utf8_to_unicode.cc b/src/actions/transformations/utf8_to_unicode.cc index c53ee964..b48b4a3c 100644 --- a/src/actions/transformations/utf8_to_unicode.cc +++ b/src/actions/transformations/utf8_to_unicode.cc @@ -13,7 +13,7 @@ * */ -#include "actions/transformations/utf8_to_unicode.h" +#include "src/actions/transformations/utf8_to_unicode.h" #include #include @@ -24,7 +24,7 @@ #include #include "modsecurity/transaction.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" #include "src/utils/msc_string.h" diff --git a/src/actions/transformations/utf8_to_unicode.h b/src/actions/transformations/utf8_to_unicode.h index 564eb0c9..5419078a 100644 --- a/src/actions/transformations/utf8_to_unicode.h +++ b/src/actions/transformations/utf8_to_unicode.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_UTF8_TO_UNICODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_UTF8_TO_UNICODE_H_ diff --git a/src/actions/ver.cc b/src/actions/ver.cc index d827faa1..bcdd3230 100644 --- a/src/actions/ver.cc +++ b/src/actions/ver.cc @@ -13,12 +13,12 @@ * */ -#include "actions/ver.h" +#include "src/actions/ver.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" diff --git a/src/actions/ver.h b/src/actions/ver.h index 88b62df9..902304a1 100644 --- a/src/actions/ver.h +++ b/src/actions/ver.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_VER_H_ #define SRC_ACTIONS_VER_H_ diff --git a/src/actions/xmlns.cc b/src/actions/xmlns.cc index 83b26b7f..c98f8273 100644 --- a/src/actions/xmlns.cc +++ b/src/actions/xmlns.cc @@ -13,12 +13,12 @@ * */ -#include "actions/xmlns.h" +#include "src/actions/xmlns.h" #include #include -#include "actions/action.h" +#include "src/actions/action.h" #include "modsecurity/transaction.h" namespace modsecurity { diff --git a/src/actions/xmlns.h b/src/actions/xmlns.h index d5064a43..db38fcf2 100644 --- a/src/actions/xmlns.h +++ b/src/actions/xmlns.h @@ -15,7 +15,7 @@ #include -#include "actions/action.h" +#include "src/actions/action.h" #ifndef SRC_ACTIONS_XMLNS_H_ #define SRC_ACTIONS_XMLNS_H_ diff --git a/src/audit_log/audit_log.cc b/src/audit_log/audit_log.cc index 2dd4956f..84135819 100644 --- a/src/audit_log/audit_log.cc +++ b/src/audit_log/audit_log.cc @@ -13,7 +13,7 @@ * */ -#include "audit_log/audit_log.h" +#include "src/audit_log/audit_log.h" #include #include @@ -21,10 +21,10 @@ #include -#include "audit_log/writer/https.h" -#include "audit_log/writer/parallel.h" -#include "audit_log/writer/serial.h" -#include "utils/regex.h" +#include "src/audit_log/writer/https.h" +#include "src/audit_log/writer/parallel.h" +#include "src/audit_log/writer/serial.h" +#include "src/utils/regex.h" #define PARTS_CONSTAINS(a, c) \ if (new_parts.find(toupper(a)) != std::string::npos \ diff --git a/src/audit_log/audit_log.h b/src/audit_log/audit_log.h index 8eca8611..3adcb26d 100644 --- a/src/audit_log/audit_log.h +++ b/src/audit_log/audit_log.h @@ -23,7 +23,7 @@ #define SRC_AUDIT_LOG_AUDIT_LOG_H_ #include "modsecurity/transaction.h" -#include "audit_log/writer.h" +#include "src/audit_log/writer.h" #ifdef __cplusplus diff --git a/src/audit_log/writer.cc b/src/audit_log/writer.cc index 9b1a8b2c..f17e25b9 100644 --- a/src/audit_log/writer.cc +++ b/src/audit_log/writer.cc @@ -13,11 +13,11 @@ * */ -#include "audit_log/writer.h" +#include "src/audit_log/writer.h" #include -#include "audit_log/audit_log.h" +#include "src/audit_log/audit_log.h" namespace modsecurity { namespace audit_log { diff --git a/src/audit_log/writer/https.cc b/src/audit_log/writer/https.cc index 7266a211..42c9b22f 100644 --- a/src/audit_log/writer/https.cc +++ b/src/audit_log/writer/https.cc @@ -13,7 +13,7 @@ * */ -#include "audit_log/writer/https.h" +#include "src/audit_log/writer/https.h" #include #include @@ -25,10 +25,10 @@ #include #include -#include "audit_log/audit_log.h" +#include "src/audit_log/audit_log.h" #include "modsecurity/transaction.h" -#include "utils/md5.h" -#include "utils/https_client.h" +#include "src/utils/md5.h" +#include "src/utils/https_client.h" namespace modsecurity { diff --git a/src/audit_log/writer/https.h b/src/audit_log/writer/https.h index 431dbe4c..71a4fe4f 100644 --- a/src/audit_log/writer/https.h +++ b/src/audit_log/writer/https.h @@ -22,7 +22,7 @@ #ifndef SRC_AUDIT_LOG_WRITER_HTTPS_H_ #define SRC_AUDIT_LOG_WRITER_HTTPS_H_ -#include "audit_log/writer.h" +#include "src/audit_log/writer.h" #include "modsecurity/transaction.h" #ifdef __cplusplus diff --git a/src/audit_log/writer/parallel.cc b/src/audit_log/writer/parallel.cc index c029b451..e8343bcd 100644 --- a/src/audit_log/writer/parallel.cc +++ b/src/audit_log/writer/parallel.cc @@ -13,7 +13,7 @@ * */ -#include "audit_log/writer/parallel.h" +#include "src/audit_log/writer/parallel.h" #include #include @@ -25,10 +25,10 @@ #include #include -#include "audit_log/audit_log.h" +#include "src/audit_log/audit_log.h" #include "modsecurity/transaction.h" #include "src/utils/msc_system.h" -#include "utils/md5.h" +#include "src/utils/md5.h" namespace modsecurity { diff --git a/src/audit_log/writer/parallel.h b/src/audit_log/writer/parallel.h index 611d49ba..d8fd8b42 100644 --- a/src/audit_log/writer/parallel.h +++ b/src/audit_log/writer/parallel.h @@ -18,7 +18,7 @@ #ifndef SRC_AUDIT_LOG_WRITER_PARALLEL_H_ #define SRC_AUDIT_LOG_WRITER_PARALLEL_H_ -#include "audit_log/writer.h" +#include "src/audit_log/writer.h" #include "modsecurity/transaction.h" #ifdef __cplusplus diff --git a/src/audit_log/writer/serial.cc b/src/audit_log/writer/serial.cc index 2f2fda54..556ed4c7 100644 --- a/src/audit_log/writer/serial.cc +++ b/src/audit_log/writer/serial.cc @@ -13,11 +13,11 @@ * */ -#include "audit_log/writer/serial.h" +#include "src/audit_log/writer/serial.h" // #include -#include "audit_log/audit_log.h" +#include "src/audit_log/audit_log.h" namespace modsecurity { namespace audit_log { diff --git a/src/audit_log/writer/serial.h b/src/audit_log/writer/serial.h index 87b2268f..28d2df3e 100644 --- a/src/audit_log/writer/serial.h +++ b/src/audit_log/writer/serial.h @@ -22,7 +22,7 @@ #ifndef SRC_AUDIT_LOG_WRITER_SERIAL_H_ #define SRC_AUDIT_LOG_WRITER_SERIAL_H_ -#include "audit_log/writer.h" +#include "src/audit_log/writer.h" #include "modsecurity/transaction.h" #ifdef __cplusplus diff --git a/src/collection/backend/in_memory-per_process.cc b/src/collection/backend/in_memory-per_process.cc index 78ee0e7a..ff5f6f9e 100644 --- a/src/collection/backend/in_memory-per_process.cc +++ b/src/collection/backend/in_memory-per_process.cc @@ -25,7 +25,7 @@ #include "modsecurity/collection/variable.h" #include "src/utils/regex.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/collection/collections.cc b/src/collection/collections.cc index 3036010b..bd9833c5 100644 --- a/src/collection/collections.cc +++ b/src/collection/collections.cc @@ -27,7 +27,7 @@ #include "modsecurity/collection/variable.h" #include "modsecurity/collection/collection.h" #include "src/collection/backend/in_memory-per_process.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/macro_expansion.cc b/src/macro_expansion.cc index 6371b12e..59c52997 100644 --- a/src/macro_expansion.cc +++ b/src/macro_expansion.cc @@ -19,7 +19,7 @@ #include "src/variables/rule.h" #include "src/variables/tx.h" #include "src/variables/highest_severity.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/modsecurity.cc b/src/modsecurity.cc index 62b2fdc1..9f4b6091 100644 --- a/src/modsecurity.cc +++ b/src/modsecurity.cc @@ -26,7 +26,7 @@ #include #endif -#include "utils/geo_lookup.h" +#include "src/utils/geo_lookup.h" namespace modsecurity { diff --git a/src/operators/begins_with.cc b/src/operators/begins_with.cc index 59918fef..cab5eacc 100644 --- a/src/operators/begins_with.cc +++ b/src/operators/begins_with.cc @@ -13,11 +13,11 @@ * */ -#include "operators/begins_with.h" +#include "src/operators/begins_with.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/begins_with.h b/src/operators/begins_with.h index 2fdea97c..30d3884e 100644 --- a/src/operators/begins_with.h +++ b/src/operators/begins_with.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/contains.cc b/src/operators/contains.cc index 770d4a37..e4de4d00 100644 --- a/src/operators/contains.cc +++ b/src/operators/contains.cc @@ -13,7 +13,7 @@ * */ -#include "operators/contains.h" +#include "src/operators/contains.h" #include diff --git a/src/operators/contains.h b/src/operators/contains.h index ba9d58c6..b19d6a32 100644 --- a/src/operators/contains.h +++ b/src/operators/contains.h @@ -20,7 +20,7 @@ #include #include "modsecurity/transaction.h" -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/contains_word.cc b/src/operators/contains_word.cc index 7cd5946b..9aa73dbd 100644 --- a/src/operators/contains_word.cc +++ b/src/operators/contains_word.cc @@ -13,11 +13,11 @@ * */ -#include "operators/contains_word.h" +#include "src/operators/contains_word.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/contains_word.h b/src/operators/contains_word.h index d2d63eb2..bb9fa51b 100644 --- a/src/operators/contains_word.h +++ b/src/operators/contains_word.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/detect_sqli.cc b/src/operators/detect_sqli.cc index e3d4f4a8..a5c4350b 100644 --- a/src/operators/detect_sqli.cc +++ b/src/operators/detect_sqli.cc @@ -13,12 +13,12 @@ * */ -#include "operators/detect_sqli.h" +#include "src/operators/detect_sqli.h" #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "others/libinjection/src/libinjection.h" namespace modsecurity { diff --git a/src/operators/detect_sqli.h b/src/operators/detect_sqli.h index 5d79ee8f..b4da8687 100644 --- a/src/operators/detect_sqli.h +++ b/src/operators/detect_sqli.h @@ -19,7 +19,7 @@ #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/detect_xss.cc b/src/operators/detect_xss.cc index 7de689d9..d3fae0a1 100644 --- a/src/operators/detect_xss.cc +++ b/src/operators/detect_xss.cc @@ -13,11 +13,11 @@ * */ -#include "operators/detect_xss.h" +#include "src/operators/detect_xss.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "others/libinjection/src/libinjection.h" #include "src/macro_expansion.h" diff --git a/src/operators/detect_xss.h b/src/operators/detect_xss.h index 9b2e4f01..76cb1386 100644 --- a/src/operators/detect_xss.h +++ b/src/operators/detect_xss.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/ends_with.cc b/src/operators/ends_with.cc index 5ddb36da..1889b6d1 100644 --- a/src/operators/ends_with.cc +++ b/src/operators/ends_with.cc @@ -13,11 +13,11 @@ * */ -#include "operators/ends_with.h" +#include "src/operators/ends_with.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/ends_with.h b/src/operators/ends_with.h index e48db8e9..68bb38a8 100644 --- a/src/operators/ends_with.h +++ b/src/operators/ends_with.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/eq.cc b/src/operators/eq.cc index 77d13f37..37111291 100644 --- a/src/operators/eq.cc +++ b/src/operators/eq.cc @@ -13,11 +13,11 @@ * */ -#include "operators/eq.h" +#include "src/operators/eq.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/eq.h b/src/operators/eq.h index 76f86695..edfe3de1 100644 --- a/src/operators/eq.h +++ b/src/operators/eq.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/fuzzy_hash.cc b/src/operators/fuzzy_hash.cc index 8a286a98..4b28680f 100644 --- a/src/operators/fuzzy_hash.cc +++ b/src/operators/fuzzy_hash.cc @@ -13,11 +13,11 @@ * */ -#include "operators/fuzzy_hash.h" +#include "src/operators/fuzzy_hash.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/fuzzy_hash.h b/src/operators/fuzzy_hash.h index a3f464cc..c83e43cb 100644 --- a/src/operators/fuzzy_hash.h +++ b/src/operators/fuzzy_hash.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/ge.cc b/src/operators/ge.cc index 619265b8..da251de7 100644 --- a/src/operators/ge.cc +++ b/src/operators/ge.cc @@ -13,11 +13,11 @@ * */ -#include "operators/ge.h" +#include "src/operators/ge.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/ge.h b/src/operators/ge.h index 122b1af9..db907b29 100644 --- a/src/operators/ge.h +++ b/src/operators/ge.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/geo_lookup.cc b/src/operators/geo_lookup.cc index 0b1c03ec..e1f8f521 100644 --- a/src/operators/geo_lookup.cc +++ b/src/operators/geo_lookup.cc @@ -13,7 +13,7 @@ * */ -#include "operators/geo_lookup.h" +#include "src/operators/geo_lookup.h" #ifdef WITH_GEOIP #include @@ -22,8 +22,8 @@ #include #include -#include "operators/operator.h" -#include "utils/geo_lookup.h" +#include "src/operators/operator.h" +#include "src/utils/geo_lookup.h" namespace modsecurity { diff --git a/src/operators/geo_lookup.h b/src/operators/geo_lookup.h index 18737470..45c1c8ff 100644 --- a/src/operators/geo_lookup.h +++ b/src/operators/geo_lookup.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/gsblookup.cc b/src/operators/gsblookup.cc index 6b1e2744..5172b2b9 100644 --- a/src/operators/gsblookup.cc +++ b/src/operators/gsblookup.cc @@ -13,11 +13,11 @@ * */ -#include "operators/gsblookup.h" +#include "src/operators/gsblookup.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/gsblookup.h b/src/operators/gsblookup.h index 934e10bc..02255adf 100644 --- a/src/operators/gsblookup.h +++ b/src/operators/gsblookup.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/gt.cc b/src/operators/gt.cc index 43976e08..e1324e31 100644 --- a/src/operators/gt.cc +++ b/src/operators/gt.cc @@ -13,11 +13,11 @@ * */ -#include "operators/gt.h" +#include "src/operators/gt.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/gt.h b/src/operators/gt.h index 00d290cb..1bde4f1c 100644 --- a/src/operators/gt.h +++ b/src/operators/gt.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/inspect_file.cc b/src/operators/inspect_file.cc index 82a1665a..2551985a 100644 --- a/src/operators/inspect_file.cc +++ b/src/operators/inspect_file.cc @@ -13,11 +13,11 @@ * */ -#include "operators/inspect_file.h" +#include "src/operators/inspect_file.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/inspect_file.h b/src/operators/inspect_file.h index 4a8345ef..4a761ae8 100644 --- a/src/operators/inspect_file.h +++ b/src/operators/inspect_file.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/ip_match.cc b/src/operators/ip_match.cc index dbb35192..4154c101 100644 --- a/src/operators/ip_match.cc +++ b/src/operators/ip_match.cc @@ -13,13 +13,13 @@ * */ -#include "operators/ip_match.h" +#include "src/operators/ip_match.h" #include #include -#include "utils/msc_tree.h" -#include "operators/operator.h" +#include "src/utils/msc_tree.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/ip_match.h b/src/operators/ip_match.h index caaba167..ecb6720e 100644 --- a/src/operators/ip_match.h +++ b/src/operators/ip_match.h @@ -18,8 +18,8 @@ #include -#include "operators/operator.h" -#include "utils/ip_tree.h" +#include "src/operators/operator.h" +#include "src/utils/ip_tree.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/ip_match_f.cc b/src/operators/ip_match_f.cc index 7c82df89..a6e177a4 100644 --- a/src/operators/ip_match_f.cc +++ b/src/operators/ip_match_f.cc @@ -13,11 +13,11 @@ * */ -#include "operators/ip_match_f.h" +#include "src/operators/ip_match_f.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/ip_match_f.h b/src/operators/ip_match_f.h index 3e4bdb15..043d1bb7 100644 --- a/src/operators/ip_match_f.h +++ b/src/operators/ip_match_f.h @@ -18,7 +18,7 @@ #include -#include "operators/ip_match_from_file.h" +#include "src/operators/ip_match_from_file.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/ip_match_from_file.cc b/src/operators/ip_match_from_file.cc index fe5e4677..7dd8eb69 100644 --- a/src/operators/ip_match_from_file.cc +++ b/src/operators/ip_match_from_file.cc @@ -13,13 +13,13 @@ * */ -#include "operators/ip_match_from_file.h" +#include "src/operators/ip_match_from_file.h" #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/ip_match_from_file.h b/src/operators/ip_match_from_file.h index d0eeb1db..a0a03a14 100644 --- a/src/operators/ip_match_from_file.h +++ b/src/operators/ip_match_from_file.h @@ -17,7 +17,7 @@ #include -#include "operators/ip_match.h" +#include "src/operators/ip_match.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/le.cc b/src/operators/le.cc index 2b0b1edb..1aea6332 100644 --- a/src/operators/le.cc +++ b/src/operators/le.cc @@ -13,11 +13,11 @@ * */ -#include "operators/le.h" +#include "src/operators/le.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/le.h b/src/operators/le.h index aaf3da76..5029f486 100644 --- a/src/operators/le.h +++ b/src/operators/le.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/lt.cc b/src/operators/lt.cc index af4e691d..0ecb542b 100644 --- a/src/operators/lt.cc +++ b/src/operators/lt.cc @@ -13,11 +13,11 @@ * */ -#include "operators/lt.h" +#include "src/operators/lt.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/lt.h b/src/operators/lt.h index 8c8529cd..c411f975 100644 --- a/src/operators/lt.h +++ b/src/operators/lt.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/no_match.cc b/src/operators/no_match.cc index f229eaa8..d288a834 100644 --- a/src/operators/no_match.cc +++ b/src/operators/no_match.cc @@ -13,7 +13,7 @@ * */ -#include "operators/no_match.h" +#include "src/operators/no_match.h" #include diff --git a/src/operators/no_match.h b/src/operators/no_match.h index 30c1b350..6a6b5249 100644 --- a/src/operators/no_match.h +++ b/src/operators/no_match.h @@ -16,7 +16,7 @@ #include #include "modsecurity/transaction.h" -#include "operators/operator.h" +#include "src/operators/operator.h" #ifndef SRC_OPERATORS_NO_MATCH_H_ diff --git a/src/operators/operator.cc b/src/operators/operator.cc index 0c82a9a9..60b681e7 100644 --- a/src/operators/operator.cc +++ b/src/operators/operator.cc @@ -13,7 +13,7 @@ * */ -#include "operators/operator.h" +#include "src/operators/operator.h" #include @@ -21,44 +21,44 @@ #include "modsecurity/transaction.h" -#include "operators/begins_with.h" -#include "operators/contains.h" -#include "operators/contains_word.h" -#include "operators/detect_sqli.h" -#include "operators/detect_xss.h" -#include "operators/ends_with.h" -#include "operators/eq.h" -#include "operators/fuzzy_hash.h" -#include "operators/ge.h" -#include "operators/geo_lookup.h" -#include "operators/gsblookup.h" -#include "operators/gt.h" -#include "operators/inspect_file.h" -#include "operators/ip_match_f.h" -#include "operators/ip_match_from_file.h" -#include "operators/ip_match.h" -#include "operators/le.h" -#include "operators/lt.h" -#include "operators/no_match.h" -#include "operators/pm_f.h" -#include "operators/pm_from_file.h" -#include "operators/pm.h" -#include "operators/rbl.h" -#include "operators/rsub.h" -#include "operators/rx.h" -#include "operators/str_eq.h" -#include "operators/str_match.h" -#include "operators/validate_byte_range.h" -#include "operators/validate_dtd.h" -#include "operators/validate_hash.h" -#include "operators/validate_schema.h" -#include "operators/validate_url_encoding.h" -#include "operators/validate_utf8_encoding.h" -#include "operators/verify_cc.h" -#include "operators/verify_cpf.h" -#include "operators/verify_ssn.h" -#include "operators/within.h" -#include "operators/unconditional_match.h" +#include "src/operators/begins_with.h" +#include "src/operators/contains.h" +#include "src/operators/contains_word.h" +#include "src/operators/detect_sqli.h" +#include "src/operators/detect_xss.h" +#include "src/operators/ends_with.h" +#include "src/operators/eq.h" +#include "src/operators/fuzzy_hash.h" +#include "src/operators/ge.h" +#include "src/operators/geo_lookup.h" +#include "src/operators/gsblookup.h" +#include "src/operators/gt.h" +#include "src/operators/inspect_file.h" +#include "src/operators/ip_match_f.h" +#include "src/operators/ip_match_from_file.h" +#include "src/operators/ip_match.h" +#include "src/operators/le.h" +#include "src/operators/lt.h" +#include "src/operators/no_match.h" +#include "src/operators/pm_f.h" +#include "src/operators/pm_from_file.h" +#include "src/operators/pm.h" +#include "src/operators/rbl.h" +#include "src/operators/rsub.h" +#include "src/operators/rx.h" +#include "src/operators/str_eq.h" +#include "src/operators/str_match.h" +#include "src/operators/validate_byte_range.h" +#include "src/operators/validate_dtd.h" +#include "src/operators/validate_hash.h" +#include "src/operators/validate_schema.h" +#include "src/operators/validate_url_encoding.h" +#include "src/operators/validate_utf8_encoding.h" +#include "src/operators/verify_cc.h" +#include "src/operators/verify_cpf.h" +#include "src/operators/verify_ssn.h" +#include "src/operators/within.h" +#include "src/operators/unconditional_match.h" #define IF_MATCH(a) \ if (op_ == #a) diff --git a/src/operators/pm.cc b/src/operators/pm.cc index 7d76f132..35fa033e 100644 --- a/src/operators/pm.cc +++ b/src/operators/pm.cc @@ -13,7 +13,7 @@ * */ -#include "operators/pm.h" +#include "src/operators/pm.h" #include @@ -24,8 +24,8 @@ #include #include -#include "operators/operator.h" -#include "utils/acmp.h" +#include "src/operators/operator.h" +#include "src/utils/acmp.h" namespace modsecurity { namespace operators { diff --git a/src/operators/pm.h b/src/operators/pm.h index ff994e40..1ab2b389 100644 --- a/src/operators/pm.h +++ b/src/operators/pm.h @@ -19,8 +19,8 @@ #include #include -#include "operators/operator.h" -#include "utils/acmp.h" +#include "src/operators/operator.h" +#include "src/utils/acmp.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/pm_f.cc b/src/operators/pm_f.cc index 0b492927..6bcdc517 100644 --- a/src/operators/pm_f.cc +++ b/src/operators/pm_f.cc @@ -13,11 +13,11 @@ * */ -#include "operators/pm_f.h" +#include "src/operators/pm_f.h" #include -#include "operators/pm_from_file.h" +#include "src/operators/pm_from_file.h" namespace modsecurity { namespace operators { diff --git a/src/operators/pm_f.h b/src/operators/pm_f.h index b84faae3..f21ca0f7 100644 --- a/src/operators/pm_f.h +++ b/src/operators/pm_f.h @@ -18,7 +18,7 @@ #include -#include "operators/pm_from_file.h" +#include "src/operators/pm_from_file.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/pm_from_file.cc b/src/operators/pm_from_file.cc index 886af500..248b110d 100644 --- a/src/operators/pm_from_file.cc +++ b/src/operators/pm_from_file.cc @@ -13,12 +13,12 @@ * */ -#include "operators/pm_from_file.h" +#include "src/operators/pm_from_file.h" #include -#include "operators/operator.h" -#include "utils/https_client.h" +#include "src/operators/operator.h" +#include "src/utils/https_client.h" #include "src/utils/msc_system.h" diff --git a/src/operators/pm_from_file.h b/src/operators/pm_from_file.h index 85f86f99..fd9b1cc6 100644 --- a/src/operators/pm_from_file.h +++ b/src/operators/pm_from_file.h @@ -18,7 +18,7 @@ #include -#include "operators/pm.h" +#include "src/operators/pm.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/rbl.cc b/src/operators/rbl.cc index eb7183b7..38a01be4 100644 --- a/src/operators/rbl.cc +++ b/src/operators/rbl.cc @@ -13,7 +13,7 @@ * */ -#include "operators/rbl.h" +#include "src/operators/rbl.h" #include #include @@ -24,7 +24,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/rbl.h b/src/operators/rbl.h index b55e768e..80ba2618 100644 --- a/src/operators/rbl.h +++ b/src/operators/rbl.h @@ -24,7 +24,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus diff --git a/src/operators/rsub.cc b/src/operators/rsub.cc index 9ed6c420..14baa0d9 100644 --- a/src/operators/rsub.cc +++ b/src/operators/rsub.cc @@ -13,11 +13,11 @@ * */ -#include "operators/rsub.h" +#include "src/operators/rsub.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/rsub.h b/src/operators/rsub.h index 7fb0c025..16852b58 100644 --- a/src/operators/rsub.h +++ b/src/operators/rsub.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/rx.cc b/src/operators/rx.cc index 59a561af..31721f6c 100644 --- a/src/operators/rx.cc +++ b/src/operators/rx.cc @@ -13,12 +13,12 @@ * */ -#include "operators/rx.h" +#include "src/operators/rx.h" #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/rx.h b/src/operators/rx.h index 6511bd61..3ba67663 100644 --- a/src/operators/rx.h +++ b/src/operators/rx.h @@ -19,8 +19,8 @@ #include #include -#include "operators/operator.h" -#include "utils/regex.h" +#include "src/operators/operator.h" +#include "src/utils/regex.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/str_eq.cc b/src/operators/str_eq.cc index c0203914..4d4239ef 100644 --- a/src/operators/str_eq.cc +++ b/src/operators/str_eq.cc @@ -13,7 +13,7 @@ * */ -#include "operators/str_eq.h" +#include "src/operators/str_eq.h" #include #include "src/macro_expansion.h" diff --git a/src/operators/str_eq.h b/src/operators/str_eq.h index 0483b44e..b9fba758 100644 --- a/src/operators/str_eq.h +++ b/src/operators/str_eq.h @@ -16,7 +16,7 @@ #include #include "modsecurity/transaction.h" -#include "operators/operator.h" +#include "src/operators/operator.h" #ifndef SRC_OPERATORS_STR_EQ_H_ diff --git a/src/operators/str_match.cc b/src/operators/str_match.cc index 52ed6d59..e85b82f3 100644 --- a/src/operators/str_match.cc +++ b/src/operators/str_match.cc @@ -13,11 +13,11 @@ * */ -#include "operators/str_match.h" +#include "src/operators/str_match.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/str_match.h b/src/operators/str_match.h index 5d4af578..02bdbd36 100644 --- a/src/operators/str_match.h +++ b/src/operators/str_match.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/unconditional_match.cc b/src/operators/unconditional_match.cc index 37fb3f2e..0325df8e 100644 --- a/src/operators/unconditional_match.cc +++ b/src/operators/unconditional_match.cc @@ -13,7 +13,7 @@ * */ -#include "operators/unconditional_match.h" +#include "src/operators/unconditional_match.h" namespace modsecurity { namespace operators { diff --git a/src/operators/unconditional_match.h b/src/operators/unconditional_match.h index 32ea78ab..1e31cdc9 100644 --- a/src/operators/unconditional_match.h +++ b/src/operators/unconditional_match.h @@ -20,7 +20,7 @@ #include #include "modsecurity/transaction.h" -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/validate_byte_range.cc b/src/operators/validate_byte_range.cc index 225347d4..901be2fb 100644 --- a/src/operators/validate_byte_range.cc +++ b/src/operators/validate_byte_range.cc @@ -13,11 +13,11 @@ * */ -#include "operators/validate_byte_range.h" +#include "src/operators/validate_byte_range.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/validate_byte_range.h b/src/operators/validate_byte_range.h index 05d85b85..e1baed46 100644 --- a/src/operators/validate_byte_range.h +++ b/src/operators/validate_byte_range.h @@ -20,7 +20,7 @@ #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/validate_dtd.cc b/src/operators/validate_dtd.cc index f292bef3..d5d1f1dd 100644 --- a/src/operators/validate_dtd.cc +++ b/src/operators/validate_dtd.cc @@ -13,13 +13,13 @@ * */ -#include "operators/validate_dtd.h" +#include "src/operators/validate_dtd.h" #include -#include "request_body_processor/xml.h" +#include "src/request_body_processor/xml.h" #include "src/utils/msc_system.h" -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/validate_dtd.h b/src/operators/validate_dtd.h index 453de896..1a57abd5 100644 --- a/src/operators/validate_dtd.h +++ b/src/operators/validate_dtd.h @@ -24,7 +24,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/validate_hash.cc b/src/operators/validate_hash.cc index cabba5b8..68f2b6c0 100644 --- a/src/operators/validate_hash.cc +++ b/src/operators/validate_hash.cc @@ -13,11 +13,11 @@ * */ -#include "operators/validate_hash.h" +#include "src/operators/validate_hash.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/validate_hash.h b/src/operators/validate_hash.h index ba8d5136..4b62948c 100644 --- a/src/operators/validate_hash.h +++ b/src/operators/validate_hash.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/validate_schema.cc b/src/operators/validate_schema.cc index d15da3b8..4fb4fabd 100644 --- a/src/operators/validate_schema.cc +++ b/src/operators/validate_schema.cc @@ -13,12 +13,12 @@ * */ -#include "operators/validate_schema.h" +#include "src/operators/validate_schema.h" #include -#include "operators/operator.h" -#include "request_body_processor/xml.h" +#include "src/operators/operator.h" +#include "src/request_body_processor/xml.h" #include "src/utils/msc_system.h" diff --git a/src/operators/validate_schema.h b/src/operators/validate_schema.h index ef3e3580..93b739c1 100644 --- a/src/operators/validate_schema.h +++ b/src/operators/validate_schema.h @@ -24,7 +24,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/validate_url_encoding.cc b/src/operators/validate_url_encoding.cc index 15c8ffc5..b0c2c653 100644 --- a/src/operators/validate_url_encoding.cc +++ b/src/operators/validate_url_encoding.cc @@ -13,11 +13,11 @@ * */ -#include "operators/validate_url_encoding.h" +#include "src/operators/validate_url_encoding.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/validate_url_encoding.h b/src/operators/validate_url_encoding.h index 3a1dfbeb..d0f9d324 100644 --- a/src/operators/validate_url_encoding.h +++ b/src/operators/validate_url_encoding.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/validate_utf8_encoding.cc b/src/operators/validate_utf8_encoding.cc index fdc5db94..9cb59570 100644 --- a/src/operators/validate_utf8_encoding.cc +++ b/src/operators/validate_utf8_encoding.cc @@ -13,11 +13,11 @@ * */ -#include "operators/validate_utf8_encoding.h" +#include "src/operators/validate_utf8_encoding.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/validate_utf8_encoding.h b/src/operators/validate_utf8_encoding.h index 069328a4..ceeccca4 100644 --- a/src/operators/validate_utf8_encoding.h +++ b/src/operators/validate_utf8_encoding.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #define UNICODE_ERROR_CHARACTERS_MISSING -1 diff --git a/src/operators/verify_cc.cc b/src/operators/verify_cc.cc index 36c77da6..9572ae93 100644 --- a/src/operators/verify_cc.cc +++ b/src/operators/verify_cc.cc @@ -13,14 +13,14 @@ * */ -#include "operators/verify_cc.h" +#include "src/operators/verify_cc.h" #include #include #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" #if PCRE_HAVE_JIT #define pcre_study_opt PCRE_STUDY_JIT_COMPILE diff --git a/src/operators/verify_cc.h b/src/operators/verify_cc.h index 468dd931..267e3874 100644 --- a/src/operators/verify_cc.h +++ b/src/operators/verify_cc.h @@ -19,7 +19,7 @@ #include #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/verify_cpf.cc b/src/operators/verify_cpf.cc index 37c609ea..e779f445 100644 --- a/src/operators/verify_cpf.cc +++ b/src/operators/verify_cpf.cc @@ -13,11 +13,11 @@ * */ -#include "operators/verify_cpf.h" +#include "src/operators/verify_cpf.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/verify_cpf.h b/src/operators/verify_cpf.h index bd869433..5380d59f 100644 --- a/src/operators/verify_cpf.h +++ b/src/operators/verify_cpf.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/operators/verify_ssn.cc b/src/operators/verify_ssn.cc index a562e4df..9ffec72a 100644 --- a/src/operators/verify_ssn.cc +++ b/src/operators/verify_ssn.cc @@ -13,11 +13,11 @@ * */ -#include "operators/verify_ssn.h" +#include "src/operators/verify_ssn.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" namespace modsecurity { namespace operators { diff --git a/src/operators/verify_ssn.h b/src/operators/verify_ssn.h index f0977702..a1748492 100644 --- a/src/operators/verify_ssn.h +++ b/src/operators/verify_ssn.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus diff --git a/src/operators/within.cc b/src/operators/within.cc index e564ad0d..13f1d6e2 100644 --- a/src/operators/within.cc +++ b/src/operators/within.cc @@ -13,11 +13,11 @@ * */ -#include "operators/within.h" +#include "src/operators/within.h" #include -#include "operators/operator.h" +#include "src/operators/operator.h" #include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/operators/within.h b/src/operators/within.h index 7933a9a4..39f61bf0 100644 --- a/src/operators/within.h +++ b/src/operators/within.h @@ -18,7 +18,7 @@ #include -#include "operators/operator.h" +#include "src/operators/operator.h" #ifdef __cplusplus namespace modsecurity { diff --git a/src/parser/driver.cc b/src/parser/driver.cc index 950a8f78..274b2db4 100644 --- a/src/parser/driver.cc +++ b/src/parser/driver.cc @@ -13,10 +13,10 @@ * */ -#include "parser/driver.h" +#include "src/parser/driver.h" -#include "parser/seclang-parser.hh" -#include "audit_log/audit_log.h" +#include "src/parser/seclang-parser.hh" +#include "src/audit_log/audit_log.h" #include "modsecurity/rules_properties.h" using modsecurity::audit_log::AuditLog; diff --git a/src/parser/driver.h b/src/parser/driver.h index c8226f77..04e2d6aa 100644 --- a/src/parser/driver.h +++ b/src/parser/driver.h @@ -27,9 +27,9 @@ #include "modsecurity/modsecurity.h" #include "modsecurity/rules.h" #include "modsecurity/rules_properties.h" -#include "audit_log/audit_log.h" +#include "src/audit_log/audit_log.h" -#include "parser/seclang-parser.hh" +#include "src/parser/seclang-parser.hh" using modsecurity::Rule; using modsecurity::Rules; diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index 35d18bb2..0827ffc1 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -20,62 +20,62 @@ class Driver; -#include "actions/accuracy.h" -#include "actions/action.h" -#include "actions/allow.h" -#include "actions/audit_log.h" -#include "actions/ctl/audit_log_parts.h" -#include "actions/ctl/request_body_access.h" -#include "actions/ctl/request_body_processor_json.h" -#include "actions/ctl/request_body_processor_xml.h" -#include "actions/ctl/rule_remove_by_id.h" -#include "actions/ctl/rule_remove_target_by_id.h" -#include "actions/ctl/rule_remove_target_by_tag.h" -#include "actions/init_col.h" -#include "actions/log_data.h" -#include "actions/maturity.h" -#include "actions/msg.h" -#include "actions/phase.h" -#include "actions/redirect.h" -#include "actions/rev.h" -#include "actions/set_sid.h" -#include "actions/set_uid.h" -#include "actions/set_var.h" -#include "actions/severity.h" -#include "actions/skip.h" -#include "actions/skip_after.h" -#include "actions/tag.h" -#include "actions/transformations/none.h" -#include "actions/transformations/transformation.h" -#include "actions/ver.h" -#include "actions/xmlns.h" -#include "audit_log/audit_log.h" +#include "src/actions/accuracy.h" +#include "src/actions/action.h" +#include "src/actions/allow.h" +#include "src/actions/audit_log.h" +#include "src/actions/ctl/audit_log_parts.h" +#include "src/actions/ctl/request_body_access.h" +#include "src/actions/ctl/request_body_processor_json.h" +#include "src/actions/ctl/request_body_processor_xml.h" +#include "src/actions/ctl/rule_remove_by_id.h" +#include "src/actions/ctl/rule_remove_target_by_id.h" +#include "src/actions/ctl/rule_remove_target_by_tag.h" +#include "src/actions/init_col.h" +#include "src/actions/log_data.h" +#include "src/actions/maturity.h" +#include "src/actions/msg.h" +#include "src/actions/phase.h" +#include "src/actions/redirect.h" +#include "src/actions/rev.h" +#include "src/actions/set_sid.h" +#include "src/actions/set_uid.h" +#include "src/actions/set_var.h" +#include "src/actions/severity.h" +#include "src/actions/skip.h" +#include "src/actions/skip_after.h" +#include "src/actions/tag.h" +#include "src/actions/transformations/none.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/ver.h" +#include "src/actions/xmlns.h" +#include "src/audit_log/audit_log.h" #include "modsecurity/modsecurity.h" #include "modsecurity/rules_properties.h" #include "modsecurity/rule.h" -#include "operators/operator.h" -#include "utils/geo_lookup.h" -#include "utils/msc_string.h" -#include "utils/msc_system.h" -#include "variables/xml.h" -#include "variables/duration.h" -#include "variables/env.h" -#include "variables/highest_severity.h" -#include "variables/modsec_build.h" -#include "variables/remote_user.h" -#include "variables/rule.h" -#include "variables/time.h" -#include "variables/time_day.h" -#include "variables/time_epoch.h" -#include "variables/time_hour.h" -#include "variables/time_min.h" -#include "variables/time_mon.h" -#include "variables/time_sec.h" -#include "variables/time_wday.h" -#include "variables/time_year.h" -#include "variables/tx.h" -#include "variables/variations/count.h" -#include "variables/variations/exclusion.h" +#include "src/operators/operator.h" +#include "src/utils/geo_lookup.h" +#include "src/utils/msc_string.h" +#include "src/utils/msc_system.h" +#include "src/variables/xml.h" +#include "src/variables/duration.h" +#include "src/variables/env.h" +#include "src/variables/highest_severity.h" +#include "src/variables/modsec_build.h" +#include "src/variables/remote_user.h" +#include "src/variables/rule.h" +#include "src/variables/time.h" +#include "src/variables/time_day.h" +#include "src/variables/time_epoch.h" +#include "src/variables/time_hour.h" +#include "src/variables/time_min.h" +#include "src/variables/time_mon.h" +#include "src/variables/time_sec.h" +#include "src/variables/time_wday.h" +#include "src/variables/time_year.h" +#include "src/variables/tx.h" +#include "src/variables/variations/count.h" +#include "src/variables/variations/exclusion.h" using modsecurity::ModSecurity; @@ -170,7 +170,7 @@ using modsecurity::utils::String; %define parse.error verbose %code { -#include "parser/driver.h" +#include "src/parser/driver.h" } %define api.token.prefix {TOK_} %token diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index cf8591ff..bfce46f3 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -4,10 +4,10 @@ #include #include -#include "parser/driver.h" -#include "seclang-parser.hh" -#include "utils/https_client.h" -#include "utils/msc_string.h" +#include "src/parser/driver.h" +#include "src/parser/seclang-parser.hh" +#include "src/utils/https_client.h" +#include "src/utils/msc_string.h" using modsecurity::Parser::Driver; using modsecurity::Utils::HttpsClient; diff --git a/src/request_body_processor/json.cc b/src/request_body_processor/json.cc index 3a45c55c..30f94bac 100644 --- a/src/request_body_processor/json.cc +++ b/src/request_body_processor/json.cc @@ -13,7 +13,7 @@ * */ -#include "request_body_processor/json.h" +#include "src/request_body_processor/json.h" #include #include diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc index b5dab32b..471b0101 100644 --- a/src/request_body_processor/multipart.cc +++ b/src/request_body_processor/multipart.cc @@ -13,7 +13,7 @@ * */ -#include "request_body_processor/multipart.h" +#include "src/request_body_processor/multipart.h" #include #include @@ -28,7 +28,7 @@ #include "modsecurity/collection/collections.h" #include "modsecurity/rules.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/request_body_processor/xml.cc b/src/request_body_processor/xml.cc index 31bdbb4e..586ec94c 100644 --- a/src/request_body_processor/xml.cc +++ b/src/request_body_processor/xml.cc @@ -13,7 +13,7 @@ * */ -#include "request_body_processor/xml.h" +#include "src/request_body_processor/xml.h" #include #include diff --git a/src/rule.cc b/src/rule.cc index f97eaa24..29c03965 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -24,13 +24,13 @@ #include #include -#include "operators/operator.h" -#include "actions/action.h" +#include "src/operators/operator.h" +#include "src/actions/action.h" #include "modsecurity/modsecurity.h" -#include "actions/transformations/none.h" -#include "actions/tag.h" -#include "variables/variations/exclusion.h" -#include "utils/msc_string.h" +#include "src/actions/transformations/none.h" +#include "src/actions/tag.h" +#include "src/variables/variations/exclusion.h" +#include "src/utils/msc_string.h" #include "modsecurity/rules.h" #include "modsecurity/rule_message.h" #include "src/macro_expansion.h" diff --git a/src/rules.cc b/src/rules.cc index 77542c98..83679686 100644 --- a/src/rules.cc +++ b/src/rules.cc @@ -23,8 +23,8 @@ #include "modsecurity/modsecurity.h" #include "modsecurity/transaction.h" -#include "parser/driver.h" -#include "utils/https_client.h" +#include "src/parser/driver.h" +#include "src/utils/https_client.h" using modsecurity::Parser::Driver; using modsecurity::Utils::HttpsClient; diff --git a/src/rules_exceptions.cc b/src/rules_exceptions.cc index 30137ece..356b0520 100644 --- a/src/rules_exceptions.cc +++ b/src/rules_exceptions.cc @@ -17,7 +17,7 @@ #include -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/transaction.cc b/src/transaction.cc index 370cc006..c7858719 100644 --- a/src/transaction.cc +++ b/src/transaction.cc @@ -32,19 +32,19 @@ #include #include -#include "actions/action.h" -#include "actions/deny.h" +#include "src/actions/action.h" +#include "src/actions/deny.h" #include "modsecurity/intervention.h" #include "modsecurity/modsecurity.h" -#include "request_body_processor/multipart.h" -#include "request_body_processor/xml.h" -#include "request_body_processor/json.h" -#include "audit_log/audit_log.h" +#include "src/request_body_processor/multipart.h" +#include "src/request_body_processor/xml.h" +#include "src/request_body_processor/json.h" +#include "src/audit_log/audit_log.h" #include "src/unique_id.h" -#include "utils/msc_string.h" -#include "utils/msc_system.h" -#include "utils/decode.h" -#include "utils/random.h" +#include "src/utils/msc_string.h" +#include "src/utils/msc_system.h" +#include "src/utils/decode.h" +#include "src/utils/random.h" #include "modsecurity/rule.h" #include "modsecurity/rule_message.h" #include "modsecurity/rules_properties.h" diff --git a/src/utils/acmp.cc b/src/utils/acmp.cc index 25b6c68d..830ba08a 100644 --- a/src/utils/acmp.cc +++ b/src/utils/acmp.cc @@ -14,7 +14,7 @@ /* Aho-Corasick Matching */ -#include "acmp.h" +#include "src/utils/acmp.h" #include #include diff --git a/src/utils/base64.cc b/src/utils/base64.cc index b011015f..a0ac915d 100644 --- a/src/utils/base64.cc +++ b/src/utils/base64.cc @@ -13,7 +13,7 @@ * */ -#include "utils/base64.h" +#include "src/utils/base64.h" #include diff --git a/src/utils/decode.cc b/src/utils/decode.cc index d29a4de2..42a38da3 100644 --- a/src/utils/decode.cc +++ b/src/utils/decode.cc @@ -13,9 +13,9 @@ * */ -#include "utils/decode.h" +#include "src/utils/decode.h" #include "modsecurity/modsecurity.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" namespace modsecurity { diff --git a/src/utils/geo_lookup.cc b/src/utils/geo_lookup.cc index 57212228..33bb130c 100644 --- a/src/utils/geo_lookup.cc +++ b/src/utils/geo_lookup.cc @@ -22,7 +22,7 @@ #include #include -#include "utils/geo_lookup.h" +#include "src/utils/geo_lookup.h" #ifdef WITH_GEOIP #include diff --git a/src/utils/https_client.cc b/src/utils/https_client.cc index 04ba2202..5db88a2c 100644 --- a/src/utils/https_client.cc +++ b/src/utils/https_client.cc @@ -13,7 +13,7 @@ * */ -#include "utils/https_client.h" +#include "src/utils/https_client.h" #include "src/config.h" #ifdef MSC_WITH_CURL diff --git a/src/utils/ip_tree.cc b/src/utils/ip_tree.cc index f811de55..c06c9031 100644 --- a/src/utils/ip_tree.cc +++ b/src/utils/ip_tree.cc @@ -13,7 +13,7 @@ * */ -#include "utils/ip_tree.h" +#include "src/utils/ip_tree.h" #include #include @@ -24,8 +24,8 @@ #include #include -#include "utils/geo_lookup.h" -#include "utils/https_client.h" +#include "src/utils/geo_lookup.h" +#include "src/utils/https_client.h" namespace modsecurity { namespace Utils { diff --git a/src/utils/ip_tree.h b/src/utils/ip_tree.h index 35dbf90b..d14f0f4b 100644 --- a/src/utils/ip_tree.h +++ b/src/utils/ip_tree.h @@ -22,7 +22,7 @@ #define SRC_UTILS_IP_TREE_H_ #include "modsecurity/transaction.h" -#include "utils/msc_tree.h" +#include "src/utils/msc_tree.h" namespace modsecurity { namespace Utils { diff --git a/src/utils/md5.h b/src/utils/md5.h index a958a05b..f78c4939 100644 --- a/src/utils/md5.h +++ b/src/utils/md5.h @@ -15,8 +15,8 @@ #include -#include "actions/action.h" -#include "actions/transformations/transformation.h" +#include "src/actions/action.h" +#include "src/actions/transformations/transformation.h" #ifndef SRC_UTILS_MD5_H_ #define SRC_UTILS_MD5_H_ diff --git a/src/utils/msc_string.cc b/src/utils/msc_string.cc index 922cdcbf..6e86b0cc 100644 --- a/src/utils/msc_string.cc +++ b/src/utils/msc_string.cc @@ -39,7 +39,7 @@ #include "modsecurity/modsecurity.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" namespace modsecurity { diff --git a/src/utils/msc_tree.cc b/src/utils/msc_tree.cc index ec03396c..17442a37 100644 --- a/src/utils/msc_tree.cc +++ b/src/utils/msc_tree.cc @@ -19,7 +19,7 @@ #include #include -#include "msc_tree.h" +#include "src/utils/msc_tree.h" extern "C" { diff --git a/src/utils/regex.cc b/src/utils/regex.cc index 2886338e..ff7c70dc 100644 --- a/src/utils/regex.cc +++ b/src/utils/regex.cc @@ -13,7 +13,7 @@ * */ -#include "utils/regex.h" +#include "src/utils/regex.h" #include #include @@ -25,7 +25,7 @@ #include #include -#include "utils/geo_lookup.h" +#include "src/utils/geo_lookup.h" #if PCRE_HAVE_JIT #define pcre_study_opt PCRE_STUDY_JIT_COMPILE diff --git a/src/variables/duration.cc b/src/variables/duration.cc index c87fbeae..eefdacfc 100644 --- a/src/variables/duration.cc +++ b/src/variables/duration.cc @@ -13,7 +13,7 @@ * */ -#include "variables/duration.h" +#include "src/variables/duration.h" #include #include diff --git a/src/variables/duration.h b/src/variables/duration.h index ec8d3200..59b2468d 100644 --- a/src/variables/duration.h +++ b/src/variables/duration.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_DURATION_H_ #define SRC_VARIABLES_DURATION_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/env.cc b/src/variables/env.cc index 8d24e7de..7d92466a 100644 --- a/src/variables/env.cc +++ b/src/variables/env.cc @@ -13,7 +13,7 @@ * */ -#include "variables/env.h" +#include "src/variables/env.h" #include #include diff --git a/src/variables/env.h b/src/variables/env.h index 0f1f5692..11e9fe69 100644 --- a/src/variables/env.h +++ b/src/variables/env.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_ENV_H_ #define SRC_VARIABLES_ENV_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/highest_severity.cc b/src/variables/highest_severity.cc index 20b8cc6c..362b3405 100644 --- a/src/variables/highest_severity.cc +++ b/src/variables/highest_severity.cc @@ -13,7 +13,7 @@ * */ -#include "variables/highest_severity.h" +#include "src/variables/highest_severity.h" #include #include diff --git a/src/variables/highest_severity.h b/src/variables/highest_severity.h index bab90313..bec51989 100644 --- a/src/variables/highest_severity.h +++ b/src/variables/highest_severity.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_HIGHEST_SEVERITY_H_ #define SRC_VARIABLES_HIGHEST_SEVERITY_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/modsec_build.cc b/src/variables/modsec_build.cc index cc3f8ad4..63fde669 100644 --- a/src/variables/modsec_build.cc +++ b/src/variables/modsec_build.cc @@ -13,7 +13,7 @@ * */ -#include "variables/modsec_build.h" +#include "src/variables/modsec_build.h" #include #include diff --git a/src/variables/modsec_build.h b/src/variables/modsec_build.h index 168b876e..8ad1afa5 100644 --- a/src/variables/modsec_build.h +++ b/src/variables/modsec_build.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_MODSEC_BUILD_H_ #define SRC_VARIABLES_MODSEC_BUILD_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/remote_user.cc b/src/variables/remote_user.cc index 8464ef14..97bd2fc3 100644 --- a/src/variables/remote_user.cc +++ b/src/variables/remote_user.cc @@ -13,7 +13,7 @@ * */ -#include "variables/remote_user.h" +#include "src/variables/remote_user.h" #include #include @@ -29,7 +29,7 @@ #include #include "modsecurity/transaction.h" -#include "utils/base64.h" +#include "src/utils/base64.h" namespace modsecurity { namespace Variables { diff --git a/src/variables/remote_user.h b/src/variables/remote_user.h index 8f6c78c3..3e179e25 100644 --- a/src/variables/remote_user.h +++ b/src/variables/remote_user.h @@ -22,7 +22,7 @@ #ifndef SRC_VARIABLES_REMOTE_USER_H_ #define SRC_VARIABLES_REMOTE_USER_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/rule.cc b/src/variables/rule.cc index 0056aa12..5e45ca44 100644 --- a/src/variables/rule.cc +++ b/src/variables/rule.cc @@ -13,7 +13,7 @@ * */ -#include "variables/rule.h" +#include "src/variables/rule.h" #include #include @@ -44,7 +44,7 @@ #include "src/actions/xmlns.h" #include "src/actions/log_data.h" #include "src/actions/msg.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/variables/rule.h b/src/variables/rule.h index f39d6b7c..cf43a082 100644 --- a/src/variables/rule.h +++ b/src/variables/rule.h @@ -20,7 +20,7 @@ #ifndef SRC_VARIABLES_RULE_H_ #define SRC_VARIABLES_RULE_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time.cc b/src/variables/time.cc index 06717a40..9fdba0a6 100644 --- a/src/variables/time.cc +++ b/src/variables/time.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time.h" +#include "src/variables/time.h" #include #include diff --git a/src/variables/time.h b/src/variables/time.h index ad14e7e5..57418e08 100644 --- a/src/variables/time.h +++ b/src/variables/time.h @@ -22,7 +22,7 @@ #ifndef SRC_VARIABLES_TIME_H_ #define SRC_VARIABLES_TIME_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_day.cc b/src/variables/time_day.cc index 3e897bbb..faa0ed94 100644 --- a/src/variables/time_day.cc +++ b/src/variables/time_day.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_day.h" +#include "src/variables/time_day.h" #include #include diff --git a/src/variables/time_day.h b/src/variables/time_day.h index 5334d52b..599acbb5 100644 --- a/src/variables/time_day.h +++ b/src/variables/time_day.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_DAY_H_ #define SRC_VARIABLES_TIME_DAY_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_epoch.cc b/src/variables/time_epoch.cc index 1f9c57a7..752b339d 100644 --- a/src/variables/time_epoch.cc +++ b/src/variables/time_epoch.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_epoch.h" +#include "src/variables/time_epoch.h" #include #include diff --git a/src/variables/time_epoch.h b/src/variables/time_epoch.h index 81f44c4e..a99f30c4 100644 --- a/src/variables/time_epoch.h +++ b/src/variables/time_epoch.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_EPOCH_H_ #define SRC_VARIABLES_TIME_EPOCH_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_hour.cc b/src/variables/time_hour.cc index fc871f5f..c1d9467f 100644 --- a/src/variables/time_hour.cc +++ b/src/variables/time_hour.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_hour.h" +#include "src/variables/time_hour.h" #include #include diff --git a/src/variables/time_hour.h b/src/variables/time_hour.h index 01ce7d2e..d9e02fe7 100644 --- a/src/variables/time_hour.h +++ b/src/variables/time_hour.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_HOUR_H_ #define SRC_VARIABLES_TIME_HOUR_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_min.cc b/src/variables/time_min.cc index ccbdd68d..921e232e 100644 --- a/src/variables/time_min.cc +++ b/src/variables/time_min.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_min.h" +#include "src/variables/time_min.h" #include #include diff --git a/src/variables/time_min.h b/src/variables/time_min.h index 7a5d163a..fd9a1881 100644 --- a/src/variables/time_min.h +++ b/src/variables/time_min.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_MIN_H_ #define SRC_VARIABLES_TIME_MIN_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_mon.cc b/src/variables/time_mon.cc index 1c970590..79f177a0 100644 --- a/src/variables/time_mon.cc +++ b/src/variables/time_mon.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_mon.h" +#include "src/variables/time_mon.h" #include #include diff --git a/src/variables/time_mon.h b/src/variables/time_mon.h index fc1e5c6d..673c377b 100644 --- a/src/variables/time_mon.h +++ b/src/variables/time_mon.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_MON_H_ #define SRC_VARIABLES_TIME_MON_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_sec.cc b/src/variables/time_sec.cc index 3014d3d7..87658427 100644 --- a/src/variables/time_sec.cc +++ b/src/variables/time_sec.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_sec.h" +#include "src/variables/time_sec.h" #include #include diff --git a/src/variables/time_sec.h b/src/variables/time_sec.h index 6ae39b26..0cd1da7f 100644 --- a/src/variables/time_sec.h +++ b/src/variables/time_sec.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_SEC_H_ #define SRC_VARIABLES_TIME_SEC_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_wday.cc b/src/variables/time_wday.cc index 770a1f18..52f95389 100644 --- a/src/variables/time_wday.cc +++ b/src/variables/time_wday.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_wday.h" +#include "src/variables/time_wday.h" #include #include diff --git a/src/variables/time_wday.h b/src/variables/time_wday.h index 3495e8b4..2bd63892 100644 --- a/src/variables/time_wday.h +++ b/src/variables/time_wday.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_WDAY_H_ #define SRC_VARIABLES_TIME_WDAY_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/time_year.cc b/src/variables/time_year.cc index 8a04799d..2f789f39 100644 --- a/src/variables/time_year.cc +++ b/src/variables/time_year.cc @@ -13,7 +13,7 @@ * */ -#include "variables/time_year.h" +#include "src/variables/time_year.h" #include #include diff --git a/src/variables/time_year.h b/src/variables/time_year.h index c29fcaba..7db5c7c6 100644 --- a/src/variables/time_year.h +++ b/src/variables/time_year.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_TIME_YEAR_H_ #define SRC_VARIABLES_TIME_YEAR_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/tx.cc b/src/variables/tx.cc index fcda7ff6..1ae263f6 100644 --- a/src/variables/tx.cc +++ b/src/variables/tx.cc @@ -13,7 +13,7 @@ * */ -#include "variables/tx.h" +#include "src/variables/tx.h" #include #include diff --git a/src/variables/tx.h b/src/variables/tx.h index 2c4be4f8..15c83a64 100644 --- a/src/variables/tx.h +++ b/src/variables/tx.h @@ -22,7 +22,7 @@ #ifndef SRC_VARIABLES_TX_H_ #define SRC_VARIABLES_TX_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/variable.cc b/src/variables/variable.cc index 0b2b2a73..d2a3f873 100644 --- a/src/variables/variable.cc +++ b/src/variables/variable.cc @@ -13,7 +13,7 @@ * */ -#include "variables/variable.h" +#include "src/variables/variable.h" #include #include @@ -21,8 +21,8 @@ #include #include "modsecurity/transaction.h" -#include "variations/exclusion.h" -#include "utils/msc_string.h" +#include "src/variables/variations/exclusion.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/src/variables/variations/count.cc b/src/variables/variations/count.cc index 0fab18eb..a755b0fa 100644 --- a/src/variables/variations/count.cc +++ b/src/variables/variations/count.cc @@ -13,7 +13,7 @@ * */ -#include "variables/variations/count.h" +#include "src/variables/variations/count.h" #include #include diff --git a/src/variables/variations/count.h b/src/variables/variations/count.h index 8083979d..34eb9a5d 100644 --- a/src/variables/variations/count.h +++ b/src/variables/variations/count.h @@ -21,7 +21,7 @@ #ifndef SRC_VARIABLES_VARIATIONS_COUNT_H_ #define SRC_VARIABLES_VARIATIONS_COUNT_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/variations/exclusion.cc b/src/variables/variations/exclusion.cc index bb024e29..52525f4d 100644 --- a/src/variables/variations/exclusion.cc +++ b/src/variables/variations/exclusion.cc @@ -13,7 +13,7 @@ * */ -#include "variables/variations/exclusion.h" +#include "src/variables/variations/exclusion.h" #include #include diff --git a/src/variables/variations/exclusion.h b/src/variables/variations/exclusion.h index 71d16d31..fc3d0bc8 100644 --- a/src/variables/variations/exclusion.h +++ b/src/variables/variations/exclusion.h @@ -22,7 +22,7 @@ #ifndef SRC_VARIABLES_VARIATIONS_EXCLUSION_H_ #define SRC_VARIABLES_VARIATIONS_EXCLUSION_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" namespace modsecurity { diff --git a/src/variables/xml.cc b/src/variables/xml.cc index 876595c2..cc0f2229 100644 --- a/src/variables/xml.cc +++ b/src/variables/xml.cc @@ -13,7 +13,7 @@ * */ -#include "variables/xml.h" +#include "src/variables/xml.h" #include #include diff --git a/src/variables/xml.h b/src/variables/xml.h index 865477d1..a8b81f14 100644 --- a/src/variables/xml.h +++ b/src/variables/xml.h @@ -22,7 +22,7 @@ #ifndef SRC_VARIABLES_XML_H_ #define SRC_VARIABLES_XML_H_ -#include "variables/variable.h" +#include "src/variables/variable.h" #include "src/variables/xml.h" namespace modsecurity { diff --git a/test/common/modsecurity_test.cc b/test/common/modsecurity_test.cc index 9e2f7bf7..f8b56b27 100644 --- a/test/common/modsecurity_test.cc +++ b/test/common/modsecurity_test.cc @@ -13,7 +13,7 @@ * */ -#include "common/modsecurity_test.h" +#include "test/common/modsecurity_test.h" #ifdef WITH_YAJL #include diff --git a/test/fuzzer/afl_fuzzer.cc b/test/fuzzer/afl_fuzzer.cc index d41a78ef..5aea771e 100644 --- a/test/fuzzer/afl_fuzzer.cc +++ b/test/fuzzer/afl_fuzzer.cc @@ -17,91 +17,91 @@ #include #include "modsecurity/modsecurity.h" -#include "actions/transformations/transformation.h" +#include "src/actions/transformations/transformation.h" /** * for i in $(ls -l *h | awk {'print $9'}); do echo "#include \"actions/transformations/$i\""; done; * */ -#include "actions/transformations/base64_decode_ext.h" -#include "actions/transformations/base64_decode.h" -#include "actions/transformations/cmd_line.h" -#include "actions/transformations/compress_whitespace.h" -#include "actions/transformations/css_decode.h" -#include "actions/transformations/escape_seq_decode.h" -#include "actions/transformations/hex_decode.h" -#include "actions/transformations/hex_encode.h" -#include "actions/transformations/html_entity_decode.h" -#include "actions/transformations/js_decode.h" -#include "actions/transformations/length.h" -#include "actions/transformations/lower_case.h" -#include "actions/transformations/md5.h" -#include "actions/transformations/none.h" -#include "actions/transformations/normalise_path.h" -#include "actions/transformations/normalise_path_win.h" -#include "actions/transformations/parity_even_7bit.h" -#include "actions/transformations/parity_odd_7bit.h" -#include "actions/transformations/parity_zero_7bit.h" -#include "actions/transformations/remove_comments_char.h" -#include "actions/transformations/remove_comments.h" -#include "actions/transformations/remove_nulls.h" -#include "actions/transformations/remove_whitespace.h" -#include "actions/transformations/replace_comments.h" -#include "actions/transformations/replace_nulls.h" -#include "actions/transformations/sha1.h" -#include "actions/transformations/sql_hex_decode.h" -#include "actions/transformations/transformation.h" -#include "actions/transformations/trim.h" -#include "actions/transformations/trim_left.h" -#include "actions/transformations/trim_right.h" -#include "actions/transformations/url_decode.h" -#include "actions/transformations/url_decode_uni.h" -#include "actions/transformations/url_encode.h" -#include "actions/transformations/utf8_to_unicode.h" +#include "src/actions/transformations/base64_decode_ext.h" +#include "src/actions/transformations/base64_decode.h" +#include "src/actions/transformations/cmd_line.h" +#include "src/actions/transformations/compress_whitespace.h" +#include "src/actions/transformations/css_decode.h" +#include "src/actions/transformations/escape_seq_decode.h" +#include "src/actions/transformations/hex_decode.h" +#include "src/actions/transformations/hex_encode.h" +#include "src/actions/transformations/html_entity_decode.h" +#include "src/actions/transformations/js_decode.h" +#include "src/actions/transformations/length.h" +#include "src/actions/transformations/lower_case.h" +#include "src/actions/transformations/md5.h" +#include "src/actions/transformations/none.h" +#include "src/actions/transformations/normalise_path.h" +#include "src/actions/transformations/normalise_path_win.h" +#include "src/actions/transformations/parity_even_7bit.h" +#include "src/actions/transformations/parity_odd_7bit.h" +#include "src/actions/transformations/parity_zero_7bit.h" +#include "src/actions/transformations/remove_comments_char.h" +#include "src/actions/transformations/remove_comments.h" +#include "src/actions/transformations/remove_nulls.h" +#include "src/actions/transformations/remove_whitespace.h" +#include "src/actions/transformations/replace_comments.h" +#include "src/actions/transformations/replace_nulls.h" +#include "src/actions/transformations/sha1.h" +#include "src/actions/transformations/sql_hex_decode.h" +#include "src/actions/transformations/transformation.h" +#include "src/actions/transformations/trim.h" +#include "src/actions/transformations/trim_left.h" +#include "src/actions/transformations/trim_right.h" +#include "src/actions/transformations/url_decode.h" +#include "src/actions/transformations/url_decode_uni.h" +#include "src/actions/transformations/url_encode.h" +#include "src/actions/transformations/utf8_to_unicode.h" /** * for i in $(ls -l *h | awk {'print $9'}); do echo "#include \"operators/$i\""; done; * */ -#include "operators/begins_with.h" -#include "operators/contains.h" -#include "operators/contains_word.h" -#include "operators/detect_sqli.h" -#include "operators/detect_xss.h" -#include "operators/ends_with.h" -#include "operators/eq.h" -#include "operators/fuzzy_hash.h" -#include "operators/ge.h" -#include "operators/geo_lookup.h" -#include "operators/gsblookup.h" -#include "operators/gt.h" -#include "operators/inspect_file.h" -#include "operators/ip_match_f.h" -#include "operators/ip_match_from_file.h" -#include "operators/ip_match.h" -#include "operators/le.h" -#include "operators/lt.h" -#include "operators/no_match.h" -#include "operators/operator.h" -#include "operators/pm_f.h" -#include "operators/pm_from_file.h" -#include "operators/pm.h" -#include "operators/rbl.h" -#include "operators/rsub.h" -#include "operators/rx.h" -#include "operators/str_eq.h" -#include "operators/str_match.h" -#include "operators/validate_byte_range.h" -#include "operators/validate_dtd.h" -#include "operators/validate_hash.h" -#include "operators/validate_schema.h" -#include "operators/validate_url_encoding.h" -#include "operators/validate_utf8_encoding.h" -#include "operators/verify_cc.h" -#include "operators/verify_cpf.h" -#include "operators/verify_ssn.h" -#include "operators/within.h" +#include "src/operators/begins_with.h" +#include "src/operators/contains.h" +#include "src/operators/contains_word.h" +#include "src/operators/detect_sqli.h" +#include "src/operators/detect_xss.h" +#include "src/operators/ends_with.h" +#include "src/operators/eq.h" +#include "src/operators/fuzzy_hash.h" +#include "src/operators/ge.h" +#include "src/operators/geo_lookup.h" +#include "src/operators/gsblookup.h" +#include "src/operators/gt.h" +#include "src/operators/inspect_file.h" +#include "src/operators/ip_match_f.h" +#include "src/operators/ip_match_from_file.h" +#include "src/operators/ip_match.h" +#include "src/operators/le.h" +#include "src/operators/lt.h" +#include "src/operators/no_match.h" +#include "src/operators/operator.h" +#include "src/operators/pm_f.h" +#include "src/operators/pm_from_file.h" +#include "src/operators/pm.h" +#include "src/operators/rbl.h" +#include "src/operators/rsub.h" +#include "src/operators/rx.h" +#include "src/operators/str_eq.h" +#include "src/operators/str_match.h" +#include "src/operators/validate_byte_range.h" +#include "src/operators/validate_dtd.h" +#include "src/operators/validate_hash.h" +#include "src/operators/validate_schema.h" +#include "src/operators/validate_url_encoding.h" +#include "src/operators/validate_utf8_encoding.h" +#include "src/operators/verify_cc.h" +#include "src/operators/verify_cpf.h" +#include "src/operators/verify_ssn.h" +#include "src/operators/within.h" using namespace modsecurity::actions::transformations; diff --git a/test/optimization/optimization.cc b/test/optimization/optimization.cc index 7f1b8568..9b88df3f 100644 --- a/test/optimization/optimization.cc +++ b/test/optimization/optimization.cc @@ -23,8 +23,8 @@ #include "modsecurity/modsecurity.h" #include "modsecurity/rules.h" #include "src/utils/msc_system.h" -#include "parser/driver.h" -#include "utils/https_client.h" +#include "src/parser/driver.h" +#include "src/utils/https_client.h" #include "modsecurity/rules_properties.h" #include "modsecurity/transaction.h" diff --git a/test/regression/custom_debug_log.cc b/test/regression/custom_debug_log.cc index f34607b7..dd14ea86 100644 --- a/test/regression/custom_debug_log.cc +++ b/test/regression/custom_debug_log.cc @@ -13,13 +13,13 @@ * */ -#include "regression/custom_debug_log.h" +#include "test/regression/custom_debug_log.h" #include #include #include "modsecurity/debug_log.h" -#include "utils/regex.h" +#include "src/utils/regex.h" namespace modsecurity_test { diff --git a/test/regression/regression.cc b/test/regression/regression.cc index fb1374a7..40251881 100644 --- a/test/regression/regression.cc +++ b/test/regression/regression.cc @@ -24,12 +24,12 @@ #include "modsecurity/modsecurity.h" #include "modsecurity/rules.h" -#include "common/modsecurity_test.h" -#include "common/colors.h" -#include "regression/regression_test.h" -#include "common/modsecurity_test_results.h" -#include "regression/custom_debug_log.h" -#include "utils/regex.h" +#include "test/common/modsecurity_test.h" +#include "test/common/colors.h" +#include "test/regression/regression_test.h" +#include "test/common/modsecurity_test_results.h" +#include "test/regression/custom_debug_log.h" +#include "src/utils/regex.h" using modsecurity_test::CustomDebugLog; using modsecurity_test::ModSecurityTest; diff --git a/test/regression/regression_test.cc b/test/regression/regression_test.cc index 9da08dfa..ab3ce633 100644 --- a/test/regression/regression_test.cc +++ b/test/regression/regression_test.cc @@ -13,7 +13,7 @@ * */ -#include "regression/regression_test.h" +#include "test/regression/regression_test.h" #include diff --git a/test/unit/unit.cc b/test/unit/unit.cc index 4fa0ad03..28d7795c 100644 --- a/test/unit/unit.cc +++ b/test/unit/unit.cc @@ -21,14 +21,14 @@ #include "modsecurity/modsecurity.h" #include "modsecurity/rules.h" -#include "operators/operator.h" -#include "actions/transformations/transformation.h" +#include "src/operators/operator.h" +#include "src/actions/transformations/transformation.h" -#include "common/modsecurity_test.h" -#include "common/modsecurity_test_results.h" -#include "common/colors.h" -#include "unit/unit_test.h" -#include "utils/msc_string.h" +#include "test/common/modsecurity_test.h" +#include "test/common/modsecurity_test_results.h" +#include "test/common/colors.h" +#include "test/unit/unit_test.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String; diff --git a/test/unit/unit_test.cc b/test/unit/unit_test.cc index b56057c3..ab04da41 100644 --- a/test/unit/unit_test.cc +++ b/test/unit/unit_test.cc @@ -13,7 +13,7 @@ * */ -#include "unit/unit_test.h" +#include "test/unit/unit_test.h" #include @@ -22,9 +22,9 @@ #include #include -#include "common/colors.h" +#include "test/common/colors.h" #include "src/utils/regex.h" -#include "utils/msc_string.h" +#include "src/utils/msc_string.h" using modsecurity::utils::String;