github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-01 03:57:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renames class Assay to Transaction

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-01-13 14:38:37 -03:00
parent f3fd5d6621
commit a51e707517
249 changed files with 2961 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/macro_expansion.cc
View File

@@ -14,7 +14,7 @@
*/
#include "src/macro_expansion.h"
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
@@ -22,8 +22,8 @@ MacroExpansion::MacroExpansion() { }
std::string MacroExpansion::expandKeepOriginal(const std::string& input,
Assay *assay) {
std::string a = MacroExpansion::expand(input, assay);
Transaction *transaction) {
std::string a = MacroExpansion::expand(input, transaction);
if (a != input) {
return "\"" + a + "\" (Was: " + input + ")";
@@ -33,7 +33,8 @@ std::string MacroExpansion::expandKeepOriginal(const std::string& input,
}
std::string MacroExpansion::expand(const std::string& input, Assay *assay) {
std::string MacroExpansion::expand(const std::string& input,
Transaction *transaction) {
std::string res;
size_t pos = input.find("%{");
@@ -53,12 +54,12 @@ std::string MacroExpansion::expand(const std::string& input, Assay *assay) {
std::string *variableValue;
size_t collection = variable.find(".");
if (collection == std::string::npos) {
variableValue = assay->m_collections.resolveFirst(variable);
variableValue = transaction->m_collections.resolveFirst(variable);
} else {
std::string col = std::string(variable, 0, collection);
std::string var = std::string(variable, collection + 1,
variable.length() - (collection + 1));
variableValue = assay->m_collections.resolveFirst(col, var);
variableValue = transaction->m_collections.resolveFirst(col, var);
}
res.erase(start, end - start + 2);