github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-16 17:41:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renames collection::Variable to VariableValue

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-02-02 18:50:04 -03:00
parent de7c5c89bb
commit eeec7efb68
137 changed files with 304 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/anchored_set_variable.cc
View File

@@ -13,14 +13,13 @@
*
*/
#include "modsecurity/anchored_set_variable.h"
#include <ctime>
#include <iostream>
#include <fstream>
#include <string>
#include <vector>
#include "modsecurity/anchored_set_variable.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/transaction.h"
#include "src/utils/regex.h"
@@ -42,7 +41,7 @@ AnchoredSetVariable::~AnchoredSetVariable() {
void AnchoredSetVariable::unset() {
for (const auto& x : *this) {
collection::Variable *var = x.second;
VariableValue *var = x.second;
delete var;
}
clear();
@@ -53,7 +52,7 @@ void AnchoredSetVariable::set(const std::string &key,
const std::string &value, size_t offset, size_t len) {
std::unique_ptr<VariableOrigin> origin(new VariableOrigin());
std::string *v = new std::string(value);
collection::Variable *var = new collection::Variable(std::make_shared<std::string>(m_name + ":" + key), v);
VariableValue *var = new VariableValue(std::make_shared<std::string>(m_name + ":" + key), v);
delete v;
origin->m_offset = offset;
@@ -68,7 +67,7 @@ void AnchoredSetVariable::set(const std::string &key,
const std::string &value, size_t offset) {
std::unique_ptr<VariableOrigin> origin(new VariableOrigin());
std::string *v = new std::string(value);
collection::Variable *var = new collection::Variable(std::make_shared<std::string>(m_name + ":" + key), v);
VariableValue *var = new VariableValue(std::make_shared<std::string>(m_name + ":" + key), v);
delete v;
origin->m_offset = offset;
@@ -80,18 +79,18 @@ void AnchoredSetVariable::set(const std::string &key,
void AnchoredSetVariable::resolve(
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
for (const auto& x : *this) {
l->insert(l->begin(), new collection::Variable(x.second));
l->insert(l->begin(), new VariableValue(x.second));
}
}
void AnchoredSetVariable::resolve(const std::string &key,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
auto range = this->equal_range(key);
for (auto it = range.first; it != range.second; ++it) {
l->push_back(new collection::Variable(it->second));
l->push_back(new VariableValue(it->second));
}
}
@@ -109,13 +108,13 @@ std::unique_ptr<std::string> AnchoredSetVariable::resolveFirst(
void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
std::vector<const collection::Variable *> *l) {
std::vector<const VariableValue *> *l) {
for (const auto& x : *this) {
int ret = Utils::regex_search(x.first, *r);
if (ret <= 0) {
continue;
}
l->insert(l->begin(), new collection::Variable(x.second));
l->insert(l->begin(), new VariableValue(x.second));
}
}