Refactoring: rename evaluate to execute on actions

Author: zimmerle

headers/modsecurity/actions/action.h

@@ -66,12 +66,12 @@ class Action {
 
     virtual ~Action() { }
 
-    virtual std::string evaluate(const std::string &exp,
+    virtual std::string execute(const std::string &exp,
         Transaction *transaction);
-    virtual bool evaluate(RuleWithActions *rule, Transaction *transaction);
-    virtual bool evaluate(RuleWithActions *rule, Transaction *transaction,
+    virtual bool execute(RuleWithActions *rule, Transaction *transaction);
+    virtual bool execute(RuleWithActions *rule, Transaction *transaction,
         RuleMessage &ruleMessage) {
-        return evaluate(rule, transaction);
+        return execute(rule, transaction);
     }
     virtual bool init(std::string *error) { return true; }
     virtual bool isDisruptive() { return false; }

src/actions/accuracy.cc

@@ -39,7 +39,8 @@ bool Accuracy::init(std::string *error) {
 }
 
 
-bool Accuracy::evaluate(RuleWithActions *rule, Transaction *transaction) {
+bool Accuracy::execute(RuleWithActions *rule, Transaction *transaction) {
+    rule->setAccuracy(m_accuracy);
     return true;
 }
 

src/actions/accuracy.h

@@ -33,7 +33,7 @@ class Accuracy : public Action {
         : Action(action, ConfigurationKind),
         m_accuracy(0) { }
 
-    bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
+    bool execute(RuleWithActions *rule, Transaction *transaction) override;
     bool init(std::string *error) override;
     int getAccuracy() const { return m_accuracy; }
 

src/actions/action.cc

@@ -45,13 +45,13 @@ namespace modsecurity {
 namespace actions {
 
 
-std::string Action::evaluate(const std::string &value,
+std::string Action::execute(const std::string &value,
     Transaction *transaction) {
     return value;
 }
 
 
-bool Action::evaluate(RuleWithActions *rule, Transaction *transaction) {
+bool Action::execute(RuleWithActions *rule, Transaction *transaction) {
     return true;
 }
 

src/actions/audit_log.cc

@@ -27,7 +27,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool AuditLog::evaluate(RuleWithActions *rule, Transaction *transaction,
+bool AuditLog::execute(RuleWithActions *rule, Transaction *transaction,
     RuleMessage &rm) {
     transaction->messageSetNoAuditLog(false);
     return true;

src/actions/audit_log.h

@@ -35,7 +35,7 @@ class AuditLog : public Action {
     explicit AuditLog(const std::string &action) 
         : Action(action, RunTimeOnlyIfMatchKind) { }
 
-    bool evaluate(RuleWithActions *rule, Transaction *transaction,
+    bool execute(RuleWithActions *rule, Transaction *transaction,
         RuleMessage &rm) override;
 };
 

src/actions/block.cc

@@ -29,7 +29,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool Block::evaluate(RuleWithActions *rule, Transaction *transaction,
+bool Block::execute(RuleWithActions *rule, Transaction *transaction,
     RuleMessage &rm) {
     ms_dbg_a(transaction, 8, "Marking request as disruptive.");
     return true;

src/actions/block.h

@@ -38,7 +38,7 @@ class Block : public Action {
     Block(const Block &a) = delete;
     Block &operator=(const Block &a) = delete;
 
-    bool evaluate(RuleWithActions *rule, Transaction *transaction,
+    bool execute(RuleWithActions *rule, Transaction *transaction,
         RuleMessage &rm) override;
 };
 

src/actions/capture.cc

@@ -32,7 +32,7 @@ namespace modsecurity {
 namespace actions {
 
 
-bool Capture::evaluate(RuleWithActions *rule, Transaction *transaction) {
+bool Capture::execute(RuleWithActions *rule, Transaction *transaction) {
     return true;
 }
 

src/actions/capture.h

@@ -31,7 +31,7 @@ class Capture : public Action {
     explicit Capture(const std::string &action) 
         : Action(action, RunTimeOnlyIfMatchKind) { }
 
-    bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
+    bool execute(RuleWithActions *rule, Transaction *transaction) override;
 };