mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
dc0a06fc70
- The previous approach would create a std::unique_ptr and store it in
a std::list in VariableValue (Origins)
- The new approach now stores Origins in a std::vector and constructs
VariableOrigin elements in-place on insertion.
- Instead of having two heap-allocations for every added VariableOrigin
instance, this performs only one.
- If multiple origins are added, std::vector's growth strategy may even
prevent a heap-allocation. There's a cost on growing the size of the
vector, because a copy of current elements will be necessary.
- Introduced reserveOrigin method to notify that multiple insertions
will be made, so that we can use std::vector's reserve and do a
single allocation (and copy of previous elements), and then just
initialize the new elements in-place.
121 lines
2.7 KiB
C++
121 lines
2.7 KiB
C++
/*
|
|
* ModSecurity, http://www.modsecurity.org/
|
|
* Copyright (c) 2015 - 2021 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.
|
|
*
|
|
*/
|
|
|
|
#include <ctime>
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "../headers/modsecurity/anchored_variable.h"
|
|
#include "modsecurity/modsecurity.h"
|
|
#include "modsecurity/transaction.h"
|
|
#include "src/utils/regex.h"
|
|
|
|
namespace modsecurity {
|
|
|
|
|
|
AnchoredVariable::AnchoredVariable(Transaction *t,
|
|
const std::string &name)
|
|
: m_transaction(t),
|
|
m_offset(0),
|
|
m_name(""),
|
|
m_value(""),
|
|
m_var(NULL) {
|
|
m_name.append(name);
|
|
m_var = new VariableValue(&m_name);
|
|
}
|
|
|
|
|
|
AnchoredVariable::~AnchoredVariable() {
|
|
if (m_var) {
|
|
delete (m_var);
|
|
m_var = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
void AnchoredVariable::unset() {
|
|
m_value.clear();
|
|
}
|
|
|
|
|
|
void AnchoredVariable::set(const std::string &a, size_t offset,
|
|
size_t offsetLen) {
|
|
m_offset = offset;
|
|
m_value.assign(a.c_str(), a.size());
|
|
m_var->addOrigin(offsetLen, offset);
|
|
}
|
|
|
|
|
|
void AnchoredVariable::set(const std::string &a, size_t offset) {
|
|
m_offset = offset;
|
|
m_value.assign(a.c_str(), a.size());
|
|
m_var->addOrigin(m_value.size(), offset);
|
|
}
|
|
|
|
|
|
void AnchoredVariable::append(const std::string &a, size_t offset,
|
|
bool spaceSeparator) {
|
|
if (spaceSeparator && !m_value.empty()) {
|
|
m_value.append(" " + a);
|
|
} else {
|
|
m_value.append(a);
|
|
}
|
|
m_offset = offset;
|
|
m_var->addOrigin(a.size(), offset);
|
|
}
|
|
|
|
|
|
void AnchoredVariable::append(const std::string &a, size_t offset,
|
|
bool spaceSeparator, size_t size) {
|
|
if (spaceSeparator && !m_value.empty()) {
|
|
m_value.append(" " + a);
|
|
} else {
|
|
m_value.append(a);
|
|
}
|
|
m_offset = offset;
|
|
m_var->addOrigin({size, offset});
|
|
}
|
|
|
|
|
|
void AnchoredVariable::evaluate(std::vector<const VariableValue *> *l) {
|
|
if (m_name.empty()) {
|
|
return;
|
|
}
|
|
|
|
m_var->setValue(m_value);
|
|
VariableValue *m_var2 = new VariableValue(m_var);
|
|
l->push_back(m_var2);
|
|
}
|
|
|
|
|
|
std::string * AnchoredVariable::evaluate() {
|
|
return &m_value;
|
|
}
|
|
|
|
|
|
std::unique_ptr<std::string> AnchoredVariable::resolveFirst() {
|
|
if (m_value.empty()) {
|
|
return nullptr;
|
|
}
|
|
std::unique_ptr<std::string> a(new std::string());
|
|
a->append(m_value);
|
|
return a;
|
|
}
|
|
|
|
|
|
} // namespace modsecurity
|