First version of global' and ip' collections

headers/modsecurity/modsecurity.h

@@ -93,6 +93,7 @@ typedef struct ModSecurity_t modsecurity;
 #include "modsecurity/transaction.h"
 #include "modsecurity/debug_log.h"
 #include "modsecurity/rules.h"
+#include "modsecurity/transaction/global_variables.h"
 
 /**
  * TAG_NUM:
@@ -222,6 +223,8 @@ class ModSecurity {
      NUMBER_OF_PHASES,
     };
 
+    transaction::GlobalVariables m_global_collection;
+    transaction::GlobalVariables m_ip_collection;
  private:
     std::string m_connector;
     LogCb m_logCb;

headers/modsecurity/transaction/collections.h

@@ -27,6 +27,7 @@
 #include <list>
 #endif
 
+#include "modsecurity/transaction/global_variables.h"
 #include "modsecurity/transaction/variables.h"
 #include "modsecurity/transaction/variable.h"
 #include "modsecurity/transaction/collection.h"
@@ -45,7 +46,7 @@ namespace transaction {
 class Collections :
     public std::unordered_map<std::string, Collection *> {
  public:
-    Collections();
+    Collections(GlobalVariables *global, GlobalVariables *ip);
     ~Collections();
 
     void init(const std::string& name, const std::string& key);
@@ -84,6 +85,12 @@ class Collections :
      * Notice that it is not the TX collection.
      */
     transaction::Variables m_transient;
+
+    std::string m_global_collection_key;
+    std::string m_ip_collection_key;
+
+    transaction::GlobalVariables *m_global_collection;
+    transaction::GlobalVariables *m_ip_collection;
 };
 
 }  // namespace transaction

headers/modsecurity/transaction/global_variables.h

@@ -0,0 +1,119 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+
+#ifdef __cplusplus
+#include <string>
+#include <iostream>
+#include <unordered_map>
+#include <list>
+#include <vector>
+#include <algorithm>
+#endif
+
+
+#include "modsecurity/transaction/variable.h"
+
+#ifndef HEADERS_MODSECURITY_TRANSACTION_GLOBAL_VARIABLES_H_
+#define HEADERS_MODSECURITY_TRANSACTION_GLOBAL_VARIABLES_H_
+
+#ifndef __cplusplus
+typedef struct Variable_t Variables;
+#endif
+
+#ifdef __cplusplus
+namespace modsecurity {
+namespace transaction {
+
+
+class CollectionKey {
+ public:
+    CollectionKey()
+        : m_compartiment(""),
+        m_name("") { };
+    CollectionKey(std::string name)
+        : m_compartiment(""),
+        m_name(name) { };
+    CollectionKey(std::string name, std::string compartiment)
+        : m_compartiment(compartiment),
+        m_name(name) { };
+
+    std::string m_name;
+    std::string m_compartiment;
+};
+
+
+class collection_hash
+{
+public:
+    size_t operator()(const CollectionKey *v) const
+    {
+        size_t h = 0;
+        std::for_each(v->m_name.begin(), v->m_name.end(), [&](char c) {
+            h += tolower(c);
+        });
+        std::for_each(v->m_compartiment.begin(), v->m_compartiment.end(), [&](char c) {
+            h += tolower(c);
+        });
+
+        return h;
+    };
+};
+
+
+class collection_equal
+{
+public:
+    bool operator()(const CollectionKey *u, const CollectionKey *v) const
+    {
+        return u->m_name == v->m_name && u->m_compartiment == v->m_compartiment;
+    };
+};
+
+
+class GlobalVariables :
+    public std::unordered_multimap<CollectionKey *, std::string,
+        collection_hash, collection_equal> {
+ public:
+    GlobalVariables();
+    ~GlobalVariables();
+    void store(std::string key, std::string compartment, std::string value);
+
+    bool storeOrUpdateFirst(const std::string &key, std::string compartment,
+        const std::string &value);
+
+    bool updateFirst(const std::string &key, std::string compartment,
+        const std::string &value);
+
+    void del(const std::string& key, std::string compartment);
+
+    std::string* resolveFirst(const std::string& var, std::string compartment);
+    void resolveSingleMatch(const std::string& var, std::string compartment,
+        std::vector<const transaction::Variable *> *l);
+    void resolveMultiMatches(const std::string& var, std::string compartment,
+        std::vector<const transaction::Variable *> *l);
+
+    void resolveRegularExpression(const std::string& var, std::string compartment,
+        std::vector<const transaction::Variable *> *l);
+
+
+};
+
+}  // namespace transaction
+}  // namespace modsecurity
+#endif
+
+
+#endif  // HEADERS_MODSECURITY_TRANSACTION_GLOBAL_VARIABLES_H_