Merge branch 'v3/master' into performance_tweaks

Author: edding3000

README.md

@@ -217,10 +217,8 @@ the utilities, follow the commands listed below:
 
 ```shell
 $ cd /path/to/your/ModSecurity
-$ git submodule foreach git pull
-$ cd test
-$ ./regression_tests
-$ ./unit_tests
+$ git submodule update --init --recursive
+$ make check
  ```
 
 ### Debugging

configure.ac

@@ -68,8 +68,7 @@ AC_MSG_ERROR([\
 
   You can download libInjection using git:
 
-     $ git submodule init
-     $ git submodule update
+     $ git submodule update --init --recursive
 
    ])
 fi
@@ -90,8 +89,7 @@ AC_MSG_ERROR([\
 
   You can download Mbed TLS using git:
 
-     $ git submodule init
-     $ git submodule update
+     $ git submodule update --init --recursive
 
    ])
 fi

headers/modsecurity/collection/collection.h

@@ -21,6 +21,7 @@
 #include <vector>
 #include <algorithm>
 #include <memory>
+#include <cstdint>
 #endif
 
 

src/engine/lua.h

@@ -36,6 +36,9 @@ class LuaScriptBlob {
         m_data(NULL),
         m_len(0) { }
 
+    LuaScriptBlob(const LuaScriptBlob&) = delete;
+    LuaScriptBlob& operator=(const LuaScriptBlob&) = delete;
+
     ~LuaScriptBlob() {
         if (m_data) {
             free(m_data);

src/operators/pm.h

@@ -40,6 +40,10 @@ class Pm : public Operator {
         : Operator(n, std::move(param)) {
         m_p = acmp_create(0);
     }
+
+    Pm(const Pm&) = delete;
+    Pm& operator=(const Pm&) = delete;
+
     ~Pm() override;
     bool evaluate(Transaction *transaction, RuleWithActions *rule,
         const std::string &str,

src/operators/rx.h

@@ -42,6 +42,9 @@ class Rx : public Operator {
             m_couldContainsMacro = true;
         }
 
+    Rx(const Rx&) = delete;
+    Rx& operator=(const Rx&) = delete;
+
     ~Rx() override {
         if (m_string->m_containsMacro == false && m_re != NULL) {
             delete m_re;

src/operators/rx_global.h

@@ -42,6 +42,9 @@ class RxGlobal : public Operator {
             m_couldContainsMacro = true;
         }
 
+    RxGlobal(const RxGlobal&) = delete;
+    RxGlobal& operator=(const RxGlobal&) = delete;
+
     ~RxGlobal() override {
         if (m_string->m_containsMacro == false && m_re != NULL) {
             delete m_re;

src/request_body_processor/multipart.h

@@ -150,6 +150,10 @@ class MultipartPart {
 class Multipart {
  public:
     Multipart(const std::string &header, Transaction *transaction);
+
+    Multipart(const Multipart&) = delete;
+    Multipart& operator=(const Multipart&) = delete;
+
     ~Multipart();
 
     bool init(std::string *err);

src/utils/ip_tree.h

@@ -31,6 +31,8 @@ namespace Utils {
 class IpTree {
  public:
     IpTree();
+    IpTree(const IpTree&) = delete;
+    IpTree& operator=(const IpTree&) = delete;
     ~IpTree();
 
     bool contains(const std::string &ip);

src/variables/rule.h

@@ -38,9 +38,9 @@ class Rule_DictElement : public VariableDictElement { \
         : VariableDictElement(m_rule, dictElement) { }
 
     static void id(Transaction *t,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         std::vector<const VariableValue *> *l) {
-        RuleWithActions *r = rule;
+        const RuleWithActions *r = rule;
 
         while (r && r->m_ruleId == 0) {
             r = r->m_chainedRuleParent;
@@ -72,9 +72,9 @@ class Rule_DictElement : public VariableDictElement { \
 
 
     static void severity(Transaction *t,
-        RuleWithActions *rule,
+        const RuleWithActions *rule,
         std::vector<const VariableValue *> *l) {
-        RuleWithActions *r = rule;
+        const RuleWithActions *r = rule;
 
         while (r && !r->hasSeverity()) {
             r = r->m_chainedRuleParent;