Makes RuleWithActions const in run time operations

Author: zimmerle

headers/modsecurity/rule.h

@@ -63,7 +63,7 @@ class Rule {
         return *this;
     }
 
-    virtual bool evaluate(Transaction *transaction) = 0;
+    virtual bool evaluate(Transaction *transaction) const = 0;
 
     std::shared_ptr<std::string> getFileName() const {
         return m_fileName;
@@ -76,11 +76,11 @@ class Rule {
     int getPhase() const { return m_phase; }
     void setPhase(int phase) { m_phase = phase; }
 
-    virtual std::string getReference() {
+    virtual std::string getReference() const {
         return *m_fileName + ":" + std::to_string(m_lineNumber);
     }
 
-    virtual void dump(std::stringstream &out) {
+    virtual void dump(std::stringstream &out) const {
         out << getOriginInTextFormat() << std::endl;
     }
 

headers/modsecurity/rule_message.h

@@ -113,8 +113,8 @@ class RuleMessage {
     static std::string _details(const RuleMessage *rm);
     static std::string _errorLogTail(const RuleMessage *rm);
 
-    RuleWithActions *getRule() const;
-    void setRule(RuleWithActions *rule);
+    const RuleWithActions *getRule() const;
+    void setRule(const RuleWithActions *rule);
     bool isSettle() const;
     int getRuleId() const;
     int getPhase() const;
@@ -144,7 +144,7 @@ class RuleMessage {
 
  private:
     Transaction *m_transaction;
-    RuleWithActions *m_rule;
+    const RuleWithActions *m_rule;
 };
 
 

headers/modsecurity/transaction.h

@@ -328,7 +328,7 @@ class TransactionRuleMessageManagement {
     RuleMessage *messageGetLast();
     void messageNew();
 
-    void logMatchLastRuleOnTheChain(RuleWithActions *rule);
+    void logMatchLastRuleOnTheChain(const RuleWithActions *rule);
 
     std::list<RuleMessage *> messageGetAll();
 

src/engine/lua.h

@@ -34,7 +34,8 @@ class LuaScriptBlob {
  public:
     LuaScriptBlob() :
         m_data(NULL),
-        m_len(0) { }
+        m_len(0)
+    { }
 
     ~LuaScriptBlob() {
         if (m_data) {

src/operators/begins_with.cc

@@ -25,7 +25,7 @@ namespace operators {
 
 
 bool BeginsWith::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     std::string p(m_string->evaluate(transaction));

src/operators/begins_with.h

@@ -33,7 +33,7 @@ class BeginsWith : public Operator {
         : Operator("BeginsWith", std::move(param)) { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/contains.cc

@@ -22,7 +22,7 @@ namespace modsecurity {
 namespace operators {
 
 bool Contains::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &input,
     RuleMessage *ruleMessage) {
     std::string p(m_string->evaluate(transaction));

src/operators/contains.h

@@ -36,7 +36,7 @@ class Contains : public Operator {
         : Operator("Contains", std::move(param)) { };
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/contains_word.cc

@@ -37,7 +37,7 @@ bool ContainsWord::acceptableChar(const bpstd::string_view &a, size_t pos) {
 }
 
 bool ContainsWord::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &inputView,
     RuleMessage *ruleMessage) {
     std::string paramTarget(m_string->evaluate(transaction));

src/operators/contains_word.h

@@ -33,7 +33,7 @@ class ContainsWord : public Operator {
         : Operator("ContainsWord", std::move(param)) { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 

src/operators/detect_sqli.cc

@@ -28,7 +28,7 @@ namespace operators {
 
 
 bool DetectSQLi::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &input,
     RuleMessage *ruleMessage) {
     char fingerprint[8];

src/operators/detect_sqli.h

@@ -33,7 +33,7 @@ class DetectSQLi : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/detect_xss.cc

@@ -27,7 +27,7 @@ namespace operators {
 
 
 bool DetectXSS::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &input,
     RuleMessage *ruleMessage) {
     int is_xss;

src/operators/detect_xss.h

@@ -32,7 +32,7 @@ class DetectXSS : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/ends_with.cc

@@ -24,7 +24,7 @@ namespace operators {
 
 
 bool EndsWith::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &input,
     RuleMessage *ruleMessage) {
     bool ret = false;

src/operators/ends_with.h

@@ -35,7 +35,7 @@ class EndsWith : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/eq.cc

@@ -25,7 +25,7 @@ namespace operators {
 
 
 bool Eq::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &input,
     RuleMessage *ruleMessage) {
     int p = 0;

src/operators/eq.h

@@ -33,7 +33,7 @@ class Eq : public Operator {
         : Operator("Eq", std::move(param)) { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/fuzzy_hash.cc

@@ -97,7 +97,7 @@ FuzzyHash::~FuzzyHash() {
 
 
 bool FuzzyHash::evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &str,
         RuleMessage *ruleMessage) {
 #ifdef WITH_SSDEEP

src/operators/fuzzy_hash.h

@@ -45,7 +45,7 @@ class FuzzyHash : public Operator {
     ~FuzzyHash();
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 

src/operators/ge.cc

@@ -24,7 +24,7 @@ namespace modsecurity {
 namespace operators {
 
 bool Ge::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     std::string p(m_string->evaluate(transaction));

src/operators/ge.h

@@ -34,7 +34,7 @@ class Ge : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/geo_lookup.cc

@@ -35,7 +35,7 @@ namespace operators {
 
 
 bool GeoLookup::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     using std::placeholders::_1;

src/operators/geo_lookup.h

@@ -31,7 +31,7 @@ class GeoLookup : public Operator {
         : Operator("GeoLookup") { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 

src/operators/gsblookup.cc

@@ -24,7 +24,7 @@ namespace operators {
 
 
 bool GsbLookup::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     /**

src/operators/gsblookup.h

@@ -32,7 +32,7 @@ class GsbLookup : public Operator {
         : Operator("GsbLookup", std::move(param)) { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/gt.cc

@@ -24,7 +24,7 @@ namespace modsecurity {
 namespace operators {
 
 bool Gt::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     std::string p(m_string->evaluate(transaction));

src/operators/gt.h

@@ -35,7 +35,7 @@ class Gt : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/inspect_file.cc

@@ -50,7 +50,7 @@ bool InspectFile::init(const std::string &param2, std::string *error) {
 
 
 bool InspectFile::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     if (m_isScript) {

src/operators/inspect_file.h

@@ -38,7 +38,7 @@ class InspectFile : public Operator {
     bool init(const std::string &file, std::string *error) override;
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 

src/operators/ip_match.cc

@@ -38,7 +38,7 @@ bool IpMatch::init(const std::string &file, std::string *error) {
 
 
 bool IpMatch::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     return m_tree.contains(str.c_str());

src/operators/ip_match.h

@@ -35,7 +35,7 @@ class IpMatch : public Operator {
         : Operator(n, std::move(param)) { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 

src/operators/le.cc

@@ -24,7 +24,7 @@ namespace modsecurity {
 namespace operators {
 
 bool Le::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     std::string p(m_string->evaluate(transaction));

src/operators/le.h

@@ -35,7 +35,7 @@ class Le : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/lt.cc

@@ -23,7 +23,7 @@ namespace modsecurity {
 namespace operators {
 
 bool Lt::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     std::string p(m_string->evaluate(transaction));

src/operators/lt.h

@@ -35,7 +35,7 @@ class Lt : public Operator {
         }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/no_match.cc

@@ -21,7 +21,7 @@ namespace modsecurity {
 namespace operators {
 
 bool NoMatch::evaluate(Transaction *transaction,
-    RuleWithActions *rule,
+    const RuleWithActions *rule,
     const bpstd::string_view &str,
     RuleMessage *ruleMessage) {
     return false;

src/operators/no_match.h

@@ -33,7 +33,7 @@ class NoMatch : public Operator {
         : Operator("NoMatch") { }
 
     bool evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) override;
 };

src/operators/operator.cc

@@ -70,7 +70,7 @@ namespace operators {
 
 
 bool Operator::evaluateInternal(Transaction *transaction,
-    RuleWithActions *rule, const bpstd::string_view &a, RuleMessage *rm) {
+    const RuleWithActions *rule, const bpstd::string_view &a, RuleMessage *rm) {
     bool res = evaluate(transaction, rule, a, rm);
 
     if (m_negation) {
@@ -110,7 +110,7 @@ std::string Operator::resolveMatchMessage(Transaction *t,
 
 
 bool Operator::evaluate(Transaction *transaction,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         const bpstd::string_view &input,
         RuleMessage *ruleMessage) {
     ms_dbg_a(transaction, 2, "Operator: " + m_op + \