Using run time string on the operators

Author: Felipe Zimmerle

headers/modsecurity/rule.h

@@ -68,7 +68,6 @@ class Rule {
         std::string value, std::shared_ptr<RuleMessage> rm);
     void executeActionsIndependentOfChainedRuleResult(Transaction *trasn,
         bool *b, std::shared_ptr<RuleMessage> ruleMessage);
-    std::string resolveMatchMessage(std::string key, std::string value);
     void updateMatchedVars(Transaction *trasn, std::string key,
         std::string value);
     void cleanMatchedVars(Transaction *trasn);

src/actions/disruptive/redirect.h

@@ -15,6 +15,7 @@
 
 #include <string>
 #include <memory>
+#include <utility>
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/rule_message.h"

src/actions/init_col.h

@@ -14,6 +14,8 @@
  */
 
 #include <string>
+#include <utility>
+#include <memory>
 
 #include "modsecurity/actions/action.h"
 #include "src/run_time_string.h"

src/actions/log_data.h

@@ -15,6 +15,7 @@
 
 #include <string>
 #include <memory>
+#include <utility>
 
 #include "modsecurity/actions/action.h"
 #include "src/run_time_string.h"

src/actions/msg.h

@@ -15,6 +15,7 @@
 
 #include <string>
 #include <memory>
+#include <utility>
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/rule_message.h"

src/actions/set_rsc.h

@@ -14,6 +14,8 @@
  */
 
 #include <string>
+#include <utility>
+#include <memory>
 
 #include "modsecurity/actions/action.h"
 #include "src/run_time_string.h"

src/actions/set_sid.h

@@ -14,6 +14,8 @@
  */
 
 #include <string>
+#include <utility>
+#include <memory>
 
 #include "modsecurity/actions/action.h"
 #include "src/run_time_string.h"

src/actions/set_uid.h

@@ -14,6 +14,8 @@
  */
 
 #include <string>
+#include <memory>
+#include <utility>
 
 #include "modsecurity/actions/action.h"
 #include "src/run_time_string.h"

src/actions/tag.h

@@ -15,6 +15,7 @@
 
 #include <string>
 #include <memory>
+#include <utility>
 
 #include "modsecurity/actions/action.h"
 #include "src/run_time_string.h"
@@ -31,9 +32,6 @@ namespace actions {
 
 class Tag : public Action {
  public:
-    explicit Tag(std::string action)
-        : Action(action, RunTimeOnlyIfMatchKind) { }
-
     explicit Tag(std::unique_ptr<RunTimeString> z)
         : Action("tag", RunTimeOnlyIfMatchKind),
         m_string(std::move(z)) { }
@@ -43,6 +41,7 @@ class Tag : public Action {
     bool evaluate(Rule *rule, Transaction *transaction,
         std::shared_ptr<RuleMessage> rm) override;
 
+ protected:
     std::unique_ptr<RunTimeString> m_string;
 };
 

src/operators/begins_with.cc

@@ -26,18 +26,16 @@ namespace operators {
 
 bool BeginsWith::evaluate(Transaction *transaction, Rule *rule,
     const std::string &str, std::shared_ptr<RuleMessage> ruleMessage) {
-    bool ret = false;
-
-    std::string p = MacroExpansion::expand(m_param, transaction);
+    std::string p(m_string->evaluate(transaction));
 
     if (str.size() < p.size()) {
-        ret = false;
+        return false;
     } else if (!str.compare(0, p.size(), p)) {
         logOffset(ruleMessage, 0, p.size());
-        ret = true;
+        return true;
     }
 
-    return ret;
+    return false;
 }