Moves rule* headers to src/

headers/modsecurity/actions/action.h

@@ -23,7 +23,6 @@
 
 #include "modsecurity/intervention.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
 
 #ifndef HEADERS_MODSECURITY_ACTIONS_ACTION_H_
 #define HEADERS_MODSECURITY_ACTIONS_ACTION_H_
@@ -32,7 +31,8 @@
 
 namespace modsecurity {
 class Transaction;
-class RuleWithOperator;
+class RuleWithActions;
+
 
 namespace actions {
 

headers/modsecurity/rules.h

@@ -27,28 +27,35 @@
 #endif
 
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_operator.h"
-#include "modsecurity/rule_with_actions.h"
+
 
 #ifndef HEADERS_MODSECURITY_RULES_H_
 #define HEADERS_MODSECURITY_RULES_H_
 
-
 #ifdef __cplusplus
 namespace modsecurity {
-
+namespace actions {
+namespace transformations {
+class Transformation;
+}
+}
 
 class Rules {
  public:
     void dump() const;
 
-    int append(Rules *from, const std::vector<int64_t> &ids, std::ostringstream *err);
+    int append(Rules *from,
+        const std::vector<int64_t> &ids,
+        std::ostringstream *err);
 
     bool insert(const std::shared_ptr<Rule> &rule);
 
-    bool insert(std::shared_ptr<Rule> rule, const std::vector<int64_t> *ids, std::ostringstream *err);
+    bool insert(std::shared_ptr<Rule> rule,
+        const std::vector<int64_t> *ids,
+        std::ostringstream *err);
 
     size_t size() const;
+
     std::shared_ptr<Rule> operator[](int index) const;
     std::shared_ptr<Rule> at(int index) const;
 
@@ -58,6 +65,8 @@ class Rules {
     std::vector<std::shared_ptr<actions::transformations::Transformation> > m_defaultTransformations;
 
     std::vector<std::shared_ptr<Rule> > m_rules;
+    void dump();
+
 };
 
 

headers/modsecurity/rules_set_phases.h

@@ -48,8 +48,8 @@ class RulesSetPhases {
     int append(RulesSetPhases *from, std::ostringstream *err);
     void dump() const;
 
-    Rules *operator[](int index) { return &m_rulesAtPhase[index]; }
-    Rules *at(int index) { return &m_rulesAtPhase[index]; }
+    Rules *operator[](int index);
+    Rules *at(int index);
 
  private:
     Rules m_rulesAtPhase[8];

src/actions/accuracy.cc

@@ -21,7 +21,8 @@
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
+
 
 namespace modsecurity {
 namespace actions {

src/actions/block.cc

@@ -24,7 +24,8 @@
 #include "modsecurity/rule.h"
 #include "modsecurity/intervention.h"
 #include "src/actions/data/status.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
+
 
 namespace modsecurity {
 namespace actions {

src/actions/chain.cc

@@ -20,7 +20,7 @@
 
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/actions/maturity.cc

@@ -21,7 +21,8 @@
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
+
 
 namespace modsecurity {
 namespace actions {

src/actions/phase.cc

@@ -22,7 +22,7 @@
 #include "modsecurity/rule.h"
 #include "modsecurity/modsecurity.h"
 #include "src/utils/string.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/actions/rev.cc

@@ -21,7 +21,7 @@
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/actions/rule_id.cc

@@ -20,7 +20,7 @@
 
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/actions/set_env.cc

@@ -21,7 +21,7 @@
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
 #include "src/utils/string.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/actions/set_var.cc

@@ -30,7 +30,8 @@
 #include "src/variables/tx.h"
 #include "src/variables/user.h"
 #include "src/variables/variable.h"
-#include "modsecurity/rule_with_operator.h"
+#include "src/rule_with_operator.h"
+
 
 namespace modsecurity {
 namespace actions {

src/actions/ver.cc

@@ -21,7 +21,7 @@
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/detect_sqli.cc

@@ -20,7 +20,7 @@
 
 #include "src/operators/operator.h"
 #include "others/libinjection/src/libinjection.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/detect_xss.cc

@@ -19,7 +19,7 @@
 
 #include "src/operators/operator.h"
 #include "others/libinjection/src/libinjection.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/pm.cc

@@ -28,7 +28,7 @@
 #include "src/operators/operator.h"
 #include "src/utils/acmp.h"
 #include "src/utils/string.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/rbl.cc

@@ -25,7 +25,7 @@
 
 #include "modsecurity/rules_set.h"
 #include "src/operators/operator.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/rx.cc

@@ -22,7 +22,7 @@
 #include "src/operators/operator.h"
 #include "modsecurity/rule.h"
 #include "modsecurity/rule_message.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/rx_global.cc

@@ -20,7 +20,7 @@
 #include <memory>
 
 #include "src/operators/operator.h"
-#include "modsecurity/rule.h"
+#include "src/rule_with_actions.h"
 #include "modsecurity/rule_message.h"
 
 namespace modsecurity {

src/operators/verify_cc.cc

@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "src/operators/operator.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 #if PCRE_HAVE_JIT

src/operators/verify_cpf.cc

@@ -19,7 +19,7 @@
 #include <list>
 
 #include "src/operators/operator.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/verify_ssn.cc

@@ -20,7 +20,7 @@
 #include <list>
 
 #include "src/operators/operator.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/operators/verify_svnr.cc

@@ -9,7 +9,7 @@
 #include "modsecurity/rule_message.h"
 #include "modsecurity/rules_set_properties.h"
 
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 namespace modsecurity {
 namespace operators {

src/parser/driver.cc

@@ -18,7 +18,7 @@
 #include "modsecurity/rules_set_properties.h"
 #include "src/parser/seclang-parser.hh"
 #include "modsecurity/audit_log.h"
-#include "modsecurity/rule_marker.h"
+#include "src/rule_marker.h"
 
 using modsecurity::audit_log::AuditLog;
 using modsecurity::RuleWithOperator;

src/parser/seclang-parser.hh

@@ -56,9 +56,9 @@ class Driver;
 }
 }
 
-#include "modsecurity/rule_unconditional.h"
-#include "modsecurity/rule_with_operator.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_unconditional.h"
+#include "src/rule_with_operator.h"
+#include "src/rule_with_actions.h"
 #include "src/rule_script.h"
 
 #include "src/actions/accuracy.h"

src/parser/seclang-parser.yy

@@ -17,9 +17,9 @@ class Driver;
 }
 }
 
-#include "modsecurity/rule_unconditional.h"
-#include "modsecurity/rule_with_operator.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_unconditional.h"
+#include "src/rule_with_operator.h"
+#include "src/rule_with_actions.h"
 #include "src/rule_script.h"
 
 #include "src/actions/accuracy.h"

src/rule_message.cc

@@ -20,7 +20,7 @@
 #include "modsecurity/transaction.h"
 #include "src/utils/string.h"
 #include "src/actions/tag.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/rule_script.h

@@ -32,7 +32,7 @@
 #include "src/actions/log_data.h"
 #include "src/actions/severity.h"
 #include "src/variables/variable.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 #ifndef SRC_RULE_SCRIPT_H_

src/rule_unconditional.cc

@@ -13,7 +13,7 @@
  *
  */
 
-#include "modsecurity/rule_unconditional.h"
+#include "src/rule_unconditional.h"
 
 
 namespace modsecurity {

src/rule_unconditional.h

@@ -22,15 +22,15 @@
 #include <utility>
 #endif
 
-#ifndef HEADERS_MODSECURITY_RULE_UNCONDITIONAL_H_
-#define HEADERS_MODSECURITY_RULE_UNCONDITIONAL_H_
+#ifndef SRC_RULE_UNCONDITIONAL_H_
+#define SRC_RULE_UNCONDITIONAL_H_
 
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/variable_value.h"
 #include "modsecurity/rule.h"
 #include "modsecurity/rules_set.h"
-#include "modsecurity/rule_with_actions.h"
 #include "modsecurity/actions/action.h"
+#include "src/rule_with_actions.h"
 
 #ifdef __cplusplus
 
@@ -60,4 +60,4 @@ class RuleUnconditional : public RuleWithActions {
 
 #endif
 
-#endif  // HEADERS_MODSECURITY_RULE_UNCONDITIONAL_H_
+#endif  // SRC_RULE_UNCONDITIONAL_H_

src/rule_with_actions.cc

@@ -29,7 +29,7 @@
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/rule_message.h"
 #include "modsecurity/rules_set.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 #include "src/actions/accuracy.h"
 #include "src/actions/block.h"
 #include "src/actions/capture.h"
@@ -360,10 +360,8 @@ void RuleWithActions::executeTransformations(
     int none = 0;
 
     ModSecString ssin;
-    ssin.assign(in.c_str());
-
-    TransformationResult a = TransformationResult(&ssin);
-    results.push_back(a);
+    ssin.assign(in.c_str(), in.size());
+    results.push_back(TransformationResult(&ssin));
 
 
     std::string path("");
@@ -418,8 +416,8 @@ void RuleWithActions::executeTransformations(
             + std::to_string(results.size()) + \
             " values to be tested.");
     } else {
-        results.pop_front();
-        results.push_back(TransformationResult(&ssin));
+        //results.push_back(TransformationResult(nullptr, ssin));
+        //results.pop_front();
     }
 */
 }
@@ -441,7 +439,7 @@ void RuleWithActions::executeTransformation(
 
 void RuleWithActions::executeTransformation(
     Transaction *transaction,
-    ModSecString in,
+    ModSecString &in,
     TransformationsResults *ret,
     Transformation *transformation) {
 

src/rule_with_actions.h

@@ -22,8 +22,8 @@
 #include <utility>
 #endif
 
-#ifndef HEADERS_MODSECURITY_RULE_WITH_ACTIONS_H_
-#define HEADERS_MODSECURITY_RULE_WITH_ACTIONS_H_
+#ifndef SRC_RULE_WITH_ACTIONS_H_
+#define SRC_RULE_WITH_ACTIONS_H_
 
 #include "modsecurity/transaction.h"
 #include "modsecurity/modsecurity.h"
@@ -223,7 +223,7 @@ class RuleWithActions : public Rule {
 
     static void executeTransformation(
         Transaction *transaction,
-        ModSecString in,
+        ModSecString &in,
         TransformationsResults *ret,
         Transformation *transformation);
 
@@ -545,4 +545,5 @@ class RuleWithActions : public Rule {
 #endif
 
 
-#endif  // HEADERS_MODSECURITY_RULE_WITH_ACTIONS_H_
+#endif  // SRC_RULE_WITH_ACTIONS_H_
+

src/rule_with_operator.cc

@@ -13,7 +13,6 @@
  *
  */
 
-#include "modsecurity/rule_with_operator.h"
 
 #include <stdio.h>
 
@@ -41,6 +40,7 @@
 #include "src/actions/set_var.h"
 #include "src/actions/block.h"
 #include "src/variables/variable.h"
+#include "src/rule_with_operator.h"
 
 
 namespace modsecurity {
@@ -265,6 +265,7 @@ bool RuleWithOperator::evaluate(Transaction *trans) {
         }
         var->evaluate(trans, this, &e);
         for (const VariableValue *v : e) {
+            TransformationsResults transformationsResults;
             const std::string &value = v->getValue();
             const std::string &key = v->getKeyWithCollection();
 
@@ -291,8 +292,6 @@ bool RuleWithOperator::evaluate(Transaction *trans) {
                 continue;
             }
 
-            TransformationsResults transformationsResults;
-
             executeTransformations(trans, value, transformationsResults);
 
             auto iter = transformationsResults.begin();
@@ -303,8 +302,8 @@ bool RuleWithOperator::evaluate(Transaction *trans) {
             while (iter != transformationsResults.end()) {
                 bool ret;
                 auto &valueTemp = *iter;
-                // FIXME: this copy is not necessary.
-                std::string *valueAfterTrans = new std::string(valueTemp.getAfter()->c_str());
+                // FIXME: this copy is not necessary.                
+                std::string *valueAfterTrans = new std::string(valueTemp.getAfter()->c_str(), valueTemp.getAfter()->size());
 
                 ret = executeOperatorAt(trans, key, *valueAfterTrans);
 
@@ -315,6 +314,7 @@ bool RuleWithOperator::evaluate(Transaction *trans) {
                     for (auto &i : v->getOrigin()) {
                         trans->messageGetLast()->m_reference.append(i->toText());
                     }
+
                     auto iter2 = transformationsResults.begin();
                     while (iter2 != transformationsResults.end()) {
                         if (iter2->getTransformationName()) {
@@ -323,8 +323,8 @@ bool RuleWithOperator::evaluate(Transaction *trans) {
                         /*
                         if (iter == iter2) {
                             break;
-                        } else {
-                            trans->messageGetLast()->m_reference.append("--");
+                        } else if (iter2->getTransformationName()) {
+                            trans->messageGetLast()->m_reference.append(",");
                         }
                         */
                         iter2++;

src/rule_with_operator.h

@@ -22,20 +22,19 @@
 #include <utility>
 #endif
 
-#ifndef HEADERS_MODSECURITY_RULE_WITH_OPERATOR_H_
-#define HEADERS_MODSECURITY_RULE_WITH_OPERATOR_H_
+#ifndef SRC_RULE_WITH_OPERATOR_H_
+#define SRC_RULE_WITH_OPERATOR_H_
 
 #include "modsecurity/transaction.h"
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/variable_value.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 #ifdef __cplusplus
 
 namespace modsecurity {
 
-using TransformationsResults = std::list<TransformationResult>;
 
 class RuleWithOperator : public RuleWithActions {
  public:
@@ -91,4 +90,5 @@ class RuleWithOperator : public RuleWithActions {
 #endif
 
 
-#endif  // HEADERS_MODSECURITY_RULE_WITH_OPERATOR_H_
+#endif  // SRC_RULE_WITH_OPERATOR_H_
+

src/rules.cc

@@ -14,7 +14,7 @@
  */
 
 #include "modsecurity/rules.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {

src/rules_set.cc

@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "modsecurity/rules_set.h"
-#include "modsecurity/rule_marker.h"
+#include "src/rule_marker.h"
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/transaction.h"
 #include "src/parser/driver.h"

src/rules_set_phases.cc

@@ -13,17 +13,8 @@
  *
  */
 
-#include <ctime>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <vector>
-
 #include "modsecurity/rules_set_phases.h"
-#include "modsecurity/rule.h"
-#include "modsecurity/rules.h"
-#include "modsecurity/modsecurity.h"
-
+#include "src/rule_with_operator.h"
 
 
 namespace modsecurity {
@@ -47,6 +38,7 @@ int RulesSetPhases::append(RulesSetPhases *from, std::ostringstream *err) {
         v.reserve(m_rulesAtPhase[i].size());
         for (size_t z = 0; z < m_rulesAtPhase[i].size(); z++) {
             RuleWithOperator *rule_ckc = dynamic_cast<RuleWithOperator *>(m_rulesAtPhase[i].at(z).get());
+            //RuleWithOperator *rule_ckc = dynamic_cast<RuleWithOperator *>(m_rulesAtPhase->at(i).get());
             if (!rule_ckc) {
                 continue;
             }
@@ -62,7 +54,6 @@ int RulesSetPhases::append(RulesSetPhases *from, std::ostringstream *err) {
         }
         amount_of_rules = amount_of_rules + res;
 
-
         /**
          * An action set in a child will overwrite an action set on a parent.
          *
@@ -91,6 +82,7 @@ int RulesSetPhases::append(RulesSetPhases *from, std::ostringstream *err) {
 
 void RulesSetPhases::dump() const {
     for (int i = 0; i <= modsecurity::Phases::NUMBER_OF_PHASES; i++) {
+        const Rules *rules = &m_rulesAtPhase[i];
         std::cout << "Phase: " << std::to_string(i);
         std::cout << " (" << std::to_string(m_rulesAtPhase[i].size());
         std::cout << " rules)" << std::endl;
@@ -99,5 +91,14 @@ void RulesSetPhases::dump() const {
 }
 
 
-}  // namespace modsecurity
+Rules *RulesSetPhases::operator[](int index) {
+    return &m_rulesAtPhase[index];
+}
 
+
+Rules *RulesSetPhases::at(int index) {
+    return &m_rulesAtPhase[index];
+}
+
+
+}  // namespace modsecurity

src/run_time_string.cc

@@ -25,7 +25,7 @@
 #include "src/variables/highest_severity.h"
 #include "src/utils/string.h"
 #include "src/variables/variable.h"
-#include "modsecurity/rule_with_operator.h"
+#include "src/rule_with_operator.h"
 
 
 namespace modsecurity {

src/transaction.cc

@@ -52,6 +52,7 @@
 #include "modsecurity/rules_set_properties.h"
 #include "src/actions/disruptive/allow.h"
 #include "src/variables/remote_user.h"
+#include "src/rule_with_actions.h"
 
 
 

src/variables/rule.h

@@ -24,7 +24,8 @@
 #include "src/actions/severity.h"
 #include "src/actions/log_data.h"
 #include "src/actions/msg.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
+
 
 namespace modsecurity {
 

src/variables/xml.cc

@@ -42,7 +42,7 @@
 #include "src/request_body_processor/xml.h"
 #include "modsecurity/actions/action.h"
 #include "src/actions/xmlns.h"
-#include "modsecurity/rule_with_actions.h"
+#include "src/rule_with_actions.h"
 
 
 namespace modsecurity {