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>>.
92 lines
2.4 KiB
C++
92 lines
2.4 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 <string>
|
|
#include <cstring>
|
|
#include <iostream>
|
|
#include <unordered_map>
|
|
#include <list>
|
|
#include <vector>
|
|
#include <algorithm>
|
|
#include <memory>
|
|
#endif
|
|
|
|
#ifdef WITH_LMDB
|
|
#include <lmdb.h>
|
|
#include <semaphore.h>
|
|
#endif // WITH_LMDB
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
#include <pthread.h>
|
|
|
|
#include "modsecurity/variable_value.h"
|
|
#include "modsecurity/collection/collection.h"
|
|
#include "src/variables/variable.h"
|
|
|
|
#ifndef SRC_COLLECTION_BACKEND_LMDB_H_
|
|
#define SRC_COLLECTION_BACKEND_LMDB_H_
|
|
|
|
#ifdef WITH_LMDB
|
|
|
|
#ifdef __cplusplus
|
|
namespace modsecurity {
|
|
namespace collection {
|
|
namespace backend {
|
|
|
|
class LMDB :
|
|
public Collection {
|
|
public:
|
|
explicit LMDB(std::string name);
|
|
~LMDB();
|
|
void store(std::string key, std::string value) override;
|
|
|
|
bool storeOrUpdateFirst(const std::string &key,
|
|
const std::string &value) override;
|
|
|
|
bool updateFirst(const std::string &key,
|
|
const std::string &value) override;
|
|
|
|
void del(const std::string& key) override;
|
|
|
|
std::unique_ptr<std::string> resolveFirst(const std::string& var) override;
|
|
|
|
void resolveSingleMatch(const std::string& var,
|
|
std::vector<std::shared_ptr<const VariableValue>> *l) override;
|
|
void resolveMultiMatches(const std::string& var,
|
|
std::vector<std::shared_ptr<const VariableValue>> *l,
|
|
variables::KeyExclusions &ke) override;
|
|
void resolveRegularExpression(const std::string& var,
|
|
std::vector<std::shared_ptr<const VariableValue>> *l,
|
|
variables::KeyExclusions &ke) override;
|
|
|
|
private:
|
|
void string2val(const std::string& str, MDB_val *val);
|
|
void inline lmdb_debug(int rc, std::string op, std::string scope);
|
|
|
|
MDB_env *m_env;
|
|
};
|
|
|
|
} // namespace backend
|
|
} // namespace collection
|
|
} // namespace modsecurity
|
|
#endif
|
|
|
|
#endif // WITH_LMDB
|
|
|
|
#endif // SRC_COLLECTION_BACKEND_LMDB_H_
|