mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-10-02 04:27:47 +03:00
Avoid passing RuleMessage by std::shared_ptr and use a reference instead.
- Avoids copying std::shared_ptr when lifetime of the RuleMessage is controlled by the caller. - The RuleMessage instance is created in RuleWithActions::evaluate and then used to call the overloaded version of this method that is specialized by subclasses. - Once the call to the overloaded method returns, the std::shared_ptr is destroyed as it's not stored by any of the callers, so it can be replaced with a stack variable and avoid paying the cost of copying the std::shared_ptr (and its control block that is guaranteed to be thread-safe and thus is not a straightforward pointer copy) - Introduced RuleMessage::reset because this is required by RuleWithActions::performLogging when it's not the 'last log', the rule has multimatch and it's to be logged. - The current version is creating allocating another instance of RuleMessage on the heap to copy the Rule & Transaction related state while all the other members in the RuleMessage are set to their default values. - The new version leverages the existent, unused and incomplete function 'clean' (renamed as 'reset') to do this on the current instance. - Notice that the current code preserves the value of m_saveMessage, so 'reset' provides an argument for the caller to control whether this member should be reinitialized.
This commit is contained in:
@@ -13,14 +13,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include <stack>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <list>
|
||||
#include <cstring>
|
||||
#endif
|
||||
|
||||
#ifndef HEADERS_MODSECURITY_RULE_MESSAGE_H_
|
||||
#define HEADERS_MODSECURITY_RULE_MESSAGE_H_
|
||||
|
||||
@@ -31,8 +23,10 @@
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
namespace modsecurity {
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
||||
namespace modsecurity {
|
||||
|
||||
|
||||
class RuleMessage {
|
||||
@@ -45,43 +39,51 @@ class RuleMessage {
|
||||
RuleMessage(const RuleWithActions &rule, const Transaction &trans) :
|
||||
m_rule(rule),
|
||||
m_transaction(trans)
|
||||
{ }
|
||||
{
|
||||
reset(true);
|
||||
}
|
||||
|
||||
RuleMessage(const RuleMessage &ruleMessage) = default;
|
||||
RuleMessage &operator=(const RuleMessage &ruleMessage) = delete;
|
||||
|
||||
void clean() {
|
||||
m_data = "";
|
||||
m_match = "";
|
||||
void reset(const bool resetSaveMessage)
|
||||
{
|
||||
m_data.clear();
|
||||
m_isDisruptive = false;
|
||||
m_reference = "";
|
||||
m_match.clear();
|
||||
m_message.clear();
|
||||
m_noAuditLog = false;
|
||||
m_reference.clear();
|
||||
if (resetSaveMessage == true)
|
||||
m_saveMessage = true;
|
||||
m_severity = 0;
|
||||
m_tags.clear();
|
||||
}
|
||||
|
||||
std::string log() {
|
||||
return log(this, 0);
|
||||
std::string log() const {
|
||||
return log(*this, 0);
|
||||
}
|
||||
std::string log(int props) {
|
||||
return log(this, props);
|
||||
std::string log(int props) const {
|
||||
return log(*this, props);
|
||||
}
|
||||
std::string log(int props, int responseCode) {
|
||||
return log(this, props, responseCode);
|
||||
std::string log(int props, int responseCode) const {
|
||||
return log(*this, props, responseCode);
|
||||
}
|
||||
std::string errorLog() {
|
||||
return log(this,
|
||||
ClientLogMessageInfo | ErrorLogTailLogMessageInfo);
|
||||
std::string errorLog() const {
|
||||
return log(*this,
|
||||
ClientLogMessageInfo | ErrorLogTailLogMessageInfo);
|
||||
}
|
||||
|
||||
static std::string log(const RuleMessage *rm, int props, int code);
|
||||
static std::string log(const RuleMessage *rm, int props) {
|
||||
static std::string log(const RuleMessage &rm, int props, int code);
|
||||
static std::string log(const RuleMessage &rm, int props) {
|
||||
return log(rm, props, -1);
|
||||
}
|
||||
static std::string log(const RuleMessage *rm) {
|
||||
static std::string log(const RuleMessage &rm) {
|
||||
return log(rm, 0);
|
||||
}
|
||||
|
||||
static std::string _details(const RuleMessage *rm);
|
||||
static std::string _errorLogTail(const RuleMessage *rm);
|
||||
static std::string _details(const RuleMessage &rm);
|
||||
static std::string _errorLogTail(const RuleMessage &rm);
|
||||
|
||||
int getPhase() const { return m_rule.getPhase() - 1; }
|
||||
|
||||
|
Reference in New Issue
Block a user