Introduces ActionWithExecution

headers/modsecurity/actions/action.h

@@ -69,12 +69,6 @@ class Action {
         return true;
     }
 
-
-    virtual bool execute(Transaction *transaction = nullptr) noexcept {
-        return true;
-    }
-
-
     const std::string *getName() const noexcept {
         return &m_name;
     }

src/actions/action_type_rule_metadata.h

@@ -37,10 +37,6 @@ class ActionTypeRuleMetaData : public virtual Action {
         : Action()
     { };
 
-    bool execute(Transaction *t) noexcept override {
-        return true;
-    }
-
     virtual void configure(RuleWithActions *rule) = 0;
 };
 

src/actions/action_with_execution.h

@@ -0,0 +1,41 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 - 2020 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 "modsecurity/actions/action.h"
+#include "src/rule_with_actions.h"
+
+#ifndef SRC_ACTIONS_ACTION_WITH_EXECUTION_H_
+#define SRC_ACTIONS_ACTION_WITH_EXECUTION_H_
+
+
+namespace modsecurity {
+namespace actions {
+
+
+class ActionWithExecution : public virtual Action {
+ public:
+    ActionWithExecution()
+        : Action()
+    { };
+
+    virtual bool execute(Transaction *t) const noexcept = 0;
+};
+
+
+}  // namespace actions
+}  // namespace modsecurity
+
+#endif  // SRC_ACTIONS_ACTION_WITH_EXECUTION_H_

src/actions/ctl/audit_log_parts.cc

@@ -55,7 +55,7 @@ bool AuditLogParts::init(std::string *error) {
 }
 
 
-bool AuditLogParts::execute(Transaction *transaction) noexcept {
+bool AuditLogParts::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 7, "AuditLog parts before modification: " +
         std::to_string(transaction->m_auditLogParts) + ".");
 

src/actions/ctl/audit_log_parts.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_AUDIT_LOG_PARTS_H_
@@ -29,7 +30,7 @@ namespace actions {
 namespace ctl {
 
 
-class AuditLogParts : public Action {
+class AuditLogParts : public ActionWithExecution {
  public:
     explicit AuditLogParts(const std::string &action)
         : Action(action),
@@ -38,7 +39,7 @@ class AuditLogParts : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  protected:
     int m_partsToModify;

src/actions/ctl/request_body_access.cc

@@ -44,7 +44,7 @@ bool RequestBodyAccess::init(std::string *error) {
 }
 
 
-bool RequestBodyAccess::execute(Transaction *transaction) noexcept {
+bool RequestBodyAccess::execute(Transaction *transaction) const noexcept {
     if (m_requestBodyAccess) {
         transaction->m_requestBodyAccess =
             RulesSetProperties::TrueConfigBoolean;

src/actions/ctl/request_body_access.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_ACCESS_H_
@@ -29,7 +30,7 @@ namespace actions {
 namespace ctl {
 
 
-class RequestBodyAccess : public Action {
+class RequestBodyAccess : public ActionWithExecution {
  public:
     explicit RequestBodyAccess(const std::string &action)
         : Action(action),
@@ -38,7 +39,7 @@ class RequestBodyAccess : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     bool m_requestBodyAccess;

src/actions/ctl/request_body_processor_json.cc

@@ -26,7 +26,7 @@ namespace actions {
 namespace ctl {
 
 
-bool RequestBodyProcessorJSON::execute(Transaction *transaction) noexcept {
+bool RequestBodyProcessorJSON::execute(Transaction *transaction) const noexcept {
     transaction->m_requestBodyProcessor = Transaction::JSONRequestBody;
     transaction->m_variableReqbodyProcessor.set("JSON",
         transaction->m_variableOffset);

src/actions/ctl/request_body_processor_json.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_JSON_H_
@@ -29,13 +30,13 @@ namespace actions {
 namespace ctl {
 
 
-class RequestBodyProcessorJSON : public Action {
+class RequestBodyProcessorJSON : public ActionWithExecution {
  public:
     explicit RequestBodyProcessorJSON(const std::string &action)
         : Action(action)
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 };
 
 

src/actions/ctl/request_body_processor_urlencoded.cc

@@ -27,7 +27,7 @@ namespace ctl {
 
 
 bool RequestBodyProcessorURLENCODED::execute(
-    Transaction *transaction) noexcept {
+    Transaction *transaction) const noexcept {
     transaction->m_requestBodyType = Transaction::WWWFormUrlEncoded;
     transaction->m_variableReqbodyProcessor.set("URLENCODED",
         transaction->m_variableOffset);

src/actions/ctl/request_body_processor_urlencoded.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_URLENCODED_H_
@@ -29,13 +30,13 @@ namespace actions {
 namespace ctl {
 
 
-class RequestBodyProcessorURLENCODED : public Action {
+class RequestBodyProcessorURLENCODED : public ActionWithExecution {
  public:
     explicit RequestBodyProcessorURLENCODED(const std::string &action)
         : Action(action)
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 };
 
 

src/actions/ctl/request_body_processor_xml.cc

@@ -26,7 +26,7 @@ namespace actions {
 namespace ctl {
 
 
-bool RequestBodyProcessorXML::execute(Transaction *transaction) noexcept {
+bool RequestBodyProcessorXML::execute(Transaction *transaction) const noexcept {
     transaction->m_requestBodyProcessor = Transaction::XMLRequestBody;
     transaction->m_variableReqbodyProcessor.set("XML",
         transaction->m_variableOffset);

src/actions/ctl/request_body_processor_xml.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_REQUEST_BODY_PROCESSOR_XML_H_
@@ -29,13 +30,13 @@ namespace actions {
 namespace ctl {
 
 
-class RequestBodyProcessorXML : public Action {
+class RequestBodyProcessorXML : public ActionWithExecution {
  public:
     explicit RequestBodyProcessorXML(const std::string &action)
         : Action(action)
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 };
 
 

src/actions/ctl/rule_engine.cc

@@ -47,7 +47,7 @@ bool RuleEngine::init(std::string *error) {
 }
 
 
-bool RuleEngine::execute(Transaction *transaction) noexcept {
+bool RuleEngine::execute(Transaction *transaction) const noexcept {
     std::stringstream a;
     a << "Setting SecRuleEngine to ";
     a << modsecurity::RulesSetProperties::ruleEngineStateString(m_ruleEngine);

src/actions/ctl/rule_engine.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/rules_set_properties.h"
 #include "modsecurity/actions/action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_RULE_ENGINE_H_
@@ -29,7 +30,7 @@ namespace actions {
 namespace ctl {
 
 
-class RuleEngine : public Action {
+class RuleEngine : public ActionWithExecution {
  public:
     explicit RuleEngine(const std::string &action)
         : Action(action),
@@ -38,7 +39,7 @@ class RuleEngine : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     RulesSetProperties::RuleEngine m_ruleEngine;

src/actions/ctl/rule_remove_by_id.cc

@@ -88,7 +88,7 @@ bool RuleRemoveById::init(std::string *error) {
 }
 
 
-bool RuleRemoveById::execute(Transaction *transaction) noexcept {
+bool RuleRemoveById::execute(Transaction *transaction) const noexcept {
     for (auto &i : m_ids) {
         transaction->m_ruleRemoveById.push_back(i);
     }

src/actions/ctl/rule_remove_by_id.h

@@ -20,6 +20,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_RULE_REMOVE_BY_ID_H_
@@ -31,7 +32,7 @@ namespace actions {
 namespace ctl {
 
 
-class RuleRemoveById : public Action {
+class RuleRemoveById : public ActionWithExecution {
  public:
     explicit RuleRemoveById(const std::string &action)
         : Action(action)
@@ -39,7 +40,7 @@ class RuleRemoveById : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     std::list<std::pair<int, int> > m_ranges;

src/actions/ctl/rule_remove_by_tag.cc

@@ -34,7 +34,7 @@ bool RuleRemoveByTag::init(std::string *error) {
 }
 
 
-bool RuleRemoveByTag::execute(Transaction *transaction) noexcept {
+bool RuleRemoveByTag::execute(Transaction *transaction) const noexcept {
     transaction->m_ruleRemoveByTag.push_back(m_tag);
     return true;
 }

src/actions/ctl/rule_remove_by_tag.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_RULE_REMOVE_BY_TAG_H_
@@ -29,7 +30,7 @@ namespace actions {
 namespace ctl {
 
 
-class RuleRemoveByTag : public Action {
+class RuleRemoveByTag : public ActionWithExecution {
  public:
     explicit RuleRemoveByTag(const std::string &action)
         : Action(action),
@@ -38,7 +39,7 @@ class RuleRemoveByTag : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     std::string m_tag;

src/actions/ctl/rule_remove_target_by_id.cc

@@ -53,7 +53,7 @@ bool RuleRemoveTargetById::init(std::string *error) {
 }
 
 
-bool RuleRemoveTargetById::execute(Transaction *transaction) noexcept {
+bool RuleRemoveTargetById::execute(Transaction *transaction) const noexcept {
     transaction->m_ruleRemoveTargetById.push_back(
         std::make_pair(m_id, m_target));
     return true;

src/actions/ctl/rule_remove_target_by_id.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_RULE_REMOVE_TARGET_BY_ID_H_
@@ -29,7 +30,7 @@ namespace actions {
 namespace ctl {
 
 
-class RuleRemoveTargetById : public Action {
+class RuleRemoveTargetById : public ActionWithExecution {
  public:
     explicit RuleRemoveTargetById(const std::string &action)
         : Action(action),
@@ -39,7 +40,7 @@ class RuleRemoveTargetById : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     int m_id;

src/actions/ctl/rule_remove_target_by_tag.cc

@@ -46,7 +46,7 @@ bool RuleRemoveTargetByTag::init(std::string *error) {
 }
 
 
-bool RuleRemoveTargetByTag::execute(Transaction *transaction) noexcept {
+bool RuleRemoveTargetByTag::execute(Transaction *transaction) const noexcept {
     transaction->m_ruleRemoveTargetByTag.push_back(
         std::make_pair(m_tag, m_target));
     return true;

src/actions/ctl/rule_remove_target_by_tag.h

@@ -18,6 +18,7 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_CTL_RULE_REMOVE_TARGET_BY_TAG_H_
@@ -29,7 +30,7 @@ namespace actions {
 namespace ctl {
 
 
-class RuleRemoveTargetByTag : public Action {
+class RuleRemoveTargetByTag : public ActionWithExecution {
  public:
     explicit RuleRemoveTargetByTag(const std::string &action)
         : Action(action)
@@ -37,7 +38,7 @@ class RuleRemoveTargetByTag : public Action {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     std::string m_tag;

src/actions/data/status.cc

@@ -38,7 +38,7 @@ bool Status::init(std::string *error) {
 }
 
 
-bool Status::execute(Transaction *transaction) noexcept {
+bool Status::execute(Transaction *transaction) const noexcept {
     transaction->m_it.status = m_status;
     return true;
 }

src/actions/data/status.h

@@ -20,6 +20,7 @@
 #include "modsecurity/transaction.h"
 
 #include "src/actions/action_allowed_in_sec_default_action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_DATA_STATUS_H_
@@ -31,7 +32,7 @@ namespace actions {
 namespace data {
 
 
-class Status : public ActionAllowedAsSecDefaultAction {
+class Status : public ActionAllowedAsSecDefaultAction, public ActionWithExecution {
  public:
     explicit Status(const std::string &action)
         : Action(action),
@@ -40,7 +41,7 @@ class Status : public ActionAllowedAsSecDefaultAction {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     int m_status;

src/actions/disruptive/allow.cc

@@ -52,7 +52,7 @@ bool Allow::init(std::string *error) {
 }
 
 
-bool Allow::execute(Transaction *transaction) noexcept {
+bool Allow::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 4, "Dropping the evaluation of upcoming rules " \
         "in favor of an `allow' action of type: " \
         + allowTypeToName(m_allowType));

src/actions/disruptive/allow.h

@@ -20,6 +20,7 @@
 #include "modsecurity/transaction.h"
 
 #include "src/actions/disruptive/disruptive_action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_ALLOW_H_
@@ -51,7 +52,7 @@ enum AllowType : int {
 };
 
 
-class Allow : public ActionDisruptive {
+class Allow : public ActionDisruptive, public ActionWithExecution {
  public:
     explicit Allow(const std::string &action)
         : Action(action),
@@ -60,7 +61,7 @@ class Allow : public ActionDisruptive {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     AllowType m_allowType;

src/actions/disruptive/deny.cc

@@ -32,7 +32,7 @@ namespace actions {
 namespace disruptive {
 
 
-bool Deny::execute(Transaction *transaction) noexcept {
+bool Deny::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 8, "Running action deny");
 
     if (transaction->m_it.status == 200) {

src/actions/disruptive/deny.h

@@ -20,6 +20,7 @@
 #include "modsecurity/transaction.h"
 
 #include "src/actions/disruptive/disruptive_action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_DENY_H_
@@ -31,13 +32,13 @@ namespace actions {
 namespace disruptive {
 
 
-class Deny : public ActionDisruptive {
+class Deny : public ActionDisruptive, public ActionWithExecution {
  public:
     Deny()
         : Action("deny")
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 };
 
 

src/actions/disruptive/drop.cc

@@ -32,7 +32,7 @@ namespace actions {
 namespace disruptive {
 
 
-bool Drop::execute(Transaction *transaction) noexcept {
+bool Drop::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 8, "Running action drop " \
         "[executing deny instead of drop.]");
 

src/actions/disruptive/drop.h

@@ -20,6 +20,7 @@
 #include "modsecurity/transaction.h"
 
 #include "src/actions/disruptive/disruptive_action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_DROP_H_
@@ -31,13 +32,13 @@ namespace actions {
 namespace disruptive {
 
 
-class Drop : public ActionDisruptive {
+class Drop : public ActionDisruptive, public ActionWithExecution {
  public:
     Drop()
         : Action("drop")
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 };
 
 

src/actions/disruptive/pass.cc

@@ -31,7 +31,7 @@ namespace actions {
 namespace disruptive {
 
 
-bool Pass::execute(Transaction *transaction) noexcept {
+bool Pass::execute(Transaction *transaction) const noexcept {
     intervention::free(&transaction->m_it);
     intervention::reset(&transaction->m_it);
 

src/actions/disruptive/pass.h

@@ -20,6 +20,7 @@
 #include "modsecurity/transaction.h"
 
 #include "src/actions/disruptive/disruptive_action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_PASS_H_
@@ -31,13 +32,13 @@ namespace actions {
 namespace disruptive {
 
 
-class Pass : public ActionDisruptive {
+class Pass : public ActionDisruptive, public ActionWithExecution {
  public:
     Pass()
         : Action("pass")
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 };
 
 

src/actions/disruptive/redirect.cc

@@ -32,7 +32,7 @@ namespace actions {
 namespace disruptive {
 
 
-bool Redirect::execute(Transaction *transaction) noexcept {
+bool Redirect::execute(Transaction *transaction) const noexcept {
     std::string m_urlExpanded(getEvaluatedRunTimeString(transaction));
     /* if it was changed before, lets keep it. */
     if (transaction->m_it.status == 200

src/actions/disruptive/redirect.h

@@ -24,6 +24,7 @@
 #include "src/actions/action_with_run_time_string.h"
 #include "src/actions/disruptive/disruptive_action.h"
 #include "src/run_time_string.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_REDIRECT_H_
@@ -35,7 +36,8 @@ namespace actions {
 namespace disruptive {
 
 
-class Redirect : public ActionWithRunTimeString, public ActionDisruptive {
+class Redirect : public ActionWithRunTimeString, public ActionDisruptive,
+    public ActionWithExecution {
  public:
     explicit Redirect(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -52,7 +54,7 @@ class Redirect : public ActionWithRunTimeString, public ActionDisruptive {
     { }
 
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
 
     ActionWithRunTimeString *clone() override {

src/actions/exec.cc

@@ -52,7 +52,7 @@ bool Exec::init(std::string *error) {
 }
 
 
-bool Exec::execute(Transaction *t) noexcept {
+bool Exec::execute(Transaction *t) const noexcept {
     ms_dbg_a(t, 8, "Running script... " + m_script);
     m_lua.run(t);
     return true;

src/actions/exec.h

@@ -18,6 +18,8 @@
 
 #include "modsecurity/actions/action.h"
 #include "src/engine/lua.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_EXEC_H_
 #define SRC_ACTIONS_EXEC_H_
@@ -27,7 +29,7 @@ namespace modsecurity {
 namespace actions {
 
 
-class Exec : public Action {
+class Exec : public ActionWithExecution {
  public:
     explicit Exec(const std::string &action)
         : Action(action),
@@ -36,7 +38,7 @@ class Exec : public Action {
 
     ~Exec() { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
     bool init(std::string *error) override;
 
  private:

src/actions/expire_var.h

@@ -0,0 +1,54 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 - 2020 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 <memory>
+#include <string>
+#include <utility>
+
+#include "modsecurity/actions/action.h"
+#include "modsecurity/transaction.h"
+#include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
+
+#ifndef SRC_ACTIONS_EXPIRE_VAR_H_
+#define SRC_ACTIONS_EXPIRE_VAR_H_
+
+
+namespace modsecurity {
+namespace actions {
+
+
+class ExpireVar : public ActionWithExecution {
+ public:
+    explicit ExpireVar(const std::string &action)
+        : Action(action)
+    { }
+
+    ~ExpireVar() { }
+
+    bool execute(Transaction *transaction) const noexcept override { return true; };
+    bool init(std::string *error) override { return true; };
+
+ private:
+};
+
+
+}  // namespace actions
+}  // namespace modsecurity
+
+
+#endif  // SRC_ACTIONS_EXPIRE_VAR_H_

src/actions/init_col.cc

@@ -57,7 +57,7 @@ bool InitCol::init(std::string *error) {
 }
 
 
-bool InitCol::execute(Transaction *t) noexcept {
+bool InitCol::execute(Transaction *t) const noexcept {
     std::string collectionName(getEvaluatedRunTimeString(t));
 
     if (m_collection_key == "ip") {

src/actions/init_col.h

@@ -20,6 +20,8 @@
 
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_INIT_COL_H_
 #define SRC_ACTIONS_INIT_COL_H_
@@ -30,7 +32,7 @@ class Transaction;
 namespace actions {
 
 
-class InitCol : public ActionWithRunTimeString {
+class InitCol : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     InitCol(
         const std::string &action,
@@ -47,7 +49,7 @@ class InitCol : public ActionWithRunTimeString {
 
     bool init(std::string *error) override;
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new InitCol(*this);

src/actions/log_data.cc

@@ -25,7 +25,7 @@
 namespace modsecurity {
 namespace actions {
 
-bool LogData::execute(Transaction *transaction) noexcept {
+bool LogData::execute(Transaction *transaction) const noexcept {
     transaction->messageGetLast()->m_data =
         getEvaluatedRunTimeString(transaction);
     return true;

src/actions/log_data.h

@@ -18,6 +18,7 @@
 
 #include "src/actions/action_with_run_time_string.h"
 #include "src/run_time_string.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_LOG_DATA_H_
@@ -28,7 +29,7 @@ namespace modsecurity {
 namespace actions {
 
 
-class LogData : public ActionWithRunTimeString {
+class LogData : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     explicit LogData(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -40,7 +41,7 @@ class LogData : public ActionWithRunTimeString {
         Action(data)
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new LogData(*this);

src/actions/msg.cc

@@ -49,7 +49,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool Msg::execute(Transaction *transaction) noexcept {
+bool Msg::execute(Transaction *transaction) const noexcept {
     std::string msg = getEvaluatedRunTimeString(transaction);
     transaction->messageGetLast()->m_message = msg;
     ms_dbg_a(transaction, 9, "Saving msg: " + msg);

src/actions/msg.h

@@ -21,6 +21,8 @@
 #include "modsecurity/actions/action.h"
 #include "modsecurity/rule_message.h"
 #include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_MSG_H_
 #define SRC_ACTIONS_MSG_H_
@@ -32,7 +34,7 @@ class Transaction;
 namespace actions {
 
 
-class Msg : public ActionWithRunTimeString {
+class Msg : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     explicit Msg(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -44,7 +46,7 @@ class Msg : public ActionWithRunTimeString {
         Action(action)
     { };
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new Msg(*this);

src/actions/set_env.cc

@@ -32,7 +32,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool SetENV::execute(Transaction *t) noexcept {
+bool SetENV::execute(Transaction *t) const noexcept {
     std::string colNameExpanded(getEvaluatedRunTimeString(t));
 
     ms_dbg_a(t, 8, "Setting envoriment variable: "

src/actions/set_env.h

@@ -20,6 +20,8 @@
 
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_SET_ENV_H_
 #define SRC_ACTIONS_SET_ENV_H_
@@ -31,7 +33,7 @@ class Transaction;
 namespace actions {
 
 
-class SetENV : public ActionWithRunTimeString {
+class SetENV : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     explicit SetENV(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -43,7 +45,7 @@ class SetENV : public ActionWithRunTimeString {
         Action(action)
     { };
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new SetENV(*this);

src/actions/set_rsc.cc

@@ -30,7 +30,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool SetRSC::execute(Transaction *t) noexcept {
+bool SetRSC::execute(Transaction *t) const noexcept {
     std::string colNameExpanded(getEvaluatedRunTimeString(t));
     ms_dbg_a(t, 8, "RESOURCE initiated with value: \'"
         + colNameExpanded + "\'.");

src/actions/set_rsc.h

@@ -20,6 +20,8 @@
 
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_SET_RSC_H_
 #define SRC_ACTIONS_SET_RSC_H_
@@ -31,7 +33,7 @@ class Transaction;
 namespace actions {
 
 
-class SetRSC : public ActionWithRunTimeString {
+class SetRSC : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     explicit SetRSC(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -43,7 +45,7 @@ class SetRSC : public ActionWithRunTimeString {
         Action(action)
     { };
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new SetRSC(*this);

src/actions/set_sid.cc

@@ -30,7 +30,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool SetSID::execute(Transaction *t) noexcept {
+bool SetSID::execute(Transaction *t) const noexcept {
     std::string colNameExpanded(getEvaluatedRunTimeString(t));
     ms_dbg_a(t, 8, "Session ID initiated with value: \'"
         + colNameExpanded + "\'.");

src/actions/set_sid.h

@@ -20,6 +20,8 @@
 
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_SET_SID_H_
 #define SRC_ACTIONS_SET_SID_H_
@@ -31,7 +33,7 @@ class Transaction;
 namespace actions {
 
 
-class SetSID : public ActionWithRunTimeString {
+class SetSID : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     explicit SetSID(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -43,7 +45,7 @@ class SetSID : public ActionWithRunTimeString {
         Action(action)
     { };
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new SetSID(*this);

src/actions/set_uid.cc

@@ -30,7 +30,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool SetUID::execute(Transaction *t) noexcept {
+bool SetUID::execute(Transaction *t) const noexcept {
     std::string colNameExpanded(getEvaluatedRunTimeString(t));
     ms_dbg_a(t, 8, "User collection initiated with value: \'"
         + colNameExpanded + "\'.");

src/actions/set_uid.h

@@ -20,6 +20,8 @@
 
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_with_run_time_string.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_SET_UID_H_
 #define SRC_ACTIONS_SET_UID_H_
@@ -31,7 +33,7 @@ class Transaction;
 namespace actions {
 
 
-class SetUID : public ActionWithRunTimeString {
+class SetUID : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     explicit SetUID(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -43,7 +45,7 @@ class SetUID : public ActionWithRunTimeString {
         Action(action)
     { };
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     ActionWithRunTimeString *clone() override {
         return new SetUID(*this);

src/actions/set_var.cc

@@ -42,7 +42,7 @@ bool SetVar::init(std::string *error) {
 }
 
 
-bool SetVar::execute(Transaction *t) noexcept {
+bool SetVar::execute(Transaction *t) const noexcept {
     std::string targetValue;
     std::string resolvedPre;
 

src/actions/set_var.h

@@ -23,6 +23,7 @@
 #include "src/actions/action_with_run_time_string.h"
 #include "src/variables/variable_with_runtime_string.h"
 #include "src/rule_with_operator.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_SET_VAR_H_
@@ -47,7 +48,7 @@ enum SetVarOperation {
 };
 
 
-class SetVar : public ActionWithRunTimeString {
+class SetVar : public ActionWithRunTimeString, public ActionWithExecution {
  public:
     SetVar(SetVarOperation operation,
         std::unique_ptr<modsecurity::variables::Variable> variable,
@@ -84,7 +85,7 @@ class SetVar : public ActionWithRunTimeString {
     }
 
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
     bool init(std::string *error) override;
 
     void populate(RuleWithActions *rule) override {

src/actions/skip.cc

@@ -42,7 +42,7 @@ bool Skip::init(std::string *error) {
 }
 
 
-bool Skip::execute(Transaction *transaction) noexcept {
+bool Skip::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 5, "Skipping the next " + \
         std::to_string(m_skip_next) + " rules.");
 

src/actions/skip.h

@@ -17,6 +17,7 @@
 #include <string>
 
 #include "modsecurity/actions/action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_SKIP_H_
@@ -29,14 +30,14 @@ class Transaction;
 namespace actions {
 
 
-class Skip : public Action {
+class Skip : public ActionWithExecution {
  public:
     explicit Skip(const std::string &action)
         : Action(action),
         m_skip_next(0) { }
 
     bool init(std::string *error) override;
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     int m_skip_next;

src/actions/skip_after.cc

@@ -30,7 +30,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool SkipAfter::execute(Transaction *transaction) noexcept {
+bool SkipAfter::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 5, "Setting skipAfter for: " + *m_skipName);
     transaction->addMarker(m_skipName);
     return true;

src/actions/skip_after.h

@@ -18,6 +18,7 @@
 #include <memory>
 
 #include "modsecurity/actions/action.h"
+#include "src/actions/action_with_execution.h"
 
 
 #ifndef SRC_ACTIONS_SKIP_AFTER_H_
@@ -28,14 +29,14 @@ namespace modsecurity {
 namespace actions {
 
 
-class SkipAfter : public Action {
+class SkipAfter : public ActionWithExecution {
  public:
     explicit SkipAfter(const std::string &action)
         : Action(action),
         m_skipName(std::make_shared<std::string>(m_parserPayload))
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
  private:
     // FIXME: This should be a regular pointer instead of a shared pointer.

src/actions/tag.cc

@@ -52,7 +52,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool Tag::execute(Transaction *transaction) noexcept {
+bool Tag::execute(Transaction *transaction) const noexcept {
     ms_dbg_a(transaction, 9, "Rule tag: " + getTagName(transaction));
     return true;
 }

src/actions/tag.h

@@ -21,6 +21,8 @@
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_with_run_time_string.h"
 #include "src/actions/action_allowed_in_sec_default_action.h"
+#include "src/actions/action_with_execution.h"
+
 
 #ifndef SRC_ACTIONS_TAG_H_
 #define SRC_ACTIONS_TAG_H_
@@ -31,7 +33,7 @@ namespace actions {
 
 
 class Tag : public ActionWithRunTimeString,
-        public ActionAllowedAsSecDefaultAction {
+        public ActionAllowedAsSecDefaultAction, public ActionWithExecution {
  public:
     explicit Tag(std::unique_ptr<RunTimeString> runTimeString)
         : ActionWithRunTimeString(std::move(runTimeString)),
@@ -43,7 +45,7 @@ class Tag : public ActionWithRunTimeString,
         Action(action)
     { }
 
-    bool execute(Transaction *transaction) noexcept override;
+    bool execute(Transaction *transaction) const noexcept override;
 
     inline std::string getTagName(Transaction *transaction) const {
         return getEvaluatedRunTimeString(transaction);

src/parser/seclang-parser.hh

@@ -84,6 +84,7 @@ class Driver;
 #include "src/actions/disruptive/redirect.h"
 #include "src/actions/init_col.h"
 #include "src/actions/exec.h"
+#include "src/actions/expire_var.h"
 #include "src/actions/log_data.h"
 #include "src/actions/log.h"
 #include "src/actions/maturity.h"
@@ -351,7 +352,7 @@ using namespace modsecurity::operators;
     a = std::move(c);
 
 
-#line 355 "seclang-parser.hh"
+#line 356 "seclang-parser.hh"
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -485,7 +486,7 @@ using namespace modsecurity::operators;
 #endif
 
 namespace yy {
-#line 489 "seclang-parser.hh"
+#line 490 "seclang-parser.hh"
 
 
 
@@ -8586,7 +8587,7 @@ switch (yykind)
   }
 
 } // yy
-#line 8590 "seclang-parser.hh"
+#line 8591 "seclang-parser.hh"
 
 
 

src/parser/seclang-parser.yy

@@ -45,6 +45,7 @@ class Driver;
 #include "src/actions/disruptive/redirect.h"
 #include "src/actions/init_col.h"
 #include "src/actions/exec.h"
+#include "src/actions/expire_var.h"
 #include "src/actions/log_data.h"
 #include "src/actions/log.h"
 #include "src/actions/maturity.h"
@@ -2715,8 +2716,7 @@ act:
       }
     | ACTION_EXPIRE_VAR
       {
-        //ACTION_NOT_SUPPORTED("ExpireVar", @0);
+        ACTION_CONTAINER($$, new actions::ExpireVar($1));
-        ACTION_CONTAINER($$, new actions::Action($1));
       }
     | ACTION_ID
       {

src/rule_with_actions.cc

@@ -141,12 +141,12 @@ void RuleWithActions::addDefaultAction(std::shared_ptr<actions::Action> a) {
     } else if (dynamic_cast<actions::Tag *>(a.get())) {
         m_defaultActionActionsTag.push_back(std::dynamic_pointer_cast<actions::Tag>(a));
     } else if (dynamic_cast<actions::Block *>(a.get())) {
-        m_defaultActionActionsRuntimePos.push_back(a);
+        m_defaultActionActionsRuntimePos.push_back(std::dynamic_pointer_cast<ActionWithExecution>(a));
         m_defaultContainsStaticBlockAction = true;
-    } else if (std::dynamic_pointer_cast<actions::disruptive::ActionDisruptive>(a) != NULL) {
+    } else if (std::dynamic_pointer_cast<ActionDisruptive>(a) != NULL) {
-        m_defaultActionDisruptiveAction = a;
+        m_defaultActionDisruptiveAction = std::dynamic_pointer_cast<ActionDisruptive>(a);
     } else {
-        m_defaultActionActionsRuntimePos.push_back(a);
+        m_defaultActionActionsRuntimePos.push_back(std::dynamic_pointer_cast<ActionWithExecution>(a));
     }
 }
 
@@ -165,7 +165,6 @@ void RuleWithActions::addAction(actions::Action *a) {
         return;
     }
 
-
     if (dynamic_cast<actions::LogData *>(a)) {
         m_logData = std::unique_ptr<actions::LogData>(dynamic_cast<actions::LogData*>(a));
     } else if (dynamic_cast<actions::Msg *>(a)) {
@@ -176,14 +175,14 @@ void RuleWithActions::addAction(actions::Action *a) {
     } else if (dynamic_cast<actions::Tag *>(a)) {
         m_actionsTag.push_back(std::unique_ptr<actions::Tag>(dynamic_cast<actions::Tag *>(a)));
     } else if (dynamic_cast<actions::Block *>(a)) {
-        m_actionsRuntimePos.push_back(std::unique_ptr<actions::Block>(dynamic_cast<actions::Block *>(a)));
+        m_actionsRuntimePos.push_back(std::unique_ptr<ActionWithExecution>(dynamic_cast<ActionWithExecution *>(a)));
         m_containsStaticBlockAction = true;
     } else if (dynamic_cast<actions::XmlNS *>(a)) {
         m_XmlNSs.push_back(std::unique_ptr<actions::XmlNS>(dynamic_cast<actions::XmlNS *>(a)));
-    } else if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL) {
+    } else if (dynamic_cast<ActionDisruptive *>(a) != NULL) {
-        m_disruptiveAction = std::unique_ptr<Action>(a);
+        m_disruptiveAction = std::unique_ptr<ActionDisruptive>(dynamic_cast<ActionDisruptive *>(a));
     } else {
-        m_actionsRuntimePos.push_back(std::unique_ptr<Action>(a));
+        m_actionsRuntimePos.push_back(std::unique_ptr<ActionWithExecution >(dynamic_cast<ActionWithExecution *>(a)));
     }
 }
 
@@ -241,23 +240,22 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
         if (m_ruleId != b.first) {
             continue;
         }
-        actions::Action *a = dynamic_cast<actions::Action*>(b.second.get());
+        ActionWithExecution *a = dynamic_cast<ActionWithExecution*>(b.second.get());
-        if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL) {
+        if (dynamic_cast<ActionDisruptive *>(a) != NULL) {
             trans->messageGetLast()->setRule(this);
         }
         executeAction(trans, a, false);
-        if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL) {
+        if (dynamic_cast<ActionDisruptive *>(a) != NULL) {
             disruptiveAlreadyExecuted = true;
         }
     }
     for (auto &a : getMatchActionsPtr()) {
-        if (!dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL
+        if (!dynamic_cast<ActionDisruptive *>(a) != NULL
                 && !(disruptiveAlreadyExecuted
                 && dynamic_cast<actions::Block *>(a))) {
             executeAction(trans, a, false);
         }
     }
-
     if (!disruptiveAlreadyExecuted && m_disruptiveAction != nullptr) {
         executeAction(trans,
             m_disruptiveAction.get(), false);
@@ -270,13 +268,14 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
 
 
 void RuleWithActions::executeAction(Transaction *trans,
-    Action *a, bool defaultContext) {
+    ActionWithExecution *a, bool defaultContext) {
-    if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) == NULL) {
     ms_dbg_a(trans, 9, "Running action: " + *a->getName());
     a->execute(trans);
-        return;
 }
 
+
+void RuleWithActions::executeAction(Transaction *trans,
+    ActionDisruptive *a, bool defaultContext) {
     if (defaultContext && !hasBlockAction()) {
         ms_dbg_a(trans, 4, "Ignoring action: " + *a->getName() + \
             " (rule does not cotains block)");
@@ -284,9 +283,10 @@ void RuleWithActions::executeAction(Transaction *trans,
     }
 
     if (trans->getRuleEngineState() == RulesSet::EnabledRuleEngine) {
-        ms_dbg_a(trans, 4, "Running (disruptive)     action: " + 
+        ms_dbg_a(trans, 4, "Running (disruptive)     action: " + \
             *a->getName() + ".");
-        a->execute(trans);
+        ActionWithExecution *ae = dynamic_cast<ActionWithExecution *>(a);
+        ae->execute(trans);
         return;
     }
 

src/rule_with_actions.h

@@ -31,6 +31,8 @@
 #include "modsecurity/rule.h"
 #include "modsecurity/actions/action.h"
 #include "src/actions/action_type_rule_metadata.h"
+#include "src/actions/action_with_execution.h"
+#include "src/actions/disruptive/disruptive_action.h"
 
 
 #ifdef __cplusplus
@@ -54,15 +56,20 @@ class Transformation;
 using Transformation = actions::transformations::Transformation;
 using Transformations = std::vector<std::shared_ptr<Transformation> >;
 using TransformationsPtr = std::vector<Transformation *>;
-using Action = actions::Action;
+
-using ActionTypeRuleMetaData = actions::ActionTypeRuleMetaData;
 using Actions = std::vector<actions::Action *>;
+using ActionWithExecution = actions::ActionWithExecution;
+using ActionTypeRuleMetaData = actions::ActionTypeRuleMetaData;
+using ActionDisruptive = actions::disruptive::ActionDisruptive;
+
+using MatchActions = std::vector<std::shared_ptr<ActionWithExecution > >;
+using MatchActionsPtr = std::vector<ActionWithExecution *>;
+
 using Tags = std::vector<std::shared_ptr<actions::Tag> >;
 using TagsPtr = std::vector<actions::Tag *>;
+
 using SetVars = std::vector<std::shared_ptr<actions::SetVar> >;
 using SetVarsPtr = std::vector<actions::SetVar *>;
-using MatchActions = std::vector<std::shared_ptr<actions::Action > >;
-using MatchActionsPtr = std::vector<actions::Action *>;
 
 using XmlNSs = std::vector<std::shared_ptr<actions::XmlNS> >;
 using XmlNSsPtr = std::vector<actions::XmlNS *>;
@@ -110,7 +117,6 @@ class RuleWithActions : public Rule {
     int ACCURACY_NOT_SET = 10;
     int MATURITY_NOT_SET = 10;
 
-
     RuleWithActions(
         Actions *a,
         Transformations *t,
@@ -226,7 +232,11 @@ class RuleWithActions : public Rule {
         Transaction *trasn);
 
     void executeAction(Transaction *trans,
-        Action *a,
+        ActionWithExecution *a,
+        bool context);
+
+    void executeAction(Transaction *trans,
+        ActionDisruptive *a,
         bool context);
 
     static void executeTransformation(
@@ -357,8 +367,8 @@ class RuleWithActions : public Rule {
     inline bool hasCaptureAction() const { return m_containsCaptureAction || m_defaultContainsCaptureAction; }
 
     inline bool hasDisruptiveAction() const { return m_disruptiveAction != nullptr || m_defaultActionDisruptiveAction != nullptr; }
-    inline void setDisruptiveAction(const std::shared_ptr<actions::Action> &a) { m_disruptiveAction = a; }
+    inline void setDisruptiveAction(const std::shared_ptr<ActionDisruptive> &a) { m_disruptiveAction = a; }
-    inline std::shared_ptr<actions::Action> getDisruptiveAction() const { return m_disruptiveAction; }
+    inline std::shared_ptr<ActionDisruptive> getDisruptiveAction() const { return m_disruptiveAction; }
 
     inline bool hasBlockAction() const { return m_containsStaticBlockAction || m_defaultContainsStaticBlockAction; }
     inline void setHasBlockAction(bool b) { m_containsStaticBlockAction = b; }
@@ -518,7 +528,7 @@ class RuleWithActions : public Rule {
     RuleWithActions *m_chainedRuleParent;
 
     /* actions */
-    std::shared_ptr<actions::Action> m_disruptiveAction;
+    std::shared_ptr<ActionDisruptive> m_disruptiveAction;
     std::shared_ptr<actions::LogData> m_logData;
     std::shared_ptr<actions::Msg> m_msg;
     MatchActions m_actionsRuntimePos;
@@ -527,9 +537,10 @@ class RuleWithActions : public Rule {
     XmlNSs m_XmlNSs;
 
     /* actions || SecDefaultAction */
-    std::shared_ptr<actions::Action> m_defaultActionDisruptiveAction;
+    std::shared_ptr<ActionDisruptive> m_defaultActionDisruptiveAction;
     std::shared_ptr<actions::LogData> m_defaultActionLogData;
     std::shared_ptr<actions::Msg> m_defaultActionMsg;
+
     MatchActions m_defaultActionActionsRuntimePos;
     SetVars m_defaultActionActionsSetVar;
     Tags m_defaultActionActionsTag;