Changes the operator evaluate method to only support two arguments

Second argument can be empty if there is not need for it.

src/operators/fuzzy_hash.cc

@@ -23,7 +23,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool FuzzyHash::evaluate(Assay *assay) {
+bool FuzzyHash::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator FuzzyHash.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#fuzzyhash

src/operators/fuzzy_hash.h

@@ -28,7 +28,7 @@ class FuzzyHash : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     FuzzyHash(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string &std) override;
 };
 
 }  // namespace operators

src/operators/gsblookup.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool GsbLookup::evaluate(Assay *assay) {
+bool GsbLookup::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator GeoLookup.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#gsblookup

src/operators/gsblookup.h

@@ -28,7 +28,7 @@ class GsbLookup : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     GsbLookup(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string &str);
 };
 
 }  // namespace operators

src/operators/inspect_file.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool InspectFile::evaluate(Assay *assay) {
+bool InspectFile::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator InspectFile.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#inspectfile

src/operators/inspect_file.h

@@ -28,7 +28,7 @@ class InspectFile : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     InspectFile(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay) override;
+    bool evaluate(Assay *assay, const std::string &str) override;
 };
 
 }  // namespace operators

src/operators/operator.cc

@@ -74,20 +74,6 @@ bool Operator::debug(Assay *assay, int x, std::string a) {
 }
 
 
-bool Operator::evaluate(Assay *assay) {
-#ifndef NO_LOGS
-    if (assay) {
-        assay->debug(2, "Operator: " + this->op + \
-            " is not implemented or malfunctioning.");
-    } else {
-        std::cerr << "Operator: " + this->op + \
-            " is not implemented or malfunctioning.";
-    }
-#endif
-    return true;
-}
-
-
 bool Operator::evaluate(Assay *assay, const std::string& a) {
 #ifndef NO_LOGS
     if (assay) {

src/operators/operator.h

@@ -44,7 +44,6 @@ class Operator {
         return true;
     }
 
-    virtual bool evaluate(Assay *assay);
     virtual bool evaluate(Assay *assay, const std::string &str);
     static Operator *instantiate(std::string op);
  protected:

src/operators/rbl.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool Rbl::evaluate(Assay *assay) {
+bool Rbl::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator Rbl.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#rbl

src/operators/rbl.h

@@ -29,7 +29,7 @@ class Rbl : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     Rbl(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 
 }  // namespace operators

src/operators/rsub.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool Rsub::evaluate(Assay *assay) {
+bool Rsub::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator Rsub.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#rsub

src/operators/rsub.h

@@ -28,7 +28,7 @@ class Rsub : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     Rsub(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 }  // namespace operators
 }  // namespace modsecurity

src/operators/validate_dtd.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool ValidateDTD::evaluate(Assay *assay) {
+bool ValidateDTD::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator ValidateDTD.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#validateDTD

src/operators/validate_dtd.h

@@ -28,7 +28,7 @@ class ValidateDTD : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     ValidateDTD(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 
 }  // namespace operators

src/operators/validate_hash.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool ValidateHash::evaluate(Assay *assay) {
+bool ValidateHash::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator ValidateHash.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#validateHash

src/operators/validate_hash.h

@@ -28,7 +28,7 @@ class ValidateHash : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     ValidateHash(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 
 }  // namespace operators

src/operators/validate_schema.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool ValidateSchema::evaluate(Assay *assay) {
+bool ValidateSchema::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator ValidateSchema.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#validateSchema

src/operators/validate_schema.h

@@ -28,7 +28,7 @@ class ValidateSchema : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     ValidateSchema(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 
 }  // namespace operators

src/operators/verify_cpf.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool VerifyCPF::evaluate(Assay *assay) {
+bool VerifyCPF::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator VerifyCPF.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#verifyCPF

src/operators/verify_cpf.h

@@ -28,7 +28,7 @@ class VerifyCPF : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     VerifyCPF(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 
 }  // namespace operators

src/operators/verify_ssn.cc

@@ -22,7 +22,7 @@
 namespace modsecurity {
 namespace operators {
 
-bool VerifySSN::evaluate(Assay *assay) {
+bool VerifySSN::evaluate(Assay *assay, const std::string &str) {
     /**
      * @todo Implement the operator VerifySSN.
      *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#verifySSN

src/operators/verify_ssn.h

@@ -29,7 +29,7 @@ class VerifySSN : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     VerifySSN(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string  &str) override;
 };
 
 }  // namespace operators