mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-14 13:56: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.
142 lines
4.1 KiB
C++
142 lines
4.1 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_ACTIONS_H_
|
|
#define HEADERS_MODSECURITY_RULE_WITH_ACTIONS_H_
|
|
|
|
#include "modsecurity/transaction.h"
|
|
#include "modsecurity/modsecurity.h"
|
|
#include "modsecurity/variable_value.h"
|
|
#include "modsecurity/rule.h"
|
|
|
|
#ifdef __cplusplus
|
|
|
|
namespace modsecurity {
|
|
|
|
|
|
class RuleWithActions : public Rule {
|
|
public:
|
|
RuleWithActions(
|
|
Actions *a,
|
|
Transformations *t,
|
|
const std::string &fileName,
|
|
int lineNumber);
|
|
|
|
~RuleWithActions() override;
|
|
|
|
RuleWithActions(const RuleWithActions &r) = delete;
|
|
|
|
RuleWithActions &operator=(const RuleWithActions &r) = delete;
|
|
|
|
virtual bool evaluate(Transaction *transaction) override;
|
|
|
|
virtual bool evaluate(Transaction *transaction, RuleMessage &ruleMessage) override;
|
|
|
|
void executeActionsIndependentOfChainedRuleResult(
|
|
Transaction *trasn,
|
|
bool *containsDisruptive,
|
|
RuleMessage &ruleMessage);
|
|
|
|
void executeActionsAfterFullMatch(
|
|
Transaction *trasn,
|
|
bool containsDisruptive,
|
|
RuleMessage &ruleMessage);
|
|
|
|
void executeAction(Transaction *trans,
|
|
bool containsBlock,
|
|
RuleMessage &ruleMessage,
|
|
actions::Action *a,
|
|
bool context);
|
|
|
|
|
|
void executeTransformations(
|
|
const Transaction *trasn, const std::string &value, TransformationResults &ret);
|
|
|
|
void performLogging(Transaction *trans,
|
|
RuleMessage &ruleMessage,
|
|
bool lastLog = true,
|
|
bool chainedParentNull = false) const;
|
|
|
|
std::vector<actions::Action *> getActionsByName(const std::string& name,
|
|
Transaction *t);
|
|
bool containsTag(const std::string& name, Transaction *t);
|
|
bool containsMsg(const std::string& name, Transaction *t);
|
|
|
|
inline bool isChained() const { return m_isChained == true; }
|
|
inline bool hasCaptureAction() const { return m_containsCaptureAction == true; }
|
|
inline void setChained(bool b) { m_isChained = b; }
|
|
inline bool hasDisruptiveAction() const { return m_disruptiveAction != NULL; }
|
|
inline bool hasBlockAction() const { return m_containsStaticBlockAction == true; }
|
|
inline bool hasMultimatch() const { return m_containsMultiMatchAction == true; }
|
|
|
|
inline bool hasLogData() const { return m_logData != NULL; }
|
|
std::string logData(Transaction *t);
|
|
inline bool hasMsg() const { return m_msg != NULL; }
|
|
std::string msg(Transaction *t);
|
|
inline bool hasSeverity() const { return m_severity != NULL; }
|
|
int severity() const;
|
|
|
|
std::string m_rev;
|
|
std::string m_ver;
|
|
int m_accuracy;
|
|
int m_maturity;
|
|
|
|
|
|
int64_t m_ruleId;
|
|
|
|
std::shared_ptr<RuleWithActions> m_chainedRuleChild;
|
|
RuleWithActions *m_chainedRuleParent;
|
|
|
|
private:
|
|
inline void executeTransformation(
|
|
const actions::transformations::Transformation &a,
|
|
std::string &value,
|
|
const Transaction *trans,
|
|
TransformationResults &ret,
|
|
std::string &path,
|
|
int &nth) const;
|
|
|
|
/* actions */
|
|
actions::Action *m_disruptiveAction;
|
|
actions::LogData *m_logData;
|
|
actions::Msg *m_msg;
|
|
actions::Severity *m_severity;
|
|
MatchActions m_actionsRuntimePos;
|
|
SetVars m_actionsSetVar;
|
|
Tags m_actionsTag;
|
|
|
|
/* actions > transformations */
|
|
Transformations m_transformations;
|
|
|
|
bool m_containsCaptureAction:1;
|
|
bool m_containsMultiMatchAction:1;
|
|
bool m_containsStaticBlockAction:1;
|
|
bool m_isChained:1;
|
|
};
|
|
|
|
} // namespace modsecurity
|
|
#endif
|
|
|
|
|
|
#endif // HEADERS_MODSECURITY_RULE_WITH_ACTIONS_H_
|