mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 21:36:00 +03:00
9f47f1473c
- Parser location is now a custom class. It holds a shared pointer with the file name; If the parser fails, the resource is deleted. - To follow the parser change, the Rule class now holds the file name in a shared pointer instead of a unique pointer. As a shared pointer we avoid duplication of the file name in memory, plus, it frees itself when not in use anymore. - Operator init also accepting the filename as a shared pointer. - Driver is treating m_location was privative. Now it holds a std::list<std::shared_ptr<yy::seclang_parser::location_type>> instead of: std::list<yy::seclang_parser::location_type *>. - Fix: addSecRule on Driver() was changed from RuleWithAction to RuleWithOperator. - Minor changes on the regression and rules-check utility to force deletion of resources even when they fail. - Couple of virtual destructors were placed to force the shared pointer decrementing on shared variables. - Deleted constructors for copy were placed for the sake of readability.
88 lines
2.2 KiB
C++
88 lines
2.2 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.
|
|
*
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#ifdef __cplusplus
|
|
#include <ctime>
|
|
#include <iostream>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <list>
|
|
#include <array>
|
|
#endif
|
|
|
|
|
|
#ifndef HEADERS_MODSECURITY_RULES_SET_PHASES_H_
|
|
#define HEADERS_MODSECURITY_RULES_SET_PHASES_H_
|
|
|
|
#include "modsecurity/rules.h"
|
|
|
|
#ifdef __cplusplus
|
|
|
|
namespace modsecurity {
|
|
class RuleWithOperator;
|
|
namespace Parser {
|
|
class Driver;
|
|
}
|
|
|
|
/** @ingroup ModSecurity_CPP_API */
|
|
class RulesSetPhases {
|
|
public:
|
|
using container = std::array<Rules, modsecurity::Phases::NUMBER_OF_PHASES>;
|
|
using iterator = typename container::iterator;
|
|
using const_iterator = typename container::const_iterator;
|
|
|
|
RulesSetPhases()
|
|
: m_rulesAtPhase()
|
|
{ }
|
|
|
|
RulesSetPhases(const RulesSetPhases&) = delete;
|
|
|
|
virtual ~RulesSetPhases()
|
|
{ };
|
|
|
|
void insert(std::shared_ptr<Rule> rule);
|
|
void append(RulesSetPhases *from);
|
|
|
|
int append(RulesSetPhases *from, std::ostringstream *err);
|
|
void dump();
|
|
|
|
Rules *operator[](int index);
|
|
Rules *at(int index);
|
|
static size_t size() { return modsecurity::Phases::NUMBER_OF_PHASES; }
|
|
|
|
void fixDefaultActions(RulesWarnings *warnings, RulesErrors *errors) {
|
|
for (auto &phase : m_rulesAtPhase) {
|
|
phase.fixDefaultActions(warnings, errors);
|
|
}
|
|
}
|
|
|
|
inline iterator begin() noexcept { return m_rulesAtPhase.begin(); }
|
|
inline const_iterator cbegin() const noexcept { return m_rulesAtPhase.cbegin(); }
|
|
inline iterator end() noexcept { return m_rulesAtPhase.end(); }
|
|
inline const_iterator cend() const noexcept { return m_rulesAtPhase.cend(); }
|
|
|
|
private:
|
|
container m_rulesAtPhase;
|
|
};
|
|
|
|
|
|
} // namespace modsecurity
|
|
#endif
|
|
|
|
#endif // HEADERS_MODSECURITY_RULES_SET_PHASES_H_
|