mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
4df297b596
- 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.
82 lines
2.2 KiB
C++
82 lines
2.2 KiB
C++
/*
|
|
* ModSecurity, http://www.modsecurity.org/
|
|
* Copyright (c) 2015 - 2021 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 <stack>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <list>
|
|
#include <memory>
|
|
#include <utility>
|
|
#endif
|
|
|
|
#ifndef HEADERS_MODSECURITY_RULE_WITH_OPERATOR_H_
|
|
#define HEADERS_MODSECURITY_RULE_WITH_OPERATOR_H_
|
|
|
|
#include "modsecurity/transaction.h"
|
|
#include "modsecurity/modsecurity.h"
|
|
#include "modsecurity/variable_value.h"
|
|
#include "modsecurity/rule.h"
|
|
#include "modsecurity/rule_with_actions.h"
|
|
|
|
#ifdef __cplusplus
|
|
|
|
namespace modsecurity {
|
|
|
|
|
|
class RuleWithOperator : public RuleWithActions {
|
|
public:
|
|
RuleWithOperator(operators::Operator *op,
|
|
variables::Variables *variables,
|
|
std::vector<actions::Action *> *actions,
|
|
Transformations *transformations,
|
|
const std::string &fileName,
|
|
int lineNumber);
|
|
|
|
~RuleWithOperator() override;
|
|
|
|
bool evaluate(Transaction *transaction, RuleMessage &ruleMessage) override;
|
|
|
|
void getVariablesExceptions(Transaction &t,
|
|
variables::Variables *exclusion, variables::Variables *addition);
|
|
inline void getFinalVars(variables::Variables *vars,
|
|
variables::Variables *eclusion, Transaction *trans);
|
|
|
|
bool executeOperatorAt(Transaction *trasn, const std::string &key,
|
|
const std::string &value, RuleMessage &ruleMessage);
|
|
|
|
static void updateMatchedVars(Transaction *trasn, const std::string &key,
|
|
const std::string &value);
|
|
static void cleanMatchedVars(Transaction *trasn);
|
|
|
|
|
|
std::string getOperatorName() const;
|
|
|
|
virtual std::string getReference() override {
|
|
return std::to_string(m_ruleId);
|
|
}
|
|
|
|
private:
|
|
modsecurity::variables::Variables *m_variables;
|
|
operators::Operator *m_operator;
|
|
};
|
|
|
|
|
|
} // namespace modsecurity
|
|
#endif
|
|
|
|
|
|
#endif // HEADERS_MODSECURITY_RULE_WITH_OPERATOR_H_
|