Refactoring: Place m_variables inside Collections

headers/modsecurity/assay.h

@@ -41,6 +41,7 @@ typedef struct Rules_t Rules;
 #include "modsecurity/intervention.h"
 #include "modsecurity/transaction/variable.h"
 #include "modsecurity/transaction/variables.h"
+#include "modsecurity/transaction/collections.h"
 
 #define LOGFY_ADD(a, b) \
     yajl_gen_string(g, reinterpret_cast<const unsigned char*>(a), strlen(a)); \
@@ -68,6 +69,7 @@ namespace ModSecurity {
 class ModSecurity;
 class Assay;
 class Rules;
+class Collections;
 namespace actions {
 class Action;
 }
@@ -140,15 +142,10 @@ class Assay {
 
     void cleanup();
 
-    void setCollection(const std::string& collectionName,
-        const std::string& variableName,
-        const std::string& targetValue);
-
     const char *getResponseBody();
     int getResponseBodyLenth();
 
-    transaction::Variables m_variables;
-    std::unordered_map<std::string, transaction::Variables *> collections;
+    transaction::Collections m_collections;
 #ifndef NO_LOGS
     void debug(int, std::string);
 #endif

headers/modsecurity/transaction/collections.h

@@ -0,0 +1,83 @@
+/*
+ * 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 <ctime>
+#include <iostream>
+#include <unordered_map>
+#include <fstream>
+#include <vector>
+#include <iomanip>
+#include <set>
+#include <cstdio>
+#include <string>
+#include <list>
+#endif
+
+#include "modsecurity/transaction/variables.h"
+#include "modsecurity/transaction/variable.h"
+
+#ifndef HEADERS_MODSECURITY_TRANSACTION_COLLECTIONS_H_
+#define HEADERS_MODSECURITY_TRANSACTION_COLLECTIONS_H_
+
+#ifndef __cplusplus
+typedef struct Variable_t Variable;
+#endif
+
+#ifdef __cplusplus
+namespace ModSecurity {
+namespace transaction {
+
+class Collections :
+    public std::unordered_map<std::string, transaction::Variables *> {
+ public:
+    Collections();
+    ~Collections();
+
+    void store(std::string key, std::string value);
+    void storeOrUpdateFirst(const std::string& collectionName,
+        const std::string& variableName,
+        const std::string& targetValue);
+    bool storeOrUpdateFirst(const std::string &key, const std::string &value);
+    bool updateFirst(const std::string &key, const std::string &value);
+    void del(const std::string& key);
+    std::string* resolveFirst(const std::string& var);
+    std::string* resolveFirst(const std::string& collectionName,
+        const std::string& var);
+
+    void resolve(const std::string& var,
+        std::list<transaction::Variable *> *l);
+    std::list<transaction::Variable *> *resolve(const std::string& var);
+
+
+    /**
+     * This is a special collection to host the transaction variables.
+     *
+     * It exists independent of initialization and it is only valid during a transaction.
+     *
+     * Notice that it is not the TX collection.
+     */
+    transaction::Variables m_transient;
+};
+
+}  // namespace transaction
+}  // namespace ModSecurity
+#endif
+
+
+#endif  // HEADERS_MODSECURITY_TRANSACTION_COLLECTIONS_H_
+
+

headers/modsecurity/transaction/variables.h

@@ -38,8 +38,6 @@ namespace transaction {
 class Variables :
     public std::unordered_multimap<std::string, std::string> {
  public:
-    std::unordered_map<std::string, transaction::Variables *> *m_collections;
-
     Variables();
     void store(std::string key, std::string value);
 
@@ -50,27 +48,14 @@ class Variables :
 
     void del(const std::string& key);
 
-    std::list<Variable *>
-        resolveInt(const std::string& key,
-        std::list<Variable *> *l);
-
-    std::list<Variable *>
-        resolveInt(const std::string& key);
-
-
     std::string* resolveFirst(const std::string& var);
 
-
     std::string* resolveFirst(const std::string& collectionName,
         const std::string& var);
 
-    void setCollections(std::unordered_map<std::string,
-        transaction::Variables *> *c);
+    std::list<transaction::Variable *> resolve(const std::string& key);
 
-    std::list<transaction::Variable *> *
-        resolve(const std::string& var);
-
-    void resolve(const std::string& var,
+    std::list<Variable *> resolve(const std::string& var,
         std::list<transaction::Variable *> *l);
 };