Adds refCounter to actions

2025-09-30 11:44:32 +03:00 · 2016-11-08 18:14:34 -03:00
parent ad05c74c3f
commit 3ee7b24928
102 changed files with 126 additions and 105 deletions
--- a/src/actions/accuracy.cc
+++ b/src/actions/accuracy.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
--- a/src/actions/accuracy.h
+++ b/src/actions/accuracy.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_ACCURACY_H_
 #define SRC_ACTIONS_ACCURACY_H_
--- a/src/actions/action.cc
+++ b/src/actions/action.cc
@@ -13,7 +13,7 @@
 *
 */

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #include <iostream>
 #include <string>
--- a/src/actions/action.h
+++ b/src/actions/action.h
@@ -1,135 +0,0 @@
-/*
- * ModSecurity, http://www.modsecurity.org/
- * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
- *
- * You may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * If any of the files related to licensing are missing or if you have any
- * other questions related to licensing please contact Trustwave Holdings, Inc.
- * directly using the email address security@modsecurity.org.
- *
- */
-
-#include <string>
-#include <iostream>
-
-#include "modsecurity/intervention.h"
-#include "modsecurity/rule.h"
-
-#ifndef SRC_ACTIONS_ACTION_H_
-#define SRC_ACTIONS_ACTION_H_
-
-#ifdef __cplusplus
-
-namespace modsecurity {
-class Transaction;
-class Rule;
-
-namespace actions {
-
-
-class Action {
- public:
-    explicit Action(const std::string& _action)
-        : action_kind(2),
-        m_isNone(false),
-        m_name(""),
-        m_parser_payload(""),
-        temporaryAction(false) {
-            set_name_and_payload(_action);
-        }
-    explicit Action(const std::string& _action, int kind)
-        : action_kind(kind),
-        m_isNone(false),
-        m_name(""),
-        m_parser_payload(""),
-        temporaryAction(false) {
-            set_name_and_payload(_action);
-        }
-
-    virtual ~Action() { }
-
-    virtual std::string evaluate(std::string exp,
-        Transaction *transaction);
-    virtual bool evaluate(Rule *rule, Transaction *transaction);
-    virtual bool evaluate(Rule *rule, Transaction *transaction,
-        RuleMessage *ruleMessage) {
-        return evaluate(rule, transaction);
-    }
-    virtual bool init(std::string *error) { return true; }
-    virtual bool isDisruptive() { return false; }
-    virtual void fillIntervention(ModSecurityIntervention *intervention);
-    static Action *instantiate(const std::string& name);
-
-
-    void set_name_and_payload(const std::string& data) {
-        size_t pos = data.find(":");
-        std::string t = "t:";
-
-        if (data.compare(0, t.length(), t) == 0) {
-            pos = data.find(":", 2);
-        }
-
-        if (pos == std::string::npos) {
-            m_name = data;
-            return;
-        }
-
-        m_name = std::string(data, 0, pos);
-        m_parser_payload = std::string(data, pos + 1, data.length());
-
-        if (m_parser_payload.at(0) == '\'' && m_parser_payload.size() > 2) {
-            m_parser_payload.erase(0, 1);
-            m_parser_payload.pop_back();
-        }
-    }
-
-    bool m_isNone;
-    bool temporaryAction;
-    int action_kind;
-    std::string m_name;
-    std::string m_parser_payload;
-
-    /**
-     *
-     * Define the action kind regarding to the execution time.
-     * 
-     * 
-     */
-    enum Kind {
-    /**
-     *
-     * Action that are executed while loading the configuration. For instance
-     * the rule ID or the rule phase.
-     *
-     */
-     ConfigurationKind,
-    /**
-     *
-     * Those are actions that demands to be executed before call the operator.
-     * For instance the tranformations.
-     *
-     *
-     */
-     RunTimeBeforeMatchAttemptKind,
-    /**
-     *
-     * Actions that are executed after the execution of the operator, only if
-     * the operator returned Match (or True). For instance the disruptive
-     * actions.
-     *
-     */
-     RunTimeOnlyIfMatchKind,
-    };
-};
-
-
-}  // namespace actions
-}  // namespace modsecurity
-
-#endif
-
-#endif  // SRC_ACTIONS_ACTION_H_
--- a/src/actions/allow.h
+++ b/src/actions/allow.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_ALLOW_H_
 #define SRC_ACTIONS_ALLOW_H_
--- a/src/actions/audit_log.h
+++ b/src/actions/audit_log.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_AUDIT_LOG_H_
 #define SRC_ACTIONS_AUDIT_LOG_H_
--- a/src/actions/block.h
+++ b/src/actions/block.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_BLOCK_H_
 #define SRC_ACTIONS_BLOCK_H_
--- a/src/actions/capture.h
+++ b/src/actions/capture.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_CAPTURE_H_
 #define SRC_ACTIONS_CAPTURE_H_
--- a/src/actions/chain.h
+++ b/src/actions/chain.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_CHAIN_H_
 #define SRC_ACTIONS_CHAIN_H_
--- a/src/actions/ctl/audit_log_parts.h
+++ b/src/actions/ctl/audit_log_parts.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

 #ifndef SRC_ACTIONS_CTL_AUDIT_LOG_PARTS_H_
--- a/src/actions/ctl/request_body_access.h
+++ b/src/actions/ctl/request_body_access.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"


--- a/src/actions/ctl/request_body_processor_json.h
+++ b/src/actions/ctl/request_body_processor_json.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

 #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_JSON_H_
--- a/src/actions/ctl/request_body_processor_xml.h
+++ b/src/actions/ctl/request_body_processor_xml.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

 #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_XML_H_
--- a/src/actions/ctl/rule_remove_by_id.h
+++ b/src/actions/ctl/rule_remove_by_id.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"


--- 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 <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"


--- 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 <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"


--- a/src/actions/deny.h
+++ b/src/actions/deny.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

 #ifndef SRC_ACTIONS_DENY_H_
--- a/src/actions/init_col.cc
+++ b/src/actions/init_col.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
--- a/src/actions/init_col.h
+++ b/src/actions/init_col.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_INIT_COL_H_
 #define SRC_ACTIONS_INIT_COL_H_
--- a/src/actions/log.cc
+++ b/src/actions/log.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "src/operators/operator.h"
 #include "modsecurity/rule_message.h"
--- a/src/actions/log.h
+++ b/src/actions/log.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_LOG_H_
 #define SRC_ACTIONS_LOG_H_
--- a/src/actions/log_data.cc
+++ b/src/actions/log_data.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "src/macro_expansion.h"
 #include "modsecurity/rule.h"
--- a/src/actions/log_data.h
+++ b/src/actions/log_data.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_LOG_DATA_H_
 #define SRC_ACTIONS_LOG_DATA_H_
--- a/src/actions/maturity.cc
+++ b/src/actions/maturity.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
--- a/src/actions/maturity.h
+++ b/src/actions/maturity.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_MATURITY_H_
 #define SRC_ACTIONS_MATURITY_H_
--- a/src/actions/msg.cc
+++ b/src/actions/msg.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "src/macro_expansion.h"
 #include "modsecurity/rule.h"
--- a/src/actions/msg.h
+++ b/src/actions/msg.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_MSG_H_
 #define SRC_ACTIONS_MSG_H_
--- a/src/actions/no_audit_log.h
+++ b/src/actions/no_audit_log.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_NO_AUDIT_LOG_H_
 #define SRC_ACTIONS_NO_AUDIT_LOG_H_
--- a/src/actions/no_log.cc
+++ b/src/actions/no_log.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "src/operators/operator.h"
 #include "modsecurity/rule_message.h"
--- a/src/actions/no_log.h
+++ b/src/actions/no_log.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_NO_LOG_H_
 #define SRC_ACTIONS_NO_LOG_H_
--- a/src/actions/pass.h
+++ b/src/actions/pass.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

 #ifndef SRC_ACTIONS_PASS_H_
--- a/src/actions/phase.h
+++ b/src/actions/phase.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_PHASE_H_
 #define SRC_ACTIONS_PHASE_H_
--- a/src/actions/redirect.h
+++ b/src/actions/redirect.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_REDIRECT_H_
 #define SRC_ACTIONS_REDIRECT_H_
--- a/src/actions/rev.cc
+++ b/src/actions/rev.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
--- a/src/actions/rev.h
+++ b/src/actions/rev.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_REV_H_
 #define SRC_ACTIONS_REV_H_
--- a/src/actions/rule_id.h
+++ b/src/actions/rule_id.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_RULE_ID_H_
 #define SRC_ACTIONS_RULE_ID_H_
--- a/src/actions/set_sid.h
+++ b/src/actions/set_sid.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_SET_SID_H_
 #define SRC_ACTIONS_SET_SID_H_
--- a/src/actions/set_uid.h
+++ b/src/actions/set_uid.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_SET_UID_H_
 #define SRC_ACTIONS_SET_UID_H_
--- a/src/actions/set_var.h
+++ b/src/actions/set_var.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_SET_VAR_H_
 #define SRC_ACTIONS_SET_VAR_H_
--- a/src/actions/severity.cc
+++ b/src/actions/severity.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/utils/string.h"
--- a/src/actions/severity.h
+++ b/src/actions/severity.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_SEVERITY_H_
 #define SRC_ACTIONS_SEVERITY_H_
--- a/src/actions/skip.cc
+++ b/src/actions/skip.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"


--- a/src/actions/skip.h
+++ b/src/actions/skip.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_SKIP_H_
 #define SRC_ACTIONS_SKIP_H_
--- a/src/actions/skip_after.cc
+++ b/src/actions/skip_after.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"


--- a/src/actions/skip_after.h
+++ b/src/actions/skip_after.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_SKIP_AFTER_H_
 #define SRC_ACTIONS_SKIP_AFTER_H_
--- a/src/actions/status.h
+++ b/src/actions/status.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_STATUS_H_
 #define SRC_ACTIONS_STATUS_H_
--- a/src/actions/tag.cc
+++ b/src/actions/tag.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "src/macro_expansion.h"
 #include "modsecurity/rule.h"
--- a/src/actions/tag.h
+++ b/src/actions/tag.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_TAG_H_
 #define SRC_ACTIONS_TAG_H_
--- a/src/actions/transformations/base64_decode.h
+++ b/src/actions/transformations/base64_decode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_H_
--- a/src/actions/transformations/base64_decode_ext.h
+++ b/src/actions/transformations/base64_decode_ext.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_DECODE_EXT_H_
--- a/src/actions/transformations/base64_encode.h
+++ b/src/actions/transformations/base64_encode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_BASE64_ENCODE_H_
--- a/src/actions/transformations/cmd_line.h
+++ b/src/actions/transformations/cmd_line.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_CMD_LINE_H_
--- a/src/actions/transformations/compress_whitespace.h
+++ b/src/actions/transformations/compress_whitespace.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_COMPRESS_WHITESPACE_H_
--- a/src/actions/transformations/css_decode.h
+++ b/src/actions/transformations/css_decode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_CSS_DECODE_H_
--- a/src/actions/transformations/escape_seq_decode.h
+++ b/src/actions/transformations/escape_seq_decode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_ESCAPE_SEQ_DECODE_H_
--- a/src/actions/transformations/hex_decode.h
+++ b/src/actions/transformations/hex_decode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_DECODE_H_
--- a/src/actions/transformations/hex_encode.h
+++ b/src/actions/transformations/hex_encode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_HEX_ENCODE_H_
--- a/src/actions/transformations/html_entity_decode.h
+++ b/src/actions/transformations/html_entity_decode.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <unordered_map>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"
 #include "src/utils/string.h"

--- a/src/actions/transformations/js_decode.h
+++ b/src/actions/transformations/js_decode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_JS_DECODE_H_
--- a/src/actions/transformations/length.h
+++ b/src/actions/transformations/length.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_LENGTH_H_
--- a/src/actions/transformations/lower_case.cc
+++ b/src/actions/transformations/lower_case.cc
@@ -20,7 +20,7 @@

 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 namespace modsecurity {
 namespace actions {
--- a/src/actions/transformations/lower_case.h
+++ b/src/actions/transformations/lower_case.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <unordered_map>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_LOWER_CASE_H_
--- a/src/actions/transformations/md5.h
+++ b/src/actions/transformations/md5.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_MD5_H_
--- a/src/actions/transformations/none.h
+++ b/src/actions/transformations/none.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_NONE_H_
--- a/src/actions/transformations/normalise_path.h
+++ b/src/actions/transformations/normalise_path.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_H_
--- a/src/actions/transformations/normalise_path_win.h
+++ b/src/actions/transformations/normalise_path_win.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_NORMALISE_PATH_WIN_H_
--- a/src/actions/transformations/parity_even_7bit.h
+++ b/src/actions/transformations/parity_even_7bit.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_EVEN_7BIT_H_
--- a/src/actions/transformations/parity_odd_7bit.h
+++ b/src/actions/transformations/parity_odd_7bit.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ODD_7BIT_H_
--- a/src/actions/transformations/parity_zero_7bit.h
+++ b/src/actions/transformations/parity_zero_7bit.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_PARITY_ZERO_7BIT_H_
--- a/src/actions/transformations/remove_comments.h
+++ b/src/actions/transformations/remove_comments.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_H_
--- a/src/actions/transformations/remove_comments_char.h
+++ b/src/actions/transformations/remove_comments_char.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_COMMENTS_CHAR_H_
--- a/src/actions/transformations/remove_nulls.h
+++ b/src/actions/transformations/remove_nulls.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_NULLS_H_
--- a/src/actions/transformations/remove_whitespace.h
+++ b/src/actions/transformations/remove_whitespace.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REMOVE_WHITESPACE_H_
--- a/src/actions/transformations/replace_comments.h
+++ b/src/actions/transformations/replace_comments.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_COMMENTS_H_
--- a/src/actions/transformations/replace_nulls.h
+++ b/src/actions/transformations/replace_nulls.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_REPLACE_NULLS_H_
--- a/src/actions/transformations/sha1.h
+++ b/src/actions/transformations/sha1.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_SHA1_H_
--- a/src/actions/transformations/sql_hex_decode.h
+++ b/src/actions/transformations/sql_hex_decode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_SQL_HEX_DECODE_H_
--- a/src/actions/transformations/transformation.cc
+++ b/src/actions/transformations/transformation.cc
@@ -21,7 +21,7 @@
 #include <string>

 #include "modsecurity/transaction.h"
-#include "src/actions/action.h"
+#include "modsecurity/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"
--- a/src/actions/transformations/transformation.h
+++ b/src/actions/transformations/transformation.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_TRANSFORMATION_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_TRANSFORMATION_H_
--- a/src/actions/transformations/trim.cc
+++ b/src/actions/transformations/trim.cc
@@ -24,7 +24,7 @@

 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 namespace modsecurity {
 namespace actions {
--- a/src/actions/transformations/trim.h
+++ b/src/actions/transformations/trim.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_TRIM_H_
--- a/src/actions/transformations/trim_left.cc
+++ b/src/actions/transformations/trim_left.cc
@@ -25,7 +25,7 @@
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
 #include "src/actions/transformations/trim.h"
-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 namespace modsecurity {
 namespace actions {
--- a/src/actions/transformations/trim_left.h
+++ b/src/actions/transformations/trim_left.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"
 #include "src/actions/transformations/trim.h"

--- a/src/actions/transformations/trim_right.cc
+++ b/src/actions/transformations/trim_right.cc
@@ -24,7 +24,7 @@

 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 namespace modsecurity {
 namespace actions {
--- a/src/actions/transformations/trim_right.h
+++ b/src/actions/transformations/trim_right.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"
 #include "src/actions/transformations/trim.h"

--- a/src/actions/transformations/url_decode.h
+++ b/src/actions/transformations/url_decode.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <unordered_map>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_H_
--- a/src/actions/transformations/url_decode_uni.h
+++ b/src/actions/transformations/url_decode_uni.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_UNI_H_
--- a/src/actions/transformations/url_encode.h
+++ b/src/actions/transformations/url_encode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_ENCODE_H_
--- a/src/actions/transformations/utf8_to_unicode.h
+++ b/src/actions/transformations/utf8_to_unicode.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "src/actions/transformations/transformation.h"

 #ifndef SRC_ACTIONS_TRANSFORMATIONS_UTF8_TO_UNICODE_H_
--- a/src/actions/ver.cc
+++ b/src/actions/ver.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
--- a/src/actions/ver.h
+++ b/src/actions/ver.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_VER_H_
 #define SRC_ACTIONS_VER_H_
--- a/src/actions/xmlns.cc
+++ b/src/actions/xmlns.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

 namespace modsecurity {
--- a/src/actions/xmlns.h
+++ b/src/actions/xmlns.h
@@ -15,7 +15,7 @@

 #include <string>

-#include "src/actions/action.h"
+#include "modsecurity/actions/action.h"

 #ifndef SRC_ACTIONS_XMLNS_H_
 #define SRC_ACTIONS_XMLNS_H_