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

Having RunTimeString in a better shape

Browse Source 
This is an effort towards better understanding the issues
reported on #2376
This commit is contained in:
Felipe Zimmerle
2020-08-20 14:16:26 -03:00
parent f5b6df5abd
commit 5a7f3b97a2
5 changed files with 121 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/run_time_string.cc
View File

@@ -31,38 +31,22 @@
namespace modsecurity {
void RunTimeString::appendText(const std::string &text) {
std::unique_ptr<RunTimeElementHolder> r(new RunTimeElementHolder);
r->m_string = text;
m_elements.push_back(std::move(r));
void RunTimeString::append(const std::string &text) {
m_elements.emplace_back(new ElementHolder(text));
}
void RunTimeString::appendVar(
std::unique_ptr<modsecurity::variables::Variable> var) {
std::unique_ptr<RunTimeElementHolder> r(new RunTimeElementHolder);
r->m_variable = std::move(var);
m_elements.push_back(std::move(r));
void RunTimeString::append(std::unique_ptr<Variable> var) {
m_elements.emplace_back(new ElementHolder(std::move(var)));
m_containsMacro = true;
}
std::string RunTimeString::evaluate(Transaction *transaction) {
std::string RunTimeString::evaluate(/* const */ Transaction *transaction) const noexcept {
std::string retString;
// FIXME: Educated guess the size of retString based on the size of the elements.
for (auto &element : m_elements) {
if (element->m_string.size() > 0) {
retString.append(element->m_string);
} else if (element->m_variable != nullptr && transaction != nullptr) {
std::vector<const VariableValue *> l;
element->m_variable->evaluate(transaction, &l);
if (!l.empty()) {
retString.append(l[0]->getValue());
}
for (auto &i : l) {
delete i;
}
}
element->appendValueTo(transaction, retString);
}
return retString;
}