mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
47be22e62a
AnchoredSetVariable::resolve is called for every rule (see RuleWithOperator::evaluate). The previous implementation allocated a new copy of every variable, which quickly added up. In my tests, AnchoredSetVariable::resolve function consumed 7.8% of run time. AnchoredSetVariable (which is a multimap) values are never changed, only added. This means it's safe to store them in std::shared_ptr, and make resolve return shared_ptr pointing to the same object. Other resolve implementation could also use this optimization by not allocating new objects, however, they are not hot spots, so this optimization was not implemented there. In my benchmark, this raises performance from 117 requests per second to 131 RPS, and overhead is lowered from 7.8% to 2.4%. As a bonus, replacing plain pointer with smart pointers make code cleaner, since using smart pointers makes manual deletes no longer necessary. Additionally, VariableOrigin is now stored in plain std::vector, since it's wasteful to store structure containing just two integer values using std::list<std::unique_ptr<T>>.
122 lines
3.1 KiB
C++
122 lines
3.1 KiB
C++
/*
|
|
* ModSecurity, http://www.modsecurity.org/
|
|
* Copyright (c) 2015 - 2020 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 <ctime>
|
|
#include <fstream>
|
|
#include <iomanip>
|
|
#include <iostream>
|
|
#include <list>
|
|
#include <map>
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <unordered_map>
|
|
#include <utility>
|
|
#include <vector>
|
|
#include <algorithm>
|
|
#include <memory>
|
|
|
|
#include "modsecurity/string_view.hpp"
|
|
#endif
|
|
|
|
#include "modsecurity/variable_value.h"
|
|
|
|
|
|
#ifndef HEADERS_MODSECURITY_ANCHORED_SET_VARIABLE_H_
|
|
#define HEADERS_MODSECURITY_ANCHORED_SET_VARIABLE_H_
|
|
|
|
#ifdef __cplusplus
|
|
|
|
namespace modsecurity {
|
|
class Transaction;
|
|
namespace Utils {
|
|
class Regex;
|
|
}
|
|
namespace variables {
|
|
class KeyExclusions;
|
|
}
|
|
|
|
|
|
struct MyEqual {
|
|
bool operator()(const std::string& Left, const std::string& Right) const {
|
|
return Left.size() == Right.size()
|
|
&& std::equal(Left.begin(), Left.end(), Right.begin(),
|
|
[](char a, char b) {
|
|
return tolower(a) == tolower(b);
|
|
});
|
|
}
|
|
};
|
|
|
|
struct MyHash{
|
|
size_t operator()(const std::string& Keyval) const {
|
|
// You might need a better hash function than this
|
|
size_t h = 0;
|
|
std::for_each(Keyval.begin(), Keyval.end(), [&](char c) {
|
|
h += tolower(c);
|
|
});
|
|
return h;
|
|
}
|
|
};
|
|
|
|
|
|
class AnchoredSetVariable : public std::unordered_multimap<std::string,
|
|
std::shared_ptr<const VariableValue>, MyHash, MyEqual> {
|
|
public:
|
|
AnchoredSetVariable(Transaction *t, const std::string &name);
|
|
|
|
void unset();
|
|
|
|
void set(const std::string &key, const std::string &value,
|
|
size_t offset);
|
|
|
|
void set(const std::string &key, const bpstd::string_view &value,
|
|
size_t offset);
|
|
|
|
void set(const std::string &key, const char *value,
|
|
size_t offset);
|
|
|
|
void set(const std::string &key, const std::string &value,
|
|
size_t offset, size_t len);
|
|
|
|
void setCopy(std::string key, std::string value, size_t offset);
|
|
|
|
void resolve(std::vector<std::shared_ptr<const VariableValue>> *l);
|
|
void resolve(std::vector<std::shared_ptr<const VariableValue>> *l,
|
|
variables::KeyExclusions &ke);
|
|
|
|
void resolve(const std::string &key,
|
|
std::vector<std::shared_ptr<const VariableValue>> *l);
|
|
|
|
void resolveRegularExpression(Utils::Regex *r,
|
|
std::vector<std::shared_ptr<const VariableValue>> *l);
|
|
|
|
void resolveRegularExpression(Utils::Regex *r,
|
|
std::vector<std::shared_ptr<const VariableValue>> *l,
|
|
variables::KeyExclusions &ke);
|
|
|
|
std::unique_ptr<std::string> resolveFirst(const std::string &key);
|
|
|
|
Transaction *m_transaction;
|
|
std::string m_name;
|
|
};
|
|
|
|
} // namespace modsecurity
|
|
|
|
#endif
|
|
|
|
|
|
#endif // HEADERS_MODSECURITY_ANCHORED_SET_VARIABLE_H_
|
|
|