Adds support the variable rule

Issue #1016

src/actions/log_data.cc

@@ -29,13 +29,15 @@ namespace actions {
 
 
 bool LogData::evaluate(Rule *rule, Transaction *transaction, RuleMessage *rm) {
-    std::string data = MacroExpansion::expand(m_parser_payload, transaction);
-
-    rm->m_data = data;
+    rm->m_data = data(transaction);
 
     return true;
 }
 
+std::string LogData::data(Transaction *transaction) {
+    return MacroExpansion::expand(m_parser_payload, transaction);
+}
+
 
 }  // namespace actions
 }  // namespace modsecurity

src/actions/log_data.h

@@ -34,6 +34,8 @@ class LogData : public Action {
 
     bool evaluate(Rule *rule, Transaction *transaction,
         RuleMessage *rm) override;
+
+    std::string data(Transaction *Transaction);
 };
 
 

src/actions/msg.cc

@@ -53,11 +53,16 @@ bool Msg::evaluate(Rule *rule, Transaction *transaction) {
     transaction->debug(9, "Saving msg: " + msg);
 #endif
 
-    rule->m_log_message = msg;
+    rule->m_log_message = data(transaction);
 
     return true;
 }
 
 
+std::string Msg::data(Transaction *transaction) {
+    return MacroExpansion::expand(m_parser_payload, transaction);
+}
+
+
 }  // namespace actions
 }  // namespace modsecurity

src/actions/msg.h

@@ -33,6 +33,8 @@ class Msg : public Action {
         : Action(action, RunTimeOnlyIfMatchKind) { }
 
     bool evaluate(Rule *rule, Transaction *transaction) override;
+
+    std::string data(Transaction *Transaction);
 };
 
 

src/actions/severity.h

@@ -38,7 +38,6 @@ class Severity : public Action {
         RuleMessage *rm) override;
     bool init(std::string *error);
 
- private:
     int m_severity;
 };