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.
132 lines
2.9 KiB
C++
132 lines
2.9 KiB
C++
/*
|
|
* ModSecurity, http://www.modsecurity.org/
|
|
* Copyright (c) 2015 - 2023 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 <memory>
|
|
#include <vector>
|
|
#include <utility>
|
|
#endif
|
|
|
|
#include "modsecurity/variable_origin.h"
|
|
|
|
#ifndef HEADERS_MODSECURITY_VARIABLE_VALUE_H_
|
|
#define HEADERS_MODSECURITY_VARIABLE_VALUE_H_
|
|
|
|
#ifndef __cplusplus
|
|
typedef struct Variable_t VariableValue;
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
namespace modsecurity {
|
|
|
|
class Collection;
|
|
class VariableValue {
|
|
public:
|
|
using Origins = std::vector<VariableOrigin>;
|
|
|
|
explicit VariableValue(const std::string *key,
|
|
const std::string *value = nullptr)
|
|
: m_collection(""),
|
|
m_key(*key),
|
|
m_keyWithCollection(*key),
|
|
m_value(value != nullptr?*value:"")
|
|
{ }
|
|
|
|
VariableValue(const std::string *collection,
|
|
const std::string *key,
|
|
const std::string *value)
|
|
: m_collection(*collection),
|
|
m_key(*key),
|
|
m_keyWithCollection(*collection + ":" + *key),
|
|
m_value(*value)
|
|
{ }
|
|
|
|
explicit VariableValue(const VariableValue *o) :
|
|
m_collection(o->m_collection),
|
|
m_key(o->m_key),
|
|
m_keyWithCollection(o->m_keyWithCollection),
|
|
m_value(o->m_value)
|
|
{
|
|
reserveOrigin(o->m_orign.size());
|
|
for (const auto &i : o->m_orign) {
|
|
addOrigin(i);
|
|
}
|
|
}
|
|
|
|
VariableValue(const VariableValue &v) = delete;
|
|
|
|
|
|
const std::string& getKey() const {
|
|
return m_key;
|
|
}
|
|
|
|
|
|
const std::string& getKeyWithCollection() const {
|
|
return m_keyWithCollection;
|
|
}
|
|
|
|
|
|
const std::string& getCollection() const {
|
|
return m_collection;
|
|
}
|
|
|
|
|
|
const std::string& getValue() const {
|
|
return m_value;
|
|
}
|
|
|
|
|
|
void setValue(const std::string &value) {
|
|
m_value = value;
|
|
}
|
|
|
|
|
|
void addOrigin(const VariableOrigin &origin) {
|
|
m_orign.emplace_back(origin);
|
|
}
|
|
|
|
|
|
template<typename... Args>
|
|
void addOrigin(Args&&... args) {
|
|
m_orign.emplace_back(args...);
|
|
}
|
|
|
|
|
|
const Origins& getOrigin() const {
|
|
return m_orign;
|
|
}
|
|
|
|
|
|
void reserveOrigin(Origins::size_type additionalSize) {
|
|
m_orign.reserve(m_orign.size() + additionalSize);
|
|
}
|
|
|
|
|
|
private:
|
|
Origins m_orign;
|
|
std::string m_collection;
|
|
std::string m_key;
|
|
std::string m_keyWithCollection;
|
|
std::string m_value;
|
|
};
|
|
|
|
} // namespace modsecurity
|
|
#endif
|
|
|
|
#endif // HEADERS_MODSECURITY_VARIABLE_VALUE_H_
|